diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2020-01-08 16:59:04 -0500 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2020-01-08 15:19:55 -0800 |
| commit | 1d7a7438d78f2da56b6b3855be462cf0fc809e56 (patch) | |
| tree | 673c86d3206e2cbb7bedac785724b189a20c9174 | |
| parent | net: tap: use skb_list_walk_safe helper for gso segments (diff) | |
| download | linux-dev-1d7a7438d78f2da56b6b3855be462cf0fc809e56.tar.xz linux-dev-1d7a7438d78f2da56b6b3855be462cf0fc809e56.zip | |
net: r8152: use skb_list_walk_safe helper for gso segments
This is a straight-forward conversion case for the new function, and
while we're at it, we can remove a null write to skb->next by replacing
it with skb_mark_not_on_list.
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/usb/r8152.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index 9ec1da429514..fe22a582373b 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -1897,8 +1897,8 @@ static void r8152_csum_workaround(struct r8152 *tp, struct sk_buff *skb, { 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); @@ -1907,12 +1907,10 @@ static void r8152_csum_workaround(struct r8152 *tp, struct sk_buff *skb, __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); |