aboutsummaryrefslogtreecommitdiffstats
path: root/net/sched/sch_teql.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/sched/sch_teql.c')
-rw-r--r--net/sched/sch_teql.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/sched/sch_teql.c b/net/sched/sch_teql.c
index 4f4c52c0eeb3..45326599fda3 100644
--- a/net/sched/sch_teql.c
+++ b/net/sched/sch_teql.c
@@ -277,7 +277,7 @@ static inline int teql_resolve(struct sk_buff *skb,
277 return 0; 277 return 0;
278 278
279 rcu_read_lock(); 279 rcu_read_lock();
280 mn = dst_get_neighbour(dst); 280 mn = dst_get_neighbour_noref(dst);
281 res = mn ? __teql_resolve(skb, skb_res, dev, txq, mn) : 0; 281 res = mn ? __teql_resolve(skb, skb_res, dev, txq, mn) : 0;
282 rcu_read_unlock(); 282 rcu_read_unlock();
283 283
@@ -310,7 +310,7 @@ restart:
310 310
311 if (slave_txq->qdisc_sleeping != q) 311 if (slave_txq->qdisc_sleeping != q)
312 continue; 312 continue;
313 if (__netif_subqueue_stopped(slave, subq) || 313 if (netif_xmit_stopped(netdev_get_tx_queue(slave, subq)) ||
314 !netif_running(slave)) { 314 !netif_running(slave)) {
315 busy = 1; 315 busy = 1;
316 continue; 316 continue;
@@ -321,7 +321,7 @@ restart:
321 if (__netif_tx_trylock(slave_txq)) { 321 if (__netif_tx_trylock(slave_txq)) {
322 unsigned int length = qdisc_pkt_len(skb); 322 unsigned int length = qdisc_pkt_len(skb);
323 323
324 if (!netif_tx_queue_frozen_or_stopped(slave_txq) && 324 if (!netif_xmit_frozen_or_stopped(slave_txq) &&
325 slave_ops->ndo_start_xmit(skb, slave) == NETDEV_TX_OK) { 325 slave_ops->ndo_start_xmit(skb, slave) == NETDEV_TX_OK) {
326 txq_trans_update(slave_txq); 326 txq_trans_update(slave_txq);
327 __netif_tx_unlock(slave_txq); 327 __netif_tx_unlock(slave_txq);
@@ -333,7 +333,7 @@ restart:
333 } 333 }
334 __netif_tx_unlock(slave_txq); 334 __netif_tx_unlock(slave_txq);
335 } 335 }
336 if (netif_queue_stopped(dev)) 336 if (netif_xmit_stopped(netdev_get_tx_queue(dev, 0)))
337 busy = 1; 337 busy = 1;
338 break; 338 break;
339 case 1: 339 case 1: