Commit e8a83e10 authored Sep 07, 2008 by Jarek Poplawski Committed by David S. Miller Sep 07, 2008

pkt_sched: Fix qdisc state in net_tx_action()



net_tx_action() can skip __QDISC_STATE_SCHED bit clearing while qdisc
is neither ran nor rescheduled, which may cause endless loop in
dev_deactivate().

Reported-by: Denys Fedoryshchenko <denys@visp.net.lb>
Tested-by: Denys Fedoryshchenko <denys@visp.net.lb>
Signed-off-by: Jarek Poplawski <jarkao2@gmail.com>
Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent e3b802ba

net/core/dev.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -1991,8 +1991,13 @@ static void net_tx_action(struct softirq_action *h)
		spin_unlock(root_lock);
		} else {
		if (!test_bit(__QDISC_STATE_DEACTIVATED,
		&q->state))
		&q->state)) {
		__netif_reschedule(q);
		} else {
		smp_mb__before_clear_bit();
		clear_bit(__QDISC_STATE_SCHED,
		&q->state);
		}
		}
		}
		}