diff options
author | Gary S. Robertson <gary.robertson@linaro.org> | 2014-01-22 11:06:54 -0600 |
---|---|---|
committer | Gary S. Robertson <gary.robertson@linaro.org> | 2014-01-22 11:06:54 -0600 |
commit | a7fd051cd1119af788dd161a4c834b06377d76a8 (patch) | |
tree | 80368fccae171d1b0446f3e2b4fd4d9b43e65cbe /net/core/skbuff.c | |
parent | 00629ac158e1be3124b796078cf0347b946cb053 (diff) | |
parent | 1071ea6e68ead40df739b223e9013d99c23c19ab (diff) |
Merge tag 'v3.10.27' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-lnglinux-lng-3.10.27-2014.02
This is the 3.10.27 stable release
Diffstat (limited to 'net/core/skbuff.c')
-rw-r--r-- | net/core/skbuff.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index d9e8736bcdc1..c35b81b80fe2 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -2854,7 +2854,7 @@ struct sk_buff *skb_segment(struct sk_buff *skb, netdev_features_t features) doffset + tnl_hlen); if (fskb != skb_shinfo(skb)->frag_list) - continue; + goto perform_csum_check; if (!sg) { nskb->ip_summed = CHECKSUM_NONE; @@ -2918,6 +2918,7 @@ skip_fraglist: nskb->len += nskb->data_len; nskb->truesize += nskb->data_len; +perform_csum_check: if (!csum) { nskb->csum = skb_checksum(nskb, doffset, nskb->len - doffset, 0); |