patch-2.3.47 linux/drivers/net/eexpress.c

Next file: linux/drivers/net/epic100.c
Previous file: linux/drivers/net/eepro100.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.46/linux/drivers/net/eexpress.c linux/drivers/net/eexpress.c
@@ -543,7 +543,7 @@
 				else
 				{
 					unsigned short txstatus = eexp_hw_lasttxstat(dev);
-					if (test_bit(LINK_STATE_XOFF, &dev->state) && !txstatus)
+					if (netif_queue_stopped(dev) && !txstatus)
 					{
 						printk(KERN_WARNING "%s: CU wedged, status %04x %04x, resetting...\n",
 						       dev->name,status,txstatus);
@@ -1204,7 +1204,7 @@
 	unsigned short tx_block = lp->tx_reap;
 	unsigned short status;
 
-	if (!test_bit(LINK_STATE_XOFF, &dev->state) && lp->tx_head==lp->tx_reap)
+	if (!netif_queue_stopped(dev) && lp->tx_head==lp->tx_reap)
 		return 0x0000;
 
 	do

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)