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

Commit 665c8c8e authored by Williams, Mitch A's avatar Williams, Mitch A Committed by David S. Miller
Browse files

igb: fix i350 SR-IOV failture 



When SR-IOV is enabled, i350 devices fail to pass traffic. This is due to
the driver attempting to enable RSS on the PF device, which is not
supported by the i350.

When max_vfs is specified on an i350 adapter, set the number of RSS queues
to 1.

This issue affects 2.6.39 as well.

CC: stable@kernel.org
Signed-off-by: default avatarMitch Williams <mitch.a.williams@intel.com>
Tested-by: default avatarJeff Pieper <jeffrey.e.pieper@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 264524d5

drivers/net/igb/igb_main.c

+3 −0
Original line number Diff line number Diff line
@@ -2373,6 +2373,9 @@ static int __devinit igb_sw_init(struct igb_adapter *adapter) 
	}

#endif /* CONFIG_PCI_IOV */

	adapter->rss_queues = min_t(u32, IGB_MAX_RX_QUEUES, num_online_cpus());

	/* i350 cannot do RSS and SR-IOV at the same time */

	if (hw->mac.type == e1000_i350 && adapter->vfs_allocated_count)

		adapter->rss_queues = 1;



	/*

	 * if rss_queues > 4 or vfs are going to be allocated with rss_queues