diff options
| author |   Wolfram Sang <wsa@kernel.org> | 2022-09-27 21:33:37 +0200 |
|---|---|---|
| committer | Wolfram Sang <wsa@kernel.org> | 2022-09-27 21:33:37 +0200 |
| commit | 85f17d677f6c40069287617630f202eb20fcfe36 (patch) | |
| tree | a0a7de12ddf19068b14124d7a64d79cf697e0710 /drivers/net/ethernet/sfc/efx_channels.c | |
| parent | macintosh/ams: Adapt declaration of ams_i2c_remove() to earlier change (diff) | |
| parent | Linux 6.0-rc7 (diff) | |
| download | linux-dev-85f17d677f6c40069287617630f202eb20fcfe36.tar.xz linux-dev-85f17d677f6c40069287617630f202eb20fcfe36.zip | |
Merge branch 'master' into i2c/for-mergewindow
Diffstat (limited to 'drivers/net/ethernet/sfc/efx_channels.c')
| -rw-r--r-- | drivers/net/ethernet/sfc/efx_channels.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/sfc/efx_channels.c b/drivers/net/ethernet/sfc/efx_channels.c index 032b8c0bd788..5b4d661ab986 100644 --- a/drivers/net/ethernet/sfc/efx_channels.c +++ b/drivers/net/ethernet/sfc/efx_channels.c @@ -319,7 +319,7 @@ int efx_probe_interrupts(struct efx_nic *efx) efx->n_channels = 1 + (efx_separate_tx_channels ? 1 : 0); efx->n_rx_channels = 1; efx->n_tx_channels = 1; - efx->tx_channel_offset = 1; + efx->tx_channel_offset = efx_separate_tx_channels ? 1 : 0; efx->n_xdp_channels = 0; efx->xdp_channel_offset = efx->n_channels; efx->legacy_irq = efx->pci_dev->irq; |