From 8b1692a1db6dc4af5893c0fbc2cb288242bdacad Mon Sep 17 00:00:00 2001 From: Michael Chan Date: Tue, 13 Feb 2007 12:18:30 -0800 Subject: [PATCH] --- yaml --- r: 48275 b: refs/heads/master c: b0408751128edc126eb37798d51891d8d0a41dc6 h: refs/heads/master i: 48273: af8132ccfb7af1fc17e47d2724f70f017e3a03fa 48271: f347c026f2106d0d21a3d8a995c7f5bd2f8a8951 v: v3 --- [refs] | 2 +- trunk/drivers/net/tg3.c | 12 +++++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 90504a372f08..bb29579f6fa9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 569a5df8597deeaa39867be73c7305fd82522f57 +refs/heads/master: b0408751128edc126eb37798d51891d8d0a41dc6 diff --git a/trunk/drivers/net/tg3.c b/trunk/drivers/net/tg3.c index a1aeba2442f5..159570b12c38 100644 --- a/trunk/drivers/net/tg3.c +++ b/trunk/drivers/net/tg3.c @@ -3735,13 +3735,23 @@ static void tg3_reset_task(struct work_struct *work) tg3_full_unlock(tp); } +static void tg3_dump_short_state(struct tg3 *tp) +{ + printk(KERN_ERR PFX "DEBUG: MAC_TX_STATUS[%08x] MAC_RX_STATUS[%08x]\n", + tr32(MAC_TX_STATUS), tr32(MAC_RX_STATUS)); + printk(KERN_ERR PFX "DEBUG: RDMAC_STATUS[%08x] WDMAC_STATUS[%08x]\n", + tr32(RDMAC_STATUS), tr32(WDMAC_STATUS)); +} + static void tg3_tx_timeout(struct net_device *dev) { struct tg3 *tp = netdev_priv(dev); - if (netif_msg_tx_err(tp)) + if (netif_msg_tx_err(tp)) { printk(KERN_ERR PFX "%s: transmit timed out, resetting\n", dev->name); + tg3_dump_short_state(tp); + } schedule_work(&tp->reset_task); }