47 lines
1.7 KiB
Diff
47 lines
1.7 KiB
Diff
From: Sathya Perla <sathya.perla@emulex.com>
|
|
Date: Tue, 13 Dec 2011 00:58:49 +0000
|
|
Subject: [PATCH 19/58] be2net: fix ethtool ringparam reporting
|
|
|
|
commit 110b82bc6265a48c1a0bf198109bed325ed055e2 upstream.
|
|
|
|
The ethtool "-g" option is supposed to report the max queue length and
|
|
user modified queue length for RX and TX queues. be2net doesn't support
|
|
user modification of queue lengths. So, the correct values for these
|
|
would be the max numbers.
|
|
be2net incorrectly reports the queue used values for these fields.
|
|
|
|
Signed-off-by: Sathya Perla <sathya.perla@emulex.com>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/ethernet/emulex/benet/be_ethtool.c | 11 ++++-------
|
|
1 file changed, 4 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/drivers/net/ethernet/emulex/benet/be_ethtool.c b/drivers/net/ethernet/emulex/benet/be_ethtool.c
|
|
index 575c783..6ba2dc6 100644
|
|
--- a/drivers/net/ethernet/emulex/benet/be_ethtool.c
|
|
+++ b/drivers/net/ethernet/emulex/benet/be_ethtool.c
|
|
@@ -520,16 +520,13 @@ static int be_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
|
|
return 0;
|
|
}
|
|
|
|
-static void
|
|
-be_get_ringparam(struct net_device *netdev, struct ethtool_ringparam *ring)
|
|
+static void be_get_ringparam(struct net_device *netdev,
|
|
+ struct ethtool_ringparam *ring)
|
|
{
|
|
struct be_adapter *adapter = netdev_priv(netdev);
|
|
|
|
- ring->rx_max_pending = adapter->rx_obj[0].q.len;
|
|
- ring->tx_max_pending = adapter->tx_obj[0].q.len;
|
|
-
|
|
- ring->rx_pending = atomic_read(&adapter->rx_obj[0].q.used);
|
|
- ring->tx_pending = atomic_read(&adapter->tx_obj[0].q.used);
|
|
+ ring->rx_max_pending = ring->rx_pending = adapter->rx_obj[0].q.len;
|
|
+ ring->tx_max_pending = ring->tx_pending = adapter->tx_obj[0].q.len;
|
|
}
|
|
|
|
static void
|
|
--
|
|
1.7.10
|
|
|