leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

skbuff: skb_segment: s/skb_frag/frag/

Browse Source 
skb_frag can in fact point at either skb
or fskb so rename it generally "frag".

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Michael S. Tsirkin 2014-03-10 18:29:14 +02:00 committed by David S. Miller
parent 8cb19905e9
commit 4e1beba12d
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
net/core/skbuff.c
View File

@ -2850,7 +2850,7 @@ struct sk_buff *skb_segment(struct sk_buff *skb, netdev_features_t features)
struct sk_buff *segs = NULL; struct sk_buff *segs = NULL;
struct sk_buff *tail = NULL; struct sk_buff *tail = NULL;
struct sk_buff *fskb = skb_shinfo(skb)->frag_list; struct sk_buff *fskb = skb_shinfo(skb)->frag_list;
skb_frag_t *skb_frag = skb_shinfo(skb)->frags; skb_frag_t *frag = skb_shinfo(skb)->frags;
unsigned int mss = skb_shinfo(skb)->gso_size; unsigned int mss = skb_shinfo(skb)->gso_size;
unsigned int doffset = skb->data - skb_mac_header(skb); unsigned int doffset = skb->data - skb_mac_header(skb);
unsigned int offset = doffset; unsigned int offset = doffset;
@ -2896,19 +2896,19 @@ struct sk_buff *skb_segment(struct sk_buff *skb, netdev_features_t features)
i = 0; i = 0;
nfrags = skb_shinfo(fskb)->nr_frags; nfrags = skb_shinfo(fskb)->nr_frags;
skb_frag = skb_shinfo(fskb)->frags; frag = skb_shinfo(fskb)->frags;
pos += skb_headlen(fskb); pos += skb_headlen(fskb);
while (pos < offset + len) { while (pos < offset + len) {
BUG_ON(i >= nfrags); BUG_ON(i >= nfrags);
size = skb_frag_size(skb_frag); size = skb_frag_size(frag);
if (pos + size > offset + len) if (pos + size > offset + len)
break; break;
i++; i++;
pos += size; pos += size;
skb_frag++; frag++;
} }
nskb = skb_clone(fskb, GFP_ATOMIC); nskb = skb_clone(fskb, GFP_ATOMIC);
@ -2982,7 +2982,7 @@ struct sk_buff *skb_segment(struct sk_buff *skb, netdev_features_t features)
i = 0; i = 0;
nfrags = skb_shinfo(fskb)->nr_frags; nfrags = skb_shinfo(fskb)->nr_frags;
skb_frag = skb_shinfo(fskb)->frags; frag = skb_shinfo(fskb)->frags;
BUG_ON(!nfrags); BUG_ON(!nfrags);
@ -2997,7 +2997,7 @@ struct sk_buff *skb_segment(struct sk_buff *skb, netdev_features_t features)
goto err; goto err;
} }
*nskb_frag = *skb_frag; *nskb_frag = *frag;
__skb_frag_ref(nskb_frag); __skb_frag_ref(nskb_frag);
size = skb_frag_size(nskb_frag); size = skb_frag_size(nskb_frag);
@ -3010,7 +3010,7 @@ struct sk_buff *skb_segment(struct sk_buff *skb, netdev_features_t features)
if (pos + size <= offset + len) { if (pos + size <= offset + len) {
i++; i++;
skb_frag++; frag++;
pos += size; pos += size;
} else { } else {
skb_frag_size_sub(nskb_frag, pos + size - (offset + len)); skb_frag_size_sub(nskb_frag, pos + size - (offset + len));