diff options
Diffstat (limited to 'net/sched/sch_teql.c')
-rw-r--r-- | net/sched/sch_teql.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/sched/sch_teql.c b/net/sched/sch_teql.c index be57cf317a7f..421281d9dd1d 100644 --- a/net/sched/sch_teql.c +++ b/net/sched/sch_teql.c | |||
@@ -266,7 +266,7 @@ static int teql_master_xmit(struct sk_buff *skb, struct net_device *dev) | |||
266 | int busy; | 266 | int busy; |
267 | int nores; | 267 | int nores; |
268 | int len = skb->len; | 268 | int len = skb->len; |
269 | int subq = skb->queue_mapping; | 269 | int subq = skb_get_queue_mapping(skb); |
270 | struct sk_buff *skb_res = NULL; | 270 | struct sk_buff *skb_res = NULL; |
271 | 271 | ||
272 | start = master->slaves; | 272 | start = master->slaves; |
@@ -284,7 +284,7 @@ restart: | |||
284 | if (slave->qdisc_sleeping != q) | 284 | if (slave->qdisc_sleeping != q) |
285 | continue; | 285 | continue; |
286 | if (netif_queue_stopped(slave) || | 286 | if (netif_queue_stopped(slave) || |
287 | netif_subqueue_stopped(slave, subq) || | 287 | __netif_subqueue_stopped(slave, subq) || |
288 | !netif_running(slave)) { | 288 | !netif_running(slave)) { |
289 | busy = 1; | 289 | busy = 1; |
290 | continue; | 290 | continue; |
@@ -294,7 +294,7 @@ restart: | |||
294 | case 0: | 294 | case 0: |
295 | if (netif_tx_trylock(slave)) { | 295 | if (netif_tx_trylock(slave)) { |
296 | if (!netif_queue_stopped(slave) && | 296 | if (!netif_queue_stopped(slave) && |
297 | !netif_subqueue_stopped(slave, subq) && | 297 | !__netif_subqueue_stopped(slave, subq) && |
298 | slave->hard_start_xmit(skb, slave) == 0) { | 298 | slave->hard_start_xmit(skb, slave) == 0) { |
299 | netif_tx_unlock(slave); | 299 | netif_tx_unlock(slave); |
300 | master->slaves = NEXT_SLAVE(q); | 300 | master->slaves = NEXT_SLAVE(q); |