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

…it/bwh/sfc
git-mirror · May 10, 2012 · 0e0c551 · 0e0c551
2 parents 477206a + 3132d28
commit 0e0c551
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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;