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

Commit 06bb1c39 authored by Alexander Duyck's avatar Alexander Duyck Committed by Jeff Kirsher
Browse files

ixgbe: Avoid adding VLAN 0 twice to VLVF and VFTA 



We were adding VLAN 0 twice each time we restored the VLAN configuration.
Instead of doing it twice we can just start working through the active
VLANs from ID 1 on and skip the double write.

Signed-off-by: default avatarAlexander Duyck <aduyck@mirantis.com>
Tested-by: default avatarPhil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 18be4fce

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -4172,11 +4172,11 @@ static void ixgbe_vlan_promisc_disable(struct ixgbe_adapter *adapter) 




static void ixgbe_restore_vlan(struct ixgbe_adapter *adapter)

static void ixgbe_restore_vlan(struct ixgbe_adapter *adapter)

{

{

	u16 vid;

	u16 vid = 1;





	ixgbe_vlan_rx_add_vid(adapter->netdev, htons(ETH_P_8021Q), 0);

	ixgbe_vlan_rx_add_vid(adapter->netdev, htons(ETH_P_8021Q), 0);





	for_each_set_bit(vid, adapter->active_vlans, VLAN_N_VID)

	for_each_set_bit_from(vid, adapter->active_vlans, VLAN_N_VID)

		ixgbe_vlan_rx_add_vid(adapter->netdev, htons(ETH_P_8021Q), vid);

		ixgbe_vlan_rx_add_vid(adapter->netdev, htons(ETH_P_8021Q), vid);

}

}