diff --git a/[refs] b/[refs] index 5e8caa4bfb8e..4c617333ed08 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cd07a8ea0dd4b204919b4c9ced8d9efdd9924495 +refs/heads/master: f4ab543201992fe499bef5c406e09f23aa97b4d5 diff --git a/trunk/include/net/pkt_sched.h b/trunk/include/net/pkt_sched.h index b786a5b09253..4082f39f5079 100644 --- a/trunk/include/net/pkt_sched.h +++ b/trunk/include/net/pkt_sched.h @@ -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); }