Merge git://git.infradead.org/battery-2.6

[~andy/linux] / include / net / pkt_sched.h

diff --git a/include/net/pkt_sched.h b/include/net/pkt_sched.h
index 9d4d87cc970e3b487c5c0879008bb0588a0e87dd..d9549af6929a1d4c7567ba94a1811cd31a996ac4 100644 (file)
--- a/include/net/pkt_sched.h
+++ b/include/net/pkt_sched.h
@@ -95,7 +95,7 @@ extern void __qdisc_run(struct Qdisc *q);
 
 static inline void qdisc_run(struct Qdisc *q)
 {
-       if (!test_and_set_bit(__QDISC_STATE_RUNNING, &q->state))
+       if (qdisc_run_begin(q))
                __qdisc_run(q);
 }