80 lines
2.5 KiB
Diff
80 lines
2.5 KiB
Diff
From: "Michael S. Tsirkin" <mst@redhat.com>
|
|
Date: Mon, 10 Mar 2014 19:27:59 +0200
|
|
Subject: [4/5] skbuff: skb_segment: s/fskb/list_skb/
|
|
Origin: https://git.kernel.org/linus/1a4cedaf65491e66e1e55b8428c89209da729209
|
|
|
|
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>
|
|
---
|
|
net/core/skbuff.c | 26 +++++++++++++-------------
|
|
1 file changed, 13 insertions(+), 13 deletions(-)
|
|
|
|
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
|
|
index fdc065d..dc4f768 100644
|
|
--- a/net/core/skbuff.c
|
|
+++ b/net/core/skbuff.c
|
|
@@ -2850,7 +2850,7 @@ struct sk_buff *skb_segment(struct sk_buff *head_skb,
|
|
{
|
|
struct sk_buff *segs = 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;
|
|
unsigned int mss = skb_shinfo(head_skb)->gso_size;
|
|
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)
|
|
hsize = len;
|
|
|
|
- if (!hsize && i >= nfrags && skb_headlen(fskb) &&
|
|
- (skb_headlen(fskb) == len || sg)) {
|
|
- BUG_ON(skb_headlen(fskb) > len);
|
|
+ if (!hsize && i >= nfrags && skb_headlen(list_skb) &&
|
|
+ (skb_headlen(list_skb) == len || sg)) {
|
|
+ BUG_ON(skb_headlen(list_skb) > len);
|
|
|
|
i = 0;
|
|
- nfrags = skb_shinfo(fskb)->nr_frags;
|
|
- frag = skb_shinfo(fskb)->frags;
|
|
- pos += skb_headlen(fskb);
|
|
+ nfrags = skb_shinfo(list_skb)->nr_frags;
|
|
+ frag = skb_shinfo(list_skb)->frags;
|
|
+ pos += skb_headlen(list_skb);
|
|
|
|
while (pos < offset + len) {
|
|
BUG_ON(i >= nfrags);
|
|
@@ -2912,8 +2912,8 @@ struct sk_buff *skb_segment(struct sk_buff *head_skb,
|
|
frag++;
|
|
}
|
|
|
|
- nskb = skb_clone(fskb, GFP_ATOMIC);
|
|
- fskb = fskb->next;
|
|
+ nskb = skb_clone(list_skb, GFP_ATOMIC);
|
|
+ list_skb = list_skb->next;
|
|
|
|
if (unlikely(!nskb))
|
|
goto err;
|
|
@@ -2980,15 +2980,15 @@ struct sk_buff *skb_segment(struct sk_buff *head_skb,
|
|
|
|
while (pos < offset + len) {
|
|
if (i >= nfrags) {
|
|
- BUG_ON(skb_headlen(fskb));
|
|
+ BUG_ON(skb_headlen(list_skb));
|
|
|
|
i = 0;
|
|
- nfrags = skb_shinfo(fskb)->nr_frags;
|
|
- frag = skb_shinfo(fskb)->frags;
|
|
+ nfrags = skb_shinfo(list_skb)->nr_frags;
|
|
+ frag = skb_shinfo(list_skb)->frags;
|
|
|
|
BUG_ON(!nfrags);
|
|
|
|
- fskb = fskb->next;
|
|
+ list_skb = list_skb->next;
|
|
}
|
|
|
|
if (unlikely(skb_shinfo(nskb)->nr_frags >=
|