aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorMichael Chan <mchan@broadcom.com>2006-03-21 00:33:42 -0500
committerDavid S. Miller <davem@davemloft.net>2006-03-21 00:33:42 -0500
commit4f81c32b028aecd818634b1ef36aae3b2b3e66ce (patch)
treee0c9f0945c1d72cd981aa49ad58792d25499bb6f /drivers
parente75f7c900944aa90831f6d343ca40090a68b56dd (diff)
[TG3]: Fix tg3_get_ringparam()
Fix-up tg3_get_ringparam() to return the correct parameters. Set the jumbo rx ring parameter only if it is supported by the chip and currently in use. Add missing value for tx_max_pending, noticed by Rick Jones. Update version to 3.51. Signed-off-by: Michael Chan <mchan@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/tg3.c17
1 files changed, 13 insertions, 4 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c
index f7da3bf2fa09..d4f5b58e1dd4 100644
--- a/drivers/net/tg3.c
+++ b/drivers/net/tg3.c
@@ -69,8 +69,8 @@
69 69
70#define DRV_MODULE_NAME "tg3" 70#define DRV_MODULE_NAME "tg3"
71#define PFX DRV_MODULE_NAME ": " 71#define PFX DRV_MODULE_NAME ": "
72#define DRV_MODULE_VERSION "3.50" 72#define DRV_MODULE_VERSION "3.51"
73#define DRV_MODULE_RELDATE "Feb 4, 2006" 73#define DRV_MODULE_RELDATE "Feb 21, 2006"
74 74
75#define TG3_DEF_MAC_MODE 0 75#define TG3_DEF_MAC_MODE 0
76#define TG3_DEF_RX_MODE 0 76#define TG3_DEF_RX_MODE 0
@@ -7593,11 +7593,20 @@ static void tg3_get_ringparam(struct net_device *dev, struct ethtool_ringparam *
7593 7593
7594 ering->rx_max_pending = TG3_RX_RING_SIZE - 1; 7594 ering->rx_max_pending = TG3_RX_RING_SIZE - 1;
7595 ering->rx_mini_max_pending = 0; 7595 ering->rx_mini_max_pending = 0;
7596 ering->rx_jumbo_max_pending = TG3_RX_JUMBO_RING_SIZE - 1; 7596 if (tp->tg3_flags & TG3_FLAG_JUMBO_RING_ENABLE)
7597 ering->rx_jumbo_max_pending = TG3_RX_JUMBO_RING_SIZE - 1;
7598 else
7599 ering->rx_jumbo_max_pending = 0;
7600
7601 ering->tx_max_pending = TG3_TX_RING_SIZE - 1;
7597 7602
7598 ering->rx_pending = tp->rx_pending; 7603 ering->rx_pending = tp->rx_pending;
7599 ering->rx_mini_pending = 0; 7604 ering->rx_mini_pending = 0;
7600 ering->rx_jumbo_pending = tp->rx_jumbo_pending; 7605 if (tp->tg3_flags & TG3_FLAG_JUMBO_RING_ENABLE)
7606 ering->rx_jumbo_pending = tp->rx_jumbo_pending;
7607 else
7608 ering->rx_jumbo_pending = 0;
7609
7601 ering->tx_pending = tp->tx_pending; 7610 ering->tx_pending = tp->tx_pending;
7602} 7611}
7603 7612