Commit f4ab5432 authored Sep 23, 2008 by Jarek Poplawski Committed by David S. Miller Sep 23, 2008

pkt_sched: Remove the tx queue state check in qdisc_run()



The current check wrongly uses the state of one (currently the first)
tx queue for all tx queues in case of non-default qdiscs. This check
mainly prevented requeuing loop with __netif_schedule(), but now it's
controlled inside __qdisc_run(), while dequeuing. The wrongness of
this check was first noticed by Herbert Xu.

Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent cd07a8ea

include/net/pkt_sched.h

+1 −4

Original line number	Diff line number	Diff line
		@@ -90,10 +90,7 @@ extern void __qdisc_run(struct Qdisc *q);

		static inline void qdisc_run(struct Qdisc *q)
		{
		struct netdev_queue *txq = q->dev_queue;

		if (!netif_tx_queue_stopped(txq) &&
		!test_and_set_bit(__QDISC_STATE_RUNNING, &q->state))
		if (!test_and_set_bit(__QDISC_STATE_RUNNING, &q->state))
		__qdisc_run(q);
		}