summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2012-05-10 04:49:57 +0200
committerDavid S. Miller <davem@davemloft.net>2012-05-10 04:49:57 +0200
commit0e0c55165b638e96c8d7097ea638aa368daa268a (patch)
tree4646cff9474a66ea7e93e06c8c14447f8dd8548e /drivers/net
parentr8169: fix unsigned int wraparound with TSO (diff)
parentsfc: Fix division by zero when using one RX channel and no SR-IOV (diff)
downloadlinux-0e0c55165b638e96c8d7097ea638aa368daa268a.tar.xz
linux-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.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c
index 3cbfbffe3f00..4a0005342e65 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;