Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 661b2067 authored by Jeff Kirsher's avatar Jeff Kirsher
Browse files

fm10k: allow creation of VLAN on default vid 



Previously, the user was not allowed to create a VLAN interface on top
of the switch default vid.

Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Acked-by: default avatarMatthew Vick <matthew.vick@intel.com>
Tested-by: default avatarKrishneil Singh <krishneil.k.singh@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent de445199

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

+4 −4
Original line number Diff line number Diff line
@@ -770,15 +770,15 @@ static int fm10k_update_vid(struct net_device *netdev, u16 vid, bool set) 
	if (hw->mac.vlan_override)

		return -EACCES;



	/* if default VLAN is already present do nothing */

	if (vid == hw->mac.default_vid)

		return -EBUSY;



	/* update active_vlans bitmask */

	set_bit(vid, interface->active_vlans);

	if (!set)

		clear_bit(vid, interface->active_vlans);



	/* if default VLAN is already present do nothing */

	if (vid == hw->mac.default_vid)

		return 0;



	fm10k_mbx_lock(interface);



	/* only need to update the VLAN if not in promiscuous mode */