2.6.39-stable review patch. If anyone has any objections, please let us know.
------------------ From: "Williams, Mitch A" <[email protected]> commit 665c8c8ee405738375b679246b49342ce38ba056 upstream. 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. Signed-off-by: Mitch Williams <[email protected]> Tested-by: Jeff Pieper <[email protected]> Signed-off-by: Jeff Kirsher <[email protected]> Signed-off-by: David S. Miller <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> --- drivers/net/igb/igb_main.c | 3 +++ 1 file changed, 3 insertions(+) --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c @@ -2372,6 +2372,9 @@ static int __devinit igb_sw_init(struct } #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 _______________________________________________ stable mailing list [email protected] http://linux.kernel.org/mailman/listinfo/stable
