igb: Always enable VLAN 0 even if 8021q is not loaded
authorAlexander Duyck <aduyck@mirantis.com>
Thu, 7 Jan 2016 07:10:54 +0000 (23:10 -0800)
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>
Tue, 16 Feb 2016 00:33:42 +0000 (16:33 -0800)
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: Alexander Duyck <aduyck@mirantis.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
drivers/net/ethernet/intel/igb/igb_main.c

index 9461480e4effa50427b3e24edd02f200d83241be..f3e17385f737a1cf59dc4192a8606c1cb712411f 100644 (file)
@@ -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);
 }