Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4f81c32b authored by Michael Chan's avatar Michael Chan Committed by David S. Miller
Browse files

[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: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e75f7c90

drivers/net/tg3.c

+13 −4
Original line number Diff line number Diff line
@@ -69,8 +69,8 @@ 


#define DRV_MODULE_NAME		"tg3"

#define PFX DRV_MODULE_NAME	": "

#define DRV_MODULE_VERSION	"3.50"

#define DRV_MODULE_RELDATE	"Feb 4, 2006"

#define DRV_MODULE_VERSION	"3.51"

#define DRV_MODULE_RELDATE	"Feb 21, 2006"



#define TG3_DEF_MAC_MODE	0

#define TG3_DEF_RX_MODE		0
@@ -7593,11 +7593,20 @@ static void tg3_get_ringparam(struct net_device *dev, struct ethtool_ringparam * 
  

	ering->rx_max_pending = TG3_RX_RING_SIZE - 1;

	ering->rx_mini_max_pending = 0;

	if (tp->tg3_flags & TG3_FLAG_JUMBO_RING_ENABLE)

		ering->rx_jumbo_max_pending = TG3_RX_JUMBO_RING_SIZE - 1;

	else

		ering->rx_jumbo_max_pending = 0;



	ering->tx_max_pending = TG3_TX_RING_SIZE - 1;



	ering->rx_pending = tp->rx_pending;

	ering->rx_mini_pending = 0;

	if (tp->tg3_flags & TG3_FLAG_JUMBO_RING_ENABLE)

		ering->rx_jumbo_pending = tp->rx_jumbo_pending;

	else

		ering->rx_jumbo_pending = 0;



	ering->tx_pending = tp->tx_pending;

}