Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	net/sched/sch_hfsc.c
	net/sched/sch_htb.c
	net/sched/sch_tbf.c

1 files changed, 2 insertions, 3 deletions

diff --git a/net/sched/sch_sfq.c b/net/sched/sch_sfq.c
index fdba52aa053d..4cff44235773 100644
--- a/net/sched/sch_sfq.c
+++ b/net/sched/sch_sfq.c
@@ -402,10 +402,8 @@ sfq_enqueue(struct sk_buff *skb, struct Qdisc *sch)
                 q->tail = slot;
                 slot->allot = q->scaled_quantum;
         }
-        if (++sch->q.qlen <= q->limit) {
-                qdisc_bstats_update(sch, skb);
+        if (++sch->q.qlen <= q->limit)
                 return NET_XMIT_SUCCESS;
-        }
 
         sfq_drop(sch);
         return NET_XMIT_CN;
@@ -445,6 +443,7 @@ next_slot:
         }
         skb = slot_dequeue_head(slot);
         sfq_dec(q, a);
+        qdisc_bstats_update(sch, skb);
         sch->q.qlen--;
         sch->qstats.backlog -= qdisc_pkt_len(skb);