Commit c5114cd5 authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller

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: default avatarMike Auty <mike.auty@gmail.com>
Signed-off-by: default avatarJiri Pirko <jpirko@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9331db4f
...@@ -167,6 +167,8 @@ struct sk_buff *vlan_untag(struct sk_buff *skb) ...@@ -167,6 +167,8 @@ struct sk_buff *vlan_untag(struct sk_buff *skb)
if (unlikely(!skb)) if (unlikely(!skb))
goto err_free; goto err_free;
skb_reset_network_header(skb);
skb_reset_transport_header(skb);
return skb; return skb;
err_free: err_free:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment