diff options
| author | Michael S. Tsirkin <mst@redhat.com> | 2014-03-10 18:29:04 +0200 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2014-06-23 10:27:27 +0200 |
| commit | e7fb29afa611ca364a8f6e26af2128db2a7d7ff0 (patch) | |
| tree | 0612b945f37a080000fb0903a07cb10d1f065b00 | |
| parent | e6e3ee68f0906382b0440086b6b33f2bc9adcc0d (diff) | |
| download | linux-stable-e7fb29afa611ca364a8f6e26af2128db2a7d7ff0.tar.gz linux-stable-e7fb29afa611ca364a8f6e26af2128db2a7d7ff0.tar.bz2 linux-stable-e7fb29afa611ca364a8f6e26af2128db2a7d7ff0.zip | |
skbuff: skb_segment: s/frag/nskb_frag/
[ Upstream commit 8cb19905e9287a93ce7c2cbbdf742a060b00e219 ]
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>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
| -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 f69f2ed1dbc3..9e99761b0211 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -2753,7 +2753,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; @@ -2853,7 +2853,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); @@ -2881,13 +2881,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++; @@ -2897,11 +2897,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: |