tsnep: Fix ethtool channels

Gerhard Engleder · davem330 · commit a7f991953d73 · 2023-09-18T10:42:36.000+01:00
According to the NAPI documentation networking/napi.rst, for the ethtool
API a channel is a IRQ/NAPI which services queues of a given type.

tsnep uses a single IRQ/NAPI instance for every TX/RX queue pair.
Therefore, combined channels shall be returned instead of separate tx/rx
channels.

Signed-off-by: Gerhard Engleder &lt;gerhard@engleder-embedded.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/drivers/net/ethernet/engleder/tsnep_ethtool.c b/drivers/net/ethernet/engleder/tsnep_ethtool.c
@@ -300,10 +300,8 @@ static void tsnep_ethtool_get_channels(struct net_device *netdev,
 {
 	struct tsnep_adapter *adapter = netdev_priv(netdev);
 
-	ch->max_rx = adapter->num_rx_queues;
-	ch->max_tx = adapter->num_tx_queues;
-	ch->rx_count = adapter->num_rx_queues;
-	ch->tx_count = adapter->num_tx_queues;
+	ch->max_combined = adapter->num_queues;
+	ch->combined_count = adapter->num_queues;
 }
 
 static int tsnep_ethtool_get_ts_info(struct net_device *netdev,

Original file line number	Diff line number	Diff line change
`@@ -300,10 +300,8 @@ static void tsnep_ethtool_get_channels(struct net_device *netdev,`
`300`	`300`	`{`
`301`	`301`	`struct tsnep_adapter *adapter = netdev_priv(netdev);`
`302`	`302`
`303`		`- ch->max_rx = adapter->num_rx_queues;`
`304`		`- ch->max_tx = adapter->num_tx_queues;`
`305`		`- ch->rx_count = adapter->num_rx_queues;`
`306`		`- ch->tx_count = adapter->num_tx_queues;`
	`303`	`+ ch->max_combined = adapter->num_queues;`
	`304`	`+ ch->combined_count = adapter->num_queues;`
`307`	`305`	`}`
`308`	`306`
`309`	`307`	`static int tsnep_ethtool_get_ts_info(struct net_device *netdev,`