• Vladimir Oltean's avatar
    net: bridge: vlan: make __vlan_add_flags react only to PVID and UNTAGGED · cab2cd77
    Vladimir Oltean authored
    Currently there is a very subtle aspect to the behavior of
    __vlan_add_flags(): it changes the struct net_bridge_vlan flags and
    pvid, yet it returns true ("changed") even if none of those changed,
    just a transition of br_vlan_is_brentry(v) took place from false to
    true.
    
    This can be seen in br_vlan_add_existing(), however we do not actually
    rely on this subtle behavior, since the "if" condition that checks that
    the vlan wasn't a brentry before had a useless (until now) assignment:
    
    	*changed = true;
    
    Make things more obvious by actually making __vlan_add_flags() do what's
    written on the box, and be more specific about what is actually written
    on the box. This is needed because further transformations will be done
    to __vlan_add_flags().
    Signed-off-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
    Acked-by: default avatarNikolay Aleksandrov <nikolay@nvidia.com>
    Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    cab2cd77
br_vlan.c 53.2 KB