patch-2.3.44 linux/drivers/net/mace.c

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

diff -u --recursive --new-file v2.3.43/linux/drivers/net/mace.c linux/drivers/net/mace.c
@@ -445,7 +445,7 @@
     if (next >= N_TX_RING)
 	next = 0;
     if (next == mp->tx_empty) {
-	dev->tbusy = 1;
+	netif_stop_queue(dev);
 	mp->tx_fullup = 1;
 	restore_flags(flags);
 	return 1;		/* can't take it at the moment */
@@ -480,7 +480,7 @@
     if (++next >= N_TX_RING)
 	next = 0;
     if (next == mp->tx_empty)
-	dev->tbusy = 1;
+	netif_stop_queue(dev);
     restore_flags(flags);
 
     return 0;
@@ -695,8 +695,7 @@
 
     if (i != mp->tx_empty) {
 	mp->tx_fullup = 0;
-	dev->tbusy = 0;
-	mark_bh(NET_BH);
+	netif_wake_queue(dev);
     }
     mp->tx_empty = i;
     i += mp->tx_active;
@@ -765,8 +764,7 @@
 	mp->tx_empty = i;
     }
     mp->tx_fullup = 0;
-    dev->tbusy = 0;
-    mark_bh(NET_BH);
+    netif_wake_queue(dev);
     if (i != mp->tx_fill) {
 	cp = mp->tx_cmds + NCMDS_TX * i;
 	out_le16(&cp->xfer_status, 0);

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