diff options
| author | Edward Cree <ecree@solarflare.com> | 2020-06-30 14:14:45 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-06-30 22:09:09 +0200 |
| commit | d4adc5162b9731df8ad95808c088e8ca4a5b1aaa (patch) | |
| tree | a6d38342ab8104f6f354fc74d0c30eceb13d2f71 /drivers/net/ethernet | |
| parent | sfc: initialise max_[tx_]channels in efx_init_channels() (diff) | |
| download | linux-d4adc5162b9731df8ad95808c088e8ca4a5b1aaa.tar.xz linux-d4adc5162b9731df8ad95808c088e8ca4a5b1aaa.zip | |
sfc: commonise efx->[rt]xq_entries initialisation
Signed-off-by: Edward Cree <ecree@solarflare.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet')
| -rw-r--r-- | drivers/net/ethernet/sfc/efx.c | 1 | ||||
| -rw-r--r-- | drivers/net/ethernet/sfc/efx_common.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/ethernet/sfc/efx.c b/drivers/net/ethernet/sfc/efx.c index 41a2c972323e..028d826ab147 100644 --- a/drivers/net/ethernet/sfc/efx.c +++ b/drivers/net/ethernet/sfc/efx.c @@ -385,7 +385,6 @@ static int efx_probe_all(struct efx_nic *efx) rc = -EINVAL; goto fail3; } - efx->rxq_entries = efx->txq_entries = EFX_DEFAULT_DMAQ_SIZE; #ifdef CONFIG_SFC_SRIOV rc = efx->type->vswitching_probe(efx); diff --git a/drivers/net/ethernet/sfc/efx_common.c b/drivers/net/ethernet/sfc/efx_common.c index 251e37bc7048..822e9e147404 100644 --- a/drivers/net/ethernet/sfc/efx_common.c +++ b/drivers/net/ethernet/sfc/efx_common.c @@ -1035,6 +1035,9 @@ int efx_init_struct(struct efx_nic *efx, INIT_WORK(&efx->mac_work, efx_mac_work); init_waitqueue_head(&efx->flush_wq); + efx->rxq_entries = EFX_DEFAULT_DMAQ_SIZE; + efx->txq_entries = EFX_DEFAULT_DMAQ_SIZE; + efx->mem_bar = UINT_MAX; rc = efx_init_channels(efx); |