Commit f7918b79 authored by Paolo Abeni's avatar Paolo Abeni Committed by David S. Miller
Browse files

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: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2c6ad20b

drivers/net/veth.c

+0 −2
Original line number Diff line number Diff line
@@ -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 = {