Skip to content

Commit 06bb1c3

Browse files
Alexander DuyckJeff Kirsher
authored andcommitted
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: Alexander Duyck <[email protected]> Tested-by: Phil Schmitt <[email protected]> Signed-off-by: Jeff Kirsher <[email protected]>
1 parent 18be4fc commit 06bb1c3

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4172,11 +4172,11 @@ static void ixgbe_vlan_promisc_disable(struct ixgbe_adapter *adapter)
41724172

41734173
static void ixgbe_restore_vlan(struct ixgbe_adapter *adapter)
41744174
{
4175-
u16 vid;
4175+
u16 vid = 1;
41764176

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

4179-
for_each_set_bit(vid, adapter->active_vlans, VLAN_N_VID)
4179+
for_each_set_bit_from(vid, adapter->active_vlans, VLAN_N_VID)
41804180
ixgbe_vlan_rx_add_vid(adapter->netdev, htons(ETH_P_8021Q), vid);
41814181
}
41824182

0 commit comments

Comments
 (0)