Merge branch 'sfc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc

0e0c5516 · David S. Miller · 477206a0 · 3132d282 · 0e0c5516
Commit 0e0c5516 authored May 09, 2012 by David S. Miller
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

drivers/net/ethernet/sfc/efx.c drivers/net/ethernet/sfc/efx.c +1 -1

No files found.
--- a/drivers/net/ethernet/sfc/efx.c
+++ b/drivers/net/ethernet/sfc/efx.c
@@ -1349,7 +1349,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;