• Jiri Pirko's avatar
    vlan: Fix the ingress VLAN_FLAG_REORDER_HDR check · 0b5c9db1
    Jiri Pirko authored
    Testing of VLAN_FLAG_REORDER_HDR does not belong in vlan_untag
    but rather in vlan_do_receive.  Otherwise the vlan header
    will not be properly put on the packet in the case of
    vlan header accelleration.
    
    As we remove the check from vlan_check_reorder_header
    rename it vlan_reorder_header to keep the naming clean.
    
    Fix up the skb->pkt_type early so we don't look at the packet
    after adding the vlan tag, which guarantees we don't goof
    and look at the wrong field.
    
    Use a simple if statement instead of a complicated switch
    statement to decided that we need to increment rx_stats
    for a multicast packet.
    
    Hopefully at somepoint we will just declare the case where
    VLAN_FLAG_REORDER_HDR is cleared as unsupported and remove
    the code.  Until then this keeps it working correctly.
    Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
    Signed-off-by: default avatarJiri Pirko <jpirko@redhat.com>
    Acked-by: default avatarChangli Gao <xiaosuo@gmail.com>
    Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    0b5c9db1
dev.c 158 KB