Merge branch 'sfc-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc (0e0c5516) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/net/ethernet/sfc/efx.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;