---

yaml --- r: 145141 b: refs/heads/master c: c0f84d0 h: refs/heads/master i: 145139: 20e7af6 v: v3
git-mirror · May 18, 2009 · ce9ea53 · ce9ea53
1 parent b72848f
commit ce9ea53
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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
@@ -303,15 +303,16 @@ 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) {
 					__netif_tx_unlock(slave_txq);
 					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);