diff options
| author | Jiri Pirko <jpirko@redhat.com> | 2011-08-18 21:29:27 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-08-18 21:29:27 -0700 |
| commit | c5114cd59d2664f258b0d021d79b1532d94bdc2b (patch) | |
| tree | 3e9d8fcc3cd02d588b2ffbba0450f4feba3e5e17 | |
| parent | 9331db4f00cfee8a79d2147ac83723ef436b9759 (diff) | |
| download | op-kernel-dev-c5114cd59d2664f258b0d021d79b1532d94bdc2b.zip op-kernel-dev-c5114cd59d2664f258b0d021d79b1532d94bdc2b.tar.gz | |
vlan: reset headers on accel emulation path
It's after all necessary to do reset headers here. The reason is we
cannot depend that it gets reseted in __netif_receive_skb once skb is
reinjected. For incoming vlanids without vlan_dev, vlan_do_receive()
returns false with skb != NULL and __netif_reveive_skb continues, skb is
not reinjected.
This might be good material for 3.0-stable as well
Reported-by: Mike Auty <mike.auty@gmail.com>
Signed-off-by: Jiri Pirko <jpirko@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -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 5f27f8e..f1f2f7b 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: |
