]> git.baikalelectronics.ru Git - kernel.git/commit
sfc: fix wrong tx channel offset with efx_separate_tx_channels
authorÍñigo Huguet <ihuguet@redhat.com>
Fri, 27 May 2022 08:05:29 +0000 (10:05 +0200)
committerDavid S. Miller <davem@davemloft.net>
Sun, 29 May 2022 11:12:53 +0000 (12:12 +0100)
commit85316e38494ad4edff3aba322a4c18122583f6cb
tree867c175ff7def0b0928c68105300da5f05322f16
parentbcacf994d242f0048a1aeadeb7fa11b1ad13bc2f
sfc: fix wrong tx channel offset with efx_separate_tx_channels

tx_channel_offset is calculated in efx_allocate_msix_channels, but it is
also calculated again in efx_set_channels because it was originally done
there, and when efx_allocate_msix_channels was introduced it was
forgotten to be removed from efx_set_channels.

Moreover, the old calculation is wrong when using
efx_separate_tx_channels because now we can have XDP channels after the
TX channels, so n_channels - n_tx_channels doesn't point to the first TX
channel.

Remove the old calculation from efx_set_channels, and add the
initialization of this variable if MSI or legacy interrupts are used,
next to the initialization of the rest of the related variables, where
it was missing.

Fixes: dc1c0a923867 ("sfc: allocate channels for XDP tx queues")
Reported-by: Tianhao Zhao <tizhao@redhat.com>
Signed-off-by: Íñigo Huguet <ihuguet@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/sfc/efx_channels.c