diff options
author | Michael S. Tsirkin <mst@redhat.com> | 2014-03-10 13:27:59 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-03-11 16:26:38 -0400 |
commit | 1a4cedaf65491e66e1e55b8428c89209da729209 (patch) | |
tree | 195978ab3a3a0aed593ec8282b2c60973c86a295 | |
parent | df5771ffefb13f8af5392bd54fd7e2b596a3a357 (diff) |
skbuff: skb_segment: s/fskb/list_skb/
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>
-rw-r--r-- | net/core/skbuff.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index fdc065dc869a..dc4f7683ff52 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, | |||
2850 | { | 2850 | { |
2851 | struct sk_buff *segs = NULL; | 2851 | struct sk_buff *segs = NULL; |
2852 | struct sk_buff *tail = NULL; | 2852 | struct sk_buff *tail = NULL; |
2853 | struct sk_buff *fskb = skb_shinfo(head_skb)->frag_list; | 2853 | struct sk_buff *list_skb = skb_shinfo(head_skb)->frag_list; |
2854 | skb_frag_t *frag = skb_shinfo(head_skb)->frags; | 2854 | skb_frag_t *frag = skb_shinfo(head_skb)->frags; |
2855 | unsigned int mss = skb_shinfo(head_skb)->gso_size; | 2855 | unsigned int mss = skb_shinfo(head_skb)->gso_size; |
2856 | unsigned int doffset = head_skb->data - skb_mac_header(head_skb); | 2856 | 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, | |||
2891 | if (hsize > len || !sg) | 2891 | if (hsize > len || !sg) |
2892 | hsize = len; | 2892 | hsize = len; |
2893 | 2893 | ||
2894 | if (!hsize && i >= nfrags && skb_headlen(fskb) && | 2894 | if (!hsize && i >= nfrags && skb_headlen(list_skb) && |
2895 | (skb_headlen(fskb) == len || sg)) { | 2895 | (skb_headlen(list_skb) == len || sg)) { |
2896 | BUG_ON(skb_headlen(fskb) > len); | 2896 | BUG_ON(skb_headlen(list_skb) > len); |
2897 | 2897 | ||
2898 | i = 0; | 2898 | i = 0; |
2899 | nfrags = skb_shinfo(fskb)->nr_frags; | 2899 | nfrags = skb_shinfo(list_skb)->nr_frags; |
2900 | frag = skb_shinfo(fskb)->frags; | 2900 | frag = skb_shinfo(list_skb)->frags; |
2901 | pos += skb_headlen(fskb); | 2901 | pos += skb_headlen(list_skb); |
2902 | 2902 | ||
2903 | while (pos < offset + len) { | 2903 | while (pos < offset + len) { |
2904 | BUG_ON(i >= nfrags); | 2904 | BUG_ON(i >= nfrags); |
@@ -2912,8 +2912,8 @@ struct sk_buff *skb_segment(struct sk_buff *head_skb, | |||
2912 | frag++; | 2912 | frag++; |
2913 | } | 2913 | } |
2914 | 2914 | ||
2915 | nskb = skb_clone(fskb, GFP_ATOMIC); | 2915 | nskb = skb_clone(list_skb, GFP_ATOMIC); |
2916 | fskb = fskb->next; | 2916 | list_skb = list_skb->next; |
2917 | 2917 | ||
2918 | if (unlikely(!nskb)) | 2918 | if (unlikely(!nskb)) |
2919 | goto err; | 2919 | goto err; |
@@ -2980,15 +2980,15 @@ struct sk_buff *skb_segment(struct sk_buff *head_skb, | |||
2980 | 2980 | ||
2981 | while (pos < offset + len) { | 2981 | while (pos < offset + len) { |
2982 | if (i >= nfrags) { | 2982 | if (i >= nfrags) { |
2983 | BUG_ON(skb_headlen(fskb)); | 2983 | BUG_ON(skb_headlen(list_skb)); |
2984 | 2984 | ||
2985 | i = 0; | 2985 | i = 0; |
2986 | nfrags = skb_shinfo(fskb)->nr_frags; | 2986 | nfrags = skb_shinfo(list_skb)->nr_frags; |
2987 | frag = skb_shinfo(fskb)->frags; | 2987 | frag = skb_shinfo(list_skb)->frags; |
2988 | 2988 | ||
2989 | BUG_ON(!nfrags); | 2989 | BUG_ON(!nfrags); |
2990 | 2990 | ||
2991 | fskb = fskb->next; | 2991 | list_skb = list_skb->next; |
2992 | } | 2992 | } |
2993 | 2993 | ||
2994 | if (unlikely(skb_shinfo(nskb)->nr_frags >= | 2994 | if (unlikely(skb_shinfo(nskb)->nr_frags >= |