patch-2.3.47 linux/net/sched/sch_teql.c

Next file: linux/net/sysctl_net.c
Previous file: linux/net/sched/sch_tbf.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.46/linux/net/sched/sch_teql.c linux/net/sched/sch_teql.c
@@ -296,8 +296,7 @@
 		
 		if (slave->qdisc_sleeping != q)
 			continue;
-		if (test_bit(LINK_STATE_XOFF, &slave->state) ||
-		    test_bit(LINK_STATE_DOWN, &slave->state)) {
+		if (netif_queue_stopped(slave) || ! netif_running(slave)) {
 			busy = 1;
 			continue;
 		}
@@ -306,7 +305,7 @@
 		case 0:
 			if (spin_trylock(&slave->xmit_lock)) {
 				slave->xmit_lock_owner = smp_processor_id();
-				if (!test_bit(LINK_STATE_XOFF, &slave->state) &&
+				if (!netif_queue_stopped(slave) &&
 				    slave->hard_start_xmit(skb, slave) == 0) {
 					slave->xmit_lock_owner = -1;
 					spin_unlock(&slave->xmit_lock);
@@ -319,7 +318,7 @@
 				slave->xmit_lock_owner = -1;
 				spin_unlock(&slave->xmit_lock);
 			}
-			if (test_bit(LINK_STATE_XOFF, &dev->state))
+			if (netif_queue_stopped(dev))
 				busy = 1;
 			break;
 		case 1:

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