Warning is now gone...

From: David Miller <davem@davemloft.net>
Date: 2008-07-23 21:05:17
Subsystem: networking [general], the rest · Maintainers: "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds

As discussed, here is the warning removal, which I have checked
into net-2.6

It really was putting the cart before the horse, because
one should provide a sane alternative before making something
illegal :-)

I'll try to come up with a usable netif_tx_{free,unfreeze}()
set of interfaces.

netdev: Remove warning from __netif_schedule().

It isn't helping anything and we aren't going to be able to change all
the drivers that do queue wakeups in strange situations.

Just letting a noop_qdisc get scheduled will work because when
qdisc_run() executes via net_tx_work() it will simply find no packets
pending when it makes the ->dequeue() call in qdisc_restart.

Signed-off-by: David S. Miller <davem@davemloft.net>
---
 net/core/dev.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/net/core/dev.c b/net/core/dev.c
index 6bf217d..ccf97f9 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -1341,9 +1341,6 @@ static void dev_queue_xmit_nit(struct sk_buff *skb, struct net_device *dev)
 
 void __netif_schedule(struct Qdisc *q)
 {
-	if (WARN_ON_ONCE(q == &noop_qdisc))
-		return;
-
 	if (!test_and_set_bit(__QDISC_STATE_SCHED, &q->state)) {
 		struct softnet_data *sd;
 		unsigned long flags;
-- 
1.6.0.rc0.14.g95f8
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help