{
        if (skb_shinfo(skb)->gso_size) {
                netdev_features_t features = tp->netdev->features;
+               struct sk_buff *segs, *seg, *next;
                struct sk_buff_head seg_list;
-               struct sk_buff *segs, *nskb;
 
                features &= ~(NETIF_F_SG | NETIF_F_IPV6_CSUM | NETIF_F_TSO6);
                segs = skb_gso_segment(skb, features);
 
                __skb_queue_head_init(&seg_list);
 
-               do {
-                       nskb = segs;
-                       segs = segs->next;
-                       nskb->next = NULL;
-                       __skb_queue_tail(&seg_list, nskb);
-               } while (segs);
+               skb_list_walk_safe(segs, seg, next) {
+                       skb_mark_not_on_list(seg);
+                       __skb_queue_tail(&seg_list, seg);
+               }
 
                skb_queue_splice(&seg_list, list);
                dev_kfree_skb(skb);