diff options
author | David S. Miller <davem@davemloft.net> | 2014-08-30 00:07:24 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2014-09-01 20:39:55 -0400 |
commit | 10b3ad8c21bb4b135768c30dd4c51a1c744da699 (patch) | |
tree | 02acb0d328818c9216c93b6b46d62717e09cdc61 /net/sched/sch_teql.c | |
parent | dace1b54726bffe1c009f7661e3cee6b762f30c8 (diff) |
net: Do txq_trans_update() in netdev_start_xmit()
That way we don't have to audit every call site to make sure it is
doing this properly.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sched/sch_teql.c')
-rw-r--r-- | net/sched/sch_teql.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/sched/sch_teql.c b/net/sched/sch_teql.c index 64cd93ca8104..193dc2cba1ec 100644 --- a/net/sched/sch_teql.c +++ b/net/sched/sch_teql.c | |||
@@ -316,8 +316,7 @@ restart: | |||
316 | unsigned int length = qdisc_pkt_len(skb); | 316 | unsigned int length = qdisc_pkt_len(skb); |
317 | 317 | ||
318 | if (!netif_xmit_frozen_or_stopped(slave_txq) && | 318 | if (!netif_xmit_frozen_or_stopped(slave_txq) && |
319 | netdev_start_xmit(skb, slave) == NETDEV_TX_OK) { | 319 | netdev_start_xmit(skb, slave, slave_txq) == NETDEV_TX_OK) { |
320 | txq_trans_update(slave_txq); | ||
321 | __netif_tx_unlock(slave_txq); | 320 | __netif_tx_unlock(slave_txq); |
322 | master->slaves = NEXT_SLAVE(q); | 321 | master->slaves = NEXT_SLAVE(q); |
323 | netif_wake_queue(dev); | 322 | netif_wake_queue(dev); |