diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-11 20:23:58 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-11 20:23:58 -0800 |
| commit | 913f2d792ff584bf9ebf5968472b3e4ffe0fd9c8 (patch) | |
| tree | 37c499384a1e516a9b92ddb841fada84e9be0167 /drivers | |
| parent | fe3f2053fd42148b3ebb7b90de5f20eaf3393860 (diff) | |
| parent | 73d4f84fd001b0be67fea46e84b75e6a7a5da08e (diff) | |
| download | kernel-crypto-913f2d792ff584bf9ebf5968472b3e4ffe0fd9c8.tar.gz kernel-crypto-913f2d792ff584bf9ebf5968472b3e4ffe0fd9c8.tar.xz kernel-crypto-913f2d792ff584bf9ebf5968472b3e4ffe0fd9c8.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/tg3.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/drivers/net/tg3.c b/drivers/net/tg3.c index 1828a6bf845..47bd4a39442 100644 --- a/drivers/net/tg3.c +++ b/drivers/net/tg3.c @@ -68,8 +68,8 @@ #define DRV_MODULE_NAME "tg3" #define PFX DRV_MODULE_NAME ": " -#define DRV_MODULE_VERSION "3.43" -#define DRV_MODULE_RELDATE "Oct 24, 2005" +#define DRV_MODULE_VERSION "3.44" +#define DRV_MODULE_RELDATE "Dec 6, 2005" #define TG3_DEF_MAC_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)) return NETDEV_TX_LOCKED; - /* This is a hard error, log it. */ if (unlikely(TX_BUFFS_AVAIL(tp) <= (skb_shinfo(skb)->nr_frags + 1))) { - netif_stop_queue(dev); + if (!netif_queue_stopped(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); - printk(KERN_ERR PFX "%s: BUG! Tx Ring full when queue awake!\n", - dev->name); return NETDEV_TX_BUSY; } |