aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/core/skbuff.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 60e8cd717cb3..d788a9845762 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -2850,7 +2850,7 @@ struct sk_buff *skb_segment(struct sk_buff *skb, netdev_features_t features)
2850 struct sk_buff *segs = NULL; 2850 struct sk_buff *segs = NULL;
2851 struct sk_buff *tail = NULL; 2851 struct sk_buff *tail = NULL;
2852 struct sk_buff *fskb = skb_shinfo(skb)->frag_list; 2852 struct sk_buff *fskb = skb_shinfo(skb)->frag_list;
2853 skb_frag_t *skb_frag = skb_shinfo(skb)->frags; 2853 skb_frag_t *frag = skb_shinfo(skb)->frags;
2854 unsigned int mss = skb_shinfo(skb)->gso_size; 2854 unsigned int mss = skb_shinfo(skb)->gso_size;
2855 unsigned int doffset = skb->data - skb_mac_header(skb); 2855 unsigned int doffset = skb->data - skb_mac_header(skb);
2856 unsigned int offset = doffset; 2856 unsigned int offset = doffset;
@@ -2896,19 +2896,19 @@ struct sk_buff *skb_segment(struct sk_buff *skb, netdev_features_t features)
2896 2896
2897 i = 0; 2897 i = 0;
2898 nfrags = skb_shinfo(fskb)->nr_frags; 2898 nfrags = skb_shinfo(fskb)->nr_frags;
2899 skb_frag = skb_shinfo(fskb)->frags; 2899 frag = skb_shinfo(fskb)->frags;
2900 pos += skb_headlen(fskb); 2900 pos += skb_headlen(fskb);
2901 2901
2902 while (pos < offset + len) { 2902 while (pos < offset + len) {
2903 BUG_ON(i >= nfrags); 2903 BUG_ON(i >= nfrags);
2904 2904
2905 size = skb_frag_size(skb_frag); 2905 size = skb_frag_size(frag);
2906 if (pos + size > offset + len) 2906 if (pos + size > offset + len)
2907 break; 2907 break;
2908 2908
2909 i++; 2909 i++;
2910 pos += size; 2910 pos += size;
2911 skb_frag++; 2911 frag++;
2912 } 2912 }
2913 2913
2914 nskb = skb_clone(fskb, GFP_ATOMIC); 2914 nskb = skb_clone(fskb, GFP_ATOMIC);
@@ -2982,7 +2982,7 @@ struct sk_buff *skb_segment(struct sk_buff *skb, netdev_features_t features)
2982 2982
2983 i = 0; 2983 i = 0;
2984 nfrags = skb_shinfo(fskb)->nr_frags; 2984 nfrags = skb_shinfo(fskb)->nr_frags;
2985 skb_frag = skb_shinfo(fskb)->frags; 2985 frag = skb_shinfo(fskb)->frags;
2986 2986
2987 BUG_ON(!nfrags); 2987 BUG_ON(!nfrags);
2988 2988
@@ -2997,7 +2997,7 @@ struct sk_buff *skb_segment(struct sk_buff *skb, netdev_features_t features)
2997 goto err; 2997 goto err;
2998 } 2998 }
2999 2999
3000 *nskb_frag = *skb_frag; 3000 *nskb_frag = *frag;
3001 __skb_frag_ref(nskb_frag); 3001 __skb_frag_ref(nskb_frag);
3002 size = skb_frag_size(nskb_frag); 3002 size = skb_frag_size(nskb_frag);
3003 3003
@@ -3010,7 +3010,7 @@ struct sk_buff *skb_segment(struct sk_buff *skb, netdev_features_t features)
3010 3010
3011 if (pos + size <= offset + len) { 3011 if (pos + size <= offset + len) {
3012 i++; 3012 i++;
3013 skb_frag++; 3013 frag++;
3014 pos += size; 3014 pos += size;
3015 } else { 3015 } else {
3016 skb_frag_size_sub(nskb_frag, pos + size - (offset + len)); 3016 skb_frag_size_sub(nskb_frag, pos + size - (offset + len));