• J
    net: vlan: make non-hw-accel rx path similar to hw-accel · bcc6d479
    Jiri Pirko 提交于
    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: NJiri Pirko <jpirko@redhat.com>
    
    v1->v2:
    	remove "inline" from vlan_core.c functions
    Signed-off-by: NDavid S. Miller <davem@davemloft.net>
    bcc6d479
vlan_dev.c 19.0 KB