diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2014-03-10 18:29:04 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-03-11 16:26:38 -0400 |
| commit | 8cb19905e9287a93ce7c2cbbdf742a060b00e219 (patch) | |
| tree | e6f1399a77ea578c67278d649e4117bb30f0262a | |
| parent | 9d79b3c7aae582df9eebcea8797c41cd5d5fc39c (diff) | |
| download | op-kernel-dev-8cb19905e9287a93ce7c2cbbdf742a060b00e219.zip op-kernel-dev-8cb19905e9287a93ce7c2cbbdf742a060b00e219.tar.gz | |
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 5d6236d..60e8cd7 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) do { struct sk_buff *nskb; - skb_frag_t *frag; + skb_frag_t *nskb_frag; int hsize; int size; @@ -2969,7 +2969,7 @@ struct sk_buff *skb_segment(struct sk_buff *skb, netdev_features_t features) continue; } - frag = skb_shinfo(nskb)->frags; + nskb_frag = skb_shinfo(nskb)->frags; skb_copy_from_linear_data_offset(skb, offset, skb_put(nskb, hsize), hsize); @@ -2997,13 +2997,13 @@ struct sk_buff *skb_segment(struct sk_buff *skb, netdev_features_t features) goto err; } - *frag = *skb_frag; - __skb_frag_ref(frag); - size = skb_frag_size(frag); + *nskb_frag = *skb_frag; + __skb_frag_ref(nskb_frag); + size = skb_frag_size(nskb_frag); if (pos < offset) { - frag->page_offset += offset - pos; - skb_frag_size_sub(frag, offset - pos); + nskb_frag->page_offset += offset - pos; + skb_frag_size_sub(nskb_frag, offset - pos); } skb_shinfo(nskb)->nr_frags++; @@ -3013,11 +3013,11 @@ struct sk_buff *skb_segment(struct sk_buff *skb, netdev_features_t features) skb_frag++; pos += size; } else { - skb_frag_size_sub(frag, pos + size - (offset + len)); + skb_frag_size_sub(nskb_frag, pos + size - (offset + len)); goto skip_fraglist; } - frag++; + nskb_frag++; } skip_fraglist: |
