Message ID | 1464112523-3701-39-git-send-email-kamal@canonical.com |
---|---|
State | New |
Headers | show |
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index c412278..efcfd04 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -4409,13 +4409,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); 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;