Commit 56f0569e authored Jun 15, 2015 by Jacob Keller Committed by Jeff Kirsher Sep 15, 2015

fm10k: only prevent removal of default VID rules



This allows us to correctly add a VLAN even if it matches our default
VID. However, we don't want to remove the VID rules once that VLAN is
deleted. Correctly remove the stack layers information of the VLAN, but
then return to forwarding that VID as untagged frames. If we deleted the
VID rules here, we would begin dropping traffic due to VLAN membership
violations.

Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
Tested-by: Krishneil Singh <krishneil.k.singh@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

parent e4029662

drivers/net/ethernet/intel/fm10k/fm10k_netdev.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -775,8 +775,8 @@ static int fm10k_update_vid(struct net_device *netdev, u16 vid, bool set)
		if (!set)
		clear_bit(vid, interface->active_vlans);

		/* if default VLAN is already present do nothing */
		if (vid == hw->mac.default_vid)
		/* Do not remove default VID related entries from VLAN and MAC tables */
		if (!set && vid == hw->mac.default_vid)
		return 0;

		fm10k_mbx_lock(interface);