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

skbuff: skb_segment: s/fskb/list_skb/

Browse Source 
fskb is unrelated to frag: it's coming from
frag_list. Rename it list_skb to avoid confusion.

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 19:27:59 +02:00 committed by David S. Miller
parent df5771ffef
commit 1a4cedaf65
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
net/core/skbuff.c
View File

@ -2850,7 +2850,7 @@ struct sk_buff *skb_segment(struct sk_buff *head_skb,
{ {
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(head_skb)->frag_list; struct sk_buff *list_skb = skb_shinfo(head_skb)->frag_list;
skb_frag_t *frag = skb_shinfo(head_skb)->frags; skb_frag_t *frag = skb_shinfo(head_skb)->frags;
unsigned int mss = skb_shinfo(head_skb)->gso_size; unsigned int mss = skb_shinfo(head_skb)->gso_size;
unsigned int doffset = head_skb->data - skb_mac_header(head_skb); unsigned int doffset = head_skb->data - skb_mac_header(head_skb);
@ -2891,14 +2891,14 @@ struct sk_buff *skb_segment(struct sk_buff *head_skb,
if (hsize > len || !sg) if (hsize > len || !sg)
hsize = len; hsize = len;
if (!hsize && i >= nfrags && skb_headlen(fskb) && if (!hsize && i >= nfrags && skb_headlen(list_skb) &&
(skb_headlen(fskb) == len || sg)) { (skb_headlen(list_skb) == len || sg)) {
BUG_ON(skb_headlen(fskb) > len); BUG_ON(skb_headlen(list_skb) > len);
i = 0; i = 0;
nfrags = skb_shinfo(fskb)->nr_frags; nfrags = skb_shinfo(list_skb)->nr_frags;
frag = skb_shinfo(fskb)->frags; frag = skb_shinfo(list_skb)->frags;
pos += skb_headlen(fskb); pos += skb_headlen(list_skb);
while (pos < offset + len) { while (pos < offset + len) {
BUG_ON(i >= nfrags); BUG_ON(i >= nfrags);
@ -2912,8 +2912,8 @@ struct sk_buff *skb_segment(struct sk_buff *head_skb,
frag++; frag++;
} }
nskb = skb_clone(fskb, GFP_ATOMIC); nskb = skb_clone(list_skb, GFP_ATOMIC);
fskb = fskb->next; list_skb = list_skb->next;
if (unlikely(!nskb)) if (unlikely(!nskb))
goto err; goto err;
@ -2980,15 +2980,15 @@ struct sk_buff *skb_segment(struct sk_buff *head_skb,
while (pos < offset + len) { while (pos < offset + len) {
if (i >= nfrags) { if (i >= nfrags) {
BUG_ON(skb_headlen(fskb)); BUG_ON(skb_headlen(list_skb));
i = 0; i = 0;
nfrags = skb_shinfo(fskb)->nr_frags; nfrags = skb_shinfo(list_skb)->nr_frags;
frag = skb_shinfo(fskb)->frags; frag = skb_shinfo(list_skb)->frags;
BUG_ON(!nfrags); BUG_ON(!nfrags);
fskb = fskb->next; list_skb = list_skb->next;
} }
if (unlikely(skb_shinfo(nskb)->nr_frags >= if (unlikely(skb_shinfo(nskb)->nr_frags >=