1 files changed, 12 insertions, 8 deletions

diff --git a/net/sched/sch_qfq.c b/net/sched/sch_qfq.c
index dc37c4ead439..29f5c4a24688 100644
--- a/net/sched/sch_qfq.c
+++ b/net/sched/sch_qfq.c
@@ -1210,10 +1210,12 @@ static struct qfq_aggregate *qfq_choose_next_agg(struct qfq_sched *q)
 static int qfq_enqueue(struct sk_buff *skb, struct Qdisc *sch,
                        struct sk_buff **to_free)
 {
+        unsigned int len = qdisc_pkt_len(skb), gso_segs;
         struct qfq_sched *q = qdisc_priv(sch);
         struct qfq_class *cl;
         struct qfq_aggregate *agg;
         int err = 0;
+        bool first;
 
         cl = qfq_classify(skb, sch, &err);
         if (cl == NULL) {
@@ -1224,17 +1226,18 @@ static int qfq_enqueue(struct sk_buff *skb, struct Qdisc *sch,
         }
         pr_debug("qfq_enqueue: cl = %x\n", cl->common.classid);
 
-        if (unlikely(cl->agg->lmax < qdisc_pkt_len(skb))) {
+        if (unlikely(cl->agg->lmax < len)) {
                 pr_debug("qfq: increasing maxpkt from %u to %u for class %u",
-                         cl->agg->lmax, qdisc_pkt_len(skb), cl->common.classid);
-                err = qfq_change_agg(sch, cl, cl->agg->class_weight,
-                                     qdisc_pkt_len(skb));
+                         cl->agg->lmax, len, cl->common.classid);
+                err = qfq_change_agg(sch, cl, cl->agg->class_weight, len);
                 if (err) {
                         cl->qstats.drops++;
                         return qdisc_drop(skb, sch, to_free);
                 }
         }
 
+        gso_segs = skb_is_gso(skb) ? skb_shinfo(skb)->gso_segs : 1;
+        first = !cl->qdisc->q.qlen;
         err = qdisc_enqueue(skb, cl->qdisc, to_free);
         if (unlikely(err != NET_XMIT_SUCCESS)) {
                 pr_debug("qfq_enqueue: enqueue failed %d\n", err);
@@ -1245,16 +1248,17 @@ static int qfq_enqueue(struct sk_buff *skb, struct Qdisc *sch,
                 return err;
         }
 
-        bstats_update(&cl->bstats, skb);
-        qdisc_qstats_backlog_inc(sch, skb);
+        cl->bstats.bytes += len;
+        cl->bstats.packets += gso_segs;
+        sch->qstats.backlog += len;
         ++sch->q.qlen;
 
         agg = cl->agg;
         /* if the queue was not empty, then done here */
-        if (cl->qdisc->q.qlen != 1) {
+        if (!first) {
                 if (unlikely(skb == cl->qdisc->ops->peek(cl->qdisc)) &&
                     list_first_entry(&agg->active, struct qfq_class, alist)
-                    == cl && cl->deficit < qdisc_pkt_len(skb))
+                    == cl && cl->deficit < len)
                         list_move_tail(&cl->alist, &agg->active);
 
                 return err;