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

Commit 1f064a87 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller
Browse files

[TG3]: remove warning on race 



[ Move assosciated code comment to the correct spot, and
  update driver version and release date -DaveM ]

Signed-off-by: default avatarStephen Hemminger <shemminger@osdl.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4ebf0ae2

drivers/net/tg3.c

+9 −6
Original line number Original line Diff line number Diff line
@@ -68,8 +68,8 @@ 




#define DRV_MODULE_NAME		"tg3"

#define DRV_MODULE_NAME		"tg3"

#define PFX DRV_MODULE_NAME	": "

#define PFX DRV_MODULE_NAME	": "

#define DRV_MODULE_VERSION	"3.43"

#define DRV_MODULE_VERSION	"3.44"

#define DRV_MODULE_RELDATE	"Oct 24, 2005"

#define DRV_MODULE_RELDATE	"Dec 6, 2005"





#define TG3_DEF_MAC_MODE	0

#define TG3_DEF_MAC_MODE	0

#define TG3_DEF_RX_MODE		0

#define TG3_DEF_RX_MODE		0
@@ -3565,12 +3565,15 @@ static int tg3_start_xmit(struct sk_buff *skb, struct net_device *dev) 
	if (!spin_trylock(&tp->tx_lock))

	if (!spin_trylock(&tp->tx_lock))

		return NETDEV_TX_LOCKED; 

		return NETDEV_TX_LOCKED; 





	/* This is a hard error, log it. */

	if (unlikely(TX_BUFFS_AVAIL(tp) <= (skb_shinfo(skb)->nr_frags + 1))) {

	if (unlikely(TX_BUFFS_AVAIL(tp) <= (skb_shinfo(skb)->nr_frags + 1))) {

		if (!netif_queue_stopped(dev)) {

			netif_stop_queue(dev);

			netif_stop_queue(dev);



			/* This is a hard error, log it. */

			printk(KERN_ERR PFX "%s: BUG! Tx Ring full when "

			       "queue awake!\n", dev->name);

		}

		spin_unlock(&tp->tx_lock);

		spin_unlock(&tp->tx_lock);

		printk(KERN_ERR PFX "%s: BUG! Tx Ring full when queue awake!\n",

		       dev->name);

		return NETDEV_TX_BUSY;

		return NETDEV_TX_BUSY;

	}

	}