Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2012-05-16 22:17:37 -04:00
parent be3eed2e96 0e93b4b304
commit 028940342a
232 changed files with 1485 additions and 1057 deletions
--- a/drivers/net/ethernet/sfc/efx.c
+++ b/drivers/net/ethernet/sfc/efx.c
@@ -1354,7 +1354,7 @@ static int efx_probe_interrupts(struct efx_nic *efx)
 	}

 	/* RSS might be usable on VFs even if it is disabled on the PF */
-	efx->rss_spread = (efx->n_rx_channels > 1 ?
+	efx->rss_spread = ((efx->n_rx_channels > 1 || !efx_sriov_wanted(efx)) ?
 			   efx->n_rx_channels : efx_vf_size(efx));

 	return 0;