diff options
| author | David S. Miller <davem@davemloft.net> | 2012-05-09 22:49:57 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-05-09 22:49:57 -0400 |
| commit | 0e0c55165b638e96c8d7097ea638aa368daa268a (patch) | |
| tree | 4646cff9474a66ea7e93e06c8c14447f8dd8548e /drivers/net | |
| parent | 477206a018f902895bfcd069dd820bfe94c187b1 (diff) | |
| parent | 3132d2827d92c2ee47fdf4dbec75bba0a2f291cb (diff) | |
| download | linux-3.10-0e0c55165b638e96c8d7097ea638aa368daa268a.tar.gz linux-3.10-0e0c55165b638e96c8d7097ea638aa368daa268a.tar.bz2 linux-3.10-0e0c55165b638e96c8d7097ea638aa368daa268a.zip | |
Merge branch 'sfc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/sfc/efx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c index 3cbfbffe3f0..4a0005342e6 100644 --- 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; |