From ce9ea53dceb894731f4b8d06f7dc3091ae392f7d Mon Sep 17 00:00:00 2001 From: Eric Dumazet Date: Mon, 18 May 2009 15:12:31 -0700 Subject: [PATCH] --- yaml --- r: 145141 b: refs/heads/master c: c0f84d0d4be3f7d818b4ffb04d27f9bae64397f0 h: refs/heads/master i: 145139: 20e7af664374f6458a77dac3cdf057d4e928a250 v: v3 --- [refs] | 2 +- trunk/net/sched/sch_teql.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index b7096df781f5..6d49bd2821fa 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 775273131810caa41dfc7f9e552ea5d8508caf40 +refs/heads/master: c0f84d0d4be3f7d818b4ffb04d27f9bae64397f0 diff --git a/trunk/net/sched/sch_teql.c b/trunk/net/sched/sch_teql.c index ec697cebb63b..3b6418297231 100644 --- a/trunk/net/sched/sch_teql.c +++ b/trunk/net/sched/sch_teql.c @@ -303,6 +303,8 @@ static int teql_master_xmit(struct sk_buff *skb, struct net_device *dev) switch (teql_resolve(skb, skb_res, slave)) { case 0: if (__netif_tx_trylock(slave_txq)) { + unsigned int length = qdisc_pkt_len(skb); + if (!netif_tx_queue_stopped(slave_txq) && !netif_tx_queue_frozen(slave_txq) && slave_ops->ndo_start_xmit(skb, slave) == 0) { @@ -310,8 +312,7 @@ static int teql_master_xmit(struct sk_buff *skb, struct net_device *dev) master->slaves = NEXT_SLAVE(q); netif_wake_queue(dev); master->stats.tx_packets++; - master->stats.tx_bytes += - qdisc_pkt_len(skb); + master->stats.tx_bytes += length; return 0; } __netif_tx_unlock(slave_txq);