diff options
author | Michael S. Tsirkin <mst@redhat.com> | 2014-03-10 12:29:04 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-03-11 16:26:38 -0400 |
commit | 8cb19905e9287a93ce7c2cbbdf742a060b00e219 (patch) | |
tree | e6f1399a77ea578c67278d649e4117bb30f0262a | |
parent | 9d79b3c7aae582df9eebcea8797c41cd5d5fc39c (diff) |
skbuff: skb_segment: s/frag/nskb_frag/
frag points at nskb, so name it appropriately
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/core/skbuff.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 5d6236d9fdce..60e8cd717cb3 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c | |||
@@ -2876,7 +2876,7 @@ struct sk_buff *skb_segment(struct sk_buff *skb, netdev_features_t features) | |||
2876 | 2876 | ||
2877 | do { | 2877 | do { |
2878 | struct sk_buff *nskb; | 2878 | struct sk_buff *nskb; |
2879 | skb_frag_t *frag; | 2879 | skb_frag_t *nskb_frag; |
2880 | int hsize; | 2880 | int hsize; |
2881 | int size; | 2881 | int size; |
2882 | 2882 | ||
@@ -2969,7 +2969,7 @@ struct sk_buff *skb_segment(struct sk_buff *skb, netdev_features_t features) | |||
2969 | continue; | 2969 | continue; |
2970 | } | 2970 | } |
2971 | 2971 | ||
2972 | frag = skb_shinfo(nskb)->frags; | 2972 | nskb_frag = skb_shinfo(nskb)->frags; |
2973 | 2973 | ||
2974 | skb_copy_from_linear_data_offset(skb, offset, | 2974 | skb_copy_from_linear_data_offset(skb, offset, |
2975 | skb_put(nskb, hsize), hsize); | 2975 | skb_put(nskb, hsize), hsize); |
@@ -2997,13 +2997,13 @@ struct sk_buff *skb_segment(struct sk_buff *skb, netdev_features_t features) | |||
2997 | goto err; | 2997 | goto err; |
2998 | } | 2998 | } |
2999 | 2999 | ||
3000 | *frag = *skb_frag; | 3000 | *nskb_frag = *skb_frag; |
3001 | __skb_frag_ref(frag); | 3001 | __skb_frag_ref(nskb_frag); |
3002 | size = skb_frag_size(frag); | 3002 | size = skb_frag_size(nskb_frag); |
3003 | 3003 | ||
3004 | if (pos < offset) { | 3004 | if (pos < offset) { |
3005 | frag->page_offset += offset - pos; | 3005 | nskb_frag->page_offset += offset - pos; |
3006 | skb_frag_size_sub(frag, offset - pos); | 3006 | skb_frag_size_sub(nskb_frag, offset - pos); |
3007 | } | 3007 | } |
3008 | 3008 | ||
3009 | skb_shinfo(nskb)->nr_frags++; | 3009 | skb_shinfo(nskb)->nr_frags++; |
@@ -3013,11 +3013,11 @@ struct sk_buff *skb_segment(struct sk_buff *skb, netdev_features_t features) | |||
3013 | skb_frag++; | 3013 | skb_frag++; |
3014 | pos += size; | 3014 | pos += size; |
3015 | } else { | 3015 | } else { |
3016 | skb_frag_size_sub(frag, pos + size - (offset + len)); | 3016 | skb_frag_size_sub(nskb_frag, pos + size - (offset + len)); |
3017 | goto skip_fraglist; | 3017 | goto skip_fraglist; |
3018 | } | 3018 | } |
3019 | 3019 | ||
3020 | frag++; | 3020 | nskb_frag++; |
3021 | } | 3021 | } |
3022 | 3022 | ||
3023 | skip_fraglist: | 3023 | skip_fraglist: |