diff options
Diffstat (limited to 'net/sched/sch_teql.c')
| -rw-r--r-- | net/sched/sch_teql.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/net/sched/sch_teql.c b/net/sched/sch_teql.c index 44a2c3451f4d..ade3372221c7 100644 --- a/net/sched/sch_teql.c +++ b/net/sched/sch_teql.c | |||
| @@ -295,8 +295,7 @@ restart: | |||
| 295 | slave_txq = netdev_get_tx_queue(slave, 0); | 295 | slave_txq = netdev_get_tx_queue(slave, 0); |
| 296 | if (slave_txq->qdisc_sleeping != q) | 296 | if (slave_txq->qdisc_sleeping != q) |
| 297 | continue; | 297 | continue; |
| 298 | if (netif_queue_stopped(slave) || | 298 | if (__netif_subqueue_stopped(slave, subq) || |
| 299 | __netif_subqueue_stopped(slave, subq) || | ||
| 300 | !netif_running(slave)) { | 299 | !netif_running(slave)) { |
| 301 | busy = 1; | 300 | busy = 1; |
| 302 | continue; | 301 | continue; |
| @@ -305,8 +304,7 @@ restart: | |||
| 305 | switch (teql_resolve(skb, skb_res, slave)) { | 304 | switch (teql_resolve(skb, skb_res, slave)) { |
| 306 | case 0: | 305 | case 0: |
| 307 | if (netif_tx_trylock(slave)) { | 306 | if (netif_tx_trylock(slave)) { |
| 308 | if (!netif_queue_stopped(slave) && | 307 | if (!__netif_subqueue_stopped(slave, subq) && |
| 309 | !__netif_subqueue_stopped(slave, subq) && | ||
| 310 | slave->hard_start_xmit(skb, slave) == 0) { | 308 | slave->hard_start_xmit(skb, slave) == 0) { |
| 311 | netif_tx_unlock(slave); | 309 | netif_tx_unlock(slave); |
| 312 | master->slaves = NEXT_SLAVE(q); | 310 | master->slaves = NEXT_SLAVE(q); |