diff options
| author |   Paolo Abeni <pabeni@redhat.com> | 2021-07-20 10:41:48 +0200 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2021-07-20 06:11:18 -0700 |
| commit | f7918b79019f13ece815b2a88bab12974793aed1 (patch) | |
| tree | 598968e82b44b47e09f34e5a6d3f6576c44044d1 /drivers/net/veth.c | |
| parent | memcg: enable accounting for scm_fp_list objects (diff) | |
| download | linux-dev-f7918b79019f13ece815b2a88bab12974793aed1.tar.xz linux-dev-f7918b79019f13ece815b2a88bab12974793aed1.zip | |
veth: always report zero combined channels
veth get_channel currently reports for channels being both RX/TX and
combined. As Jakub noted:
"""
ethtool man page is relatively clear, unfortunately the kernel code
is not and few read the man page. A channel is approximately an IRQ,
not a queue, and IRQ can't be dedicated and combined simultaneously
"""
This patch changes the information exposed by veth_get_channels,
setting max_combined to zero, being more consistent with the above
statement. The ethtool_channels is always cleared by the caller, we just
need to avoid setting the 'combined' fields.
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/veth.c')
| -rw-r--r-- | drivers/net/veth.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/net/veth.c b/drivers/net/veth.c index bdb7ce3cb054..4b3e2617fdb5 100644 --- a/drivers/net/veth.c +++ b/drivers/net/veth.c @@ -226,8 +226,6 @@ static void veth_get_channels(struct net_device *dev, channels->rx_count = dev->real_num_rx_queues; channels->max_tx = dev->real_num_tx_queues; channels->max_rx = dev->real_num_rx_queues; - channels->combined_count = min(dev->real_num_rx_queues, dev->real_num_tx_queues); - channels->max_combined = min(dev->real_num_rx_queues, dev->real_num_tx_queues); } static const struct ethtool_ops veth_ethtool_ops = { |