diff options
author | Alex Shi <alex.shi@linaro.org> | 2016-05-20 12:16:43 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2016-05-20 12:16:43 +0800 |
commit | 1d53a9c6e6c7bc32ecfbbb024ab7a1955122c526 (patch) | |
tree | 977cfcbda4ef5173a9455e66350b610e96f1eeef /net/core/skbuff.c | |
parent | a8a1fcae2dcc97748b7cafa7cb2745de1f35a8a6 (diff) | |
parent | 510d0a3f869611dcd001a2b7627fa5dded4579af (diff) |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-rtlsk-v4.4-16.05-rt
Diffstat (limited to 'net/core/skbuff.c')
-rw-r--r-- | net/core/skbuff.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 5905f61281e9..9b2f5f6778f5 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -4439,15 +4439,16 @@ int skb_vlan_push(struct sk_buff *skb, __be16 vlan_proto, u16 vlan_tci) __skb_push(skb, offset); err = __vlan_insert_tag(skb, skb->vlan_proto, skb_vlan_tag_get(skb)); - if (err) + if (err) { + __skb_pull(skb, offset); return err; + } + skb->protocol = skb->vlan_proto; skb->mac_len += VLAN_HLEN; - __skb_pull(skb, offset); - if (skb->ip_summed == CHECKSUM_COMPLETE) - skb->csum = csum_add(skb->csum, csum_partial(skb->data - + (2 * ETH_ALEN), VLAN_HLEN, 0)); + skb_postpush_rcsum(skb, skb->data + (2 * ETH_ALEN), VLAN_HLEN); + __skb_pull(skb, offset); } __vlan_hwaccel_put_tag(skb, vlan_proto, vlan_tci); return 0; |