net: vlan: make non-hw-accel rx path similar to hw-accel
Now there are 2 paths for rx vlan frames. When rx-vlan-hw-accel is enabled, skb is untagged by NIC, vlan_tci is set and the skb gets into vlan code in __netif_receive_skb - vlan_hwaccel_do_receive. For non-rx-vlan-hw-accel however, tagged skb goes thru whole __netif_receive_skb, it's untagged in ptype_base hander and reinjected This incosistency is fixed by this patch. Vlan untagging happens early in __netif_receive_skb so the rest of code (ptype_all handlers, rx_handlers) see the skb like it was untagged by hw. Signed-off-by:Jiri Pirko <jpirko@redhat.com> v1->v2: remove "inline" from vlan_core.c functions Signed-off-by:
David S. Miller <davem@davemloft.net>
Showing
- include/linux/if_vlan.h 8 additions, 2 deletionsinclude/linux/if_vlan.h
- net/8021q/vlan.c 0 additions, 8 deletionsnet/8021q/vlan.c
- net/8021q/vlan.h 0 additions, 2 deletionsnet/8021q/vlan.h
- net/8021q/vlan_core.c 84 additions, 1 deletionnet/8021q/vlan_core.c
- net/8021q/vlan_dev.c 0 additions, 173 deletionsnet/8021q/vlan_dev.c
- net/core/dev.c 7 additions, 1 deletionnet/core/dev.c
Loading
Please register or sign in to comment