diff options
| author | Jiri Pirko <jpirko@redhat.com> | 2011-08-18 21:29:27 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-03 11:40:55 -0700 |
| commit | b082a5631a746b494553f7c72b387cb625a1674a (patch) | |
| tree | 51e1dd946e9d985c089a64429fa754793b6182f8 | |
| parent | bc4c1bd0d97dfd9a705bcb3ade46b051c3f4647d (diff) | |
| download | kernel_samsung_smdk4412-b082a5631a746b494553f7c72b387cb625a1674a.tar.gz kernel_samsung_smdk4412-b082a5631a746b494553f7c72b387cb625a1674a.tar.bz2 kernel_samsung_smdk4412-b082a5631a746b494553f7c72b387cb625a1674a.zip | |
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>
| -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 fcc684678af..27263fb1564 100644 --- a/net/8021q/vlan_core.c +++ b/net/8021q/vlan_core.c @@ -171,6 +171,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: |