diff options
| author | David S. Miller <davem@davemloft.net> | 2011-08-20 19:39:12 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-08-20 19:39:12 +0200 |
| commit | 823dcd2506fa369aeb8cbd26da5663efe2fda9a9 (patch) | |
| tree | 853b3e3c05f0b9ee1b5df8464db19b7acc57150c /net/8021q | |
| parent | tg3: Update version to 3.120 (diff) | |
| parent | ipv6: Fix ipv6_getsockopt for IPV6_2292PKTOPTIONS (diff) | |
| download | linux-823dcd2506fa369aeb8cbd26da5663efe2fda9a9.tar.xz linux-823dcd2506fa369aeb8cbd26da5663efe2fda9a9.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'net/8021q')
| -rw-r--r-- | net/8021q/vlan_core.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/8021q/vlan_core.c b/net/8021q/vlan_core.c index 5f27f8e30254..f1f2f7bb6661 100644 --- a/net/8021q/vlan_core.c +++ b/net/8021q/vlan_core.c @@ -167,6 +167,8 @@ struct sk_buff *vlan_untag(struct sk_buff *skb) if (unlikely(!skb)) goto err_free; + skb_reset_network_header(skb); + skb_reset_transport_header(skb); return skb; err_free: |