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

Commit 5982a556 authored by Alexander Duyck's avatar Alexander Duyck Committed by Jeff Kirsher
Browse files

igb: Always enable VLAN 0 even if 8021q is not loaded 



This patch makes it so that we always add VLAN 0.  This is important as we
need to guarantee the PF can receive untagged frames in the case of SR-IOV
being enabled but VLAN filtering not being enabled in the kernel.

Signed-off-by: default avatarAlexander Duyck <aduyck@mirantis.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent d3836f8e

drivers/net/ethernet/intel/igb/igb_main.c

+3 −2
Original line number Diff line number Diff line
@@ -7177,11 +7177,12 @@ static int igb_vlan_rx_kill_vid(struct net_device *netdev, 


static void igb_restore_vlan(struct igb_adapter *adapter)

{

	u16 vid;

	u16 vid = 1;



	igb_vlan_mode(adapter->netdev, adapter->netdev->features);

	igb_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)

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

}