OSDN Git Service

vlan: reset headers on accel emulation path
authorJiri Pirko <jpirko@redhat.com>
Fri, 19 Aug 2011 04:29:27 +0000 (21:29 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 3 Oct 2011 18:40:55 +0000 (11:40 -0700)
commitb082a5631a746b494553f7c72b387cb625a1674a
tree51e1dd946e9d985c089a64429fa754793b6182f8
parentbc4c1bd0d97dfd9a705bcb3ade46b051c3f4647d
vlan: reset headers on accel emulation path

[ Upstream commit c5114cd59d2664f258b0d021d79b1532d94bdc2b ]

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
net/8021q/vlan_core.c