diff options
| author |   David S. Miller <davem@davemloft.net> | 2019-12-20 21:56:48 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-12-20 21:56:48 -0800 |
| commit | 4bfeadfc0712bbc8a6556eef6d47cbae1099dea3 (patch) | |
| tree | 54429d281b249240732e8cba3191d2f63e575df1 /drivers/net/ethernet/sfc/net_driver.h | |
| parent | net: dst: Force 4-byte alignment of dst_metrics (diff) | |
| parent | sfc: Include XDP packet headroom in buffer step size. (diff) | |
| download | linux-dev-4bfeadfc0712bbc8a6556eef6d47cbae1099dea3.tar.xz linux-dev-4bfeadfc0712bbc8a6556eef6d47cbae1099dea3.zip | |
Merge branch 'sfc-fix-bugs-introduced-by-XDP-patches'
Edward Cree says:
====================
sfc: fix bugs introduced by XDP patches
Two fixes for bugs introduced by the XDP support in the sfc driver.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/sfc/net_driver.h')
| -rw-r--r-- | drivers/net/ethernet/sfc/net_driver.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/ethernet/sfc/net_driver.h b/drivers/net/ethernet/sfc/net_driver.h index 1f88212be085..dfd5182d9e47 100644 --- a/drivers/net/ethernet/sfc/net_driver.h +++ b/drivers/net/ethernet/sfc/net_driver.h @@ -1533,9 +1533,7 @@ static inline bool efx_channel_is_xdp_tx(struct efx_channel *channel) static inline bool efx_channel_has_tx_queues(struct efx_channel *channel) { - return efx_channel_is_xdp_tx(channel) || - (channel->type && channel->type->want_txqs && - channel->type->want_txqs(channel)); + return true; } static inline struct efx_tx_queue * |