Skip to content

Commit f7918b7

Browse files
Paolo Abenidavem330
authored andcommitted
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 <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 2c6ad20 commit f7918b7

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

drivers/net/veth.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,8 +226,6 @@ static void veth_get_channels(struct net_device *dev,
226226
channels->rx_count = dev->real_num_rx_queues;
227227
channels->max_tx = dev->real_num_tx_queues;
228228
channels->max_rx = dev->real_num_rx_queues;
229-
channels->combined_count = min(dev->real_num_rx_queues, dev->real_num_tx_queues);
230-
channels->max_combined = min(dev->real_num_rx_queues, dev->real_num_tx_queues);
231229
}
232230

233231
static const struct ethtool_ops veth_ethtool_ops = {

0 commit comments

Comments
 (0)