net: ena: make ethtool show correct current and max queue sizes

Currently ethtool -g shows the same size for current and max queue
sizes.

Signed-off-by: Arthur Kiyanovski <akiyano@amazon.com>
Signed-off-by: Sameeh Jubran <sameehj@amazon.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/amazon/ena/ena_ethtool.c b/drivers/net/ethernet/amazon/ena/ena_ethtool.c
index 5687a2860f0183c4014afe4e9ceb1eb9eb0d1554..f9152dfc93d6323f5126d37aa12a913cedb4e63c 100644 (file)
--- a/drivers/net/ethernet/amazon/ena/ena_ethtool.c
+++ b/drivers/net/ethernet/amazon/ena/ena_ethtool.c
@@ -486,13 +486,11 @@ static void ena_get_ringparam(struct net_device *netdev,
                              struct ethtool_ringparam *ring)
 {
        struct ena_adapter *adapter = netdev_priv(netdev);
-       struct ena_ring *tx_ring = &adapter->tx_ring[0];
-       struct ena_ring *rx_ring = &adapter->rx_ring[0];
 
-       ring->rx_max_pending = rx_ring->ring_size;
-       ring->tx_max_pending = tx_ring->ring_size;
-       ring->rx_pending = rx_ring->ring_size;
-       ring->tx_pending = tx_ring->ring_size;
+       ring->tx_max_pending = adapter->max_tx_ring_size;
+       ring->rx_max_pending = adapter->max_rx_ring_size;
+       ring->tx_pending = adapter->tx_ring_size;
+       ring->rx_pending = adapter->rx_ring_size;
 }
 
 static u32 ena_flow_hash_to_flow_type(u16 hash_fields)

diff --git a/drivers/net/ethernet/amazon/ena/ena_netdev.c b/drivers/net/ethernet/amazon/ena/ena_netdev.c
index ba5d580e5d0cf9aff7e344a30930299d4cc23a02..3fe4a92173a93679b46f33cc759283612a95ac1c 100644 (file)
--- a/drivers/net/ethernet/amazon/ena/ena_netdev.c
+++ b/drivers/net/ethernet/amazon/ena/ena_netdev.c
@@ -3438,6 +3438,8 @@ static int ena_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 
        adapter->tx_ring_size = calc_queue_ctx.tx_queue_size;
        adapter->rx_ring_size = calc_queue_ctx.rx_queue_size;
+       adapter->max_tx_ring_size = calc_queue_ctx.max_tx_queue_size;
+       adapter->max_rx_ring_size = calc_queue_ctx.max_rx_queue_size;
        adapter->max_tx_sgl_size = calc_queue_ctx.max_tx_sgl_size;
        adapter->max_rx_sgl_size = calc_queue_ctx.max_rx_sgl_size;