Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 6 insertions, 8 deletions

diff --git a/net/sched/sch_multiq.c b/net/sched/sch_multiq.c
index 6ae251279fc2..edc1950e0e77 100644
--- a/net/sched/sch_multiq.c
+++ b/net/sched/sch_multiq.c
@@ -83,8 +83,6 @@ multiq_enqueue(struct sk_buff *skb, struct Qdisc *sch)
 
         ret = qdisc_enqueue(skb, qdisc);
         if (ret == NET_XMIT_SUCCESS) {
-                sch->bstats.bytes += qdisc_pkt_len(skb);
-                sch->bstats.packets++;
                 sch->q.qlen++;
                 return NET_XMIT_SUCCESS;
         }
@@ -113,6 +111,7 @@ static struct sk_buff *multiq_dequeue(struct Qdisc *sch)
                         qdisc = q->queues[q->curband];
                         skb = qdisc->dequeue(qdisc);
                         if (skb) {
+                                qdisc_bstats_update(sch, skb);
                                 sch->q.qlen--;
                                 return skb;
                         }
@@ -157,7 +156,7 @@ static unsigned int multiq_drop(struct Qdisc *sch)
         unsigned int len;
         struct Qdisc *qdisc;
 
-        for (band = q->bands-1; band >= 0; band--) {
+        for (band = q->bands - 1; band >= 0; band--) {
                 qdisc = q->queues[band];
                 if (qdisc->ops->drop) {
                         len = qdisc->ops->drop(qdisc);
@@ -227,8 +226,7 @@ static int multiq_tune(struct Qdisc *sch, struct nlattr *opt)
         for (i = 0; i < q->bands; i++) {
                 if (q->queues[i] == &noop_qdisc) {
                         struct Qdisc *child, *old;
-                        child = qdisc_create_dflt(qdisc_dev(sch),
-                                                  sch->dev_queue,
+                        child = qdisc_create_dflt(sch->dev_queue,
                                                   &pfifo_qdisc_ops,
                                                   TC_H_MAKE(sch->handle,
                                                             i + 1));
@@ -267,7 +265,7 @@ static int multiq_init(struct Qdisc *sch, struct nlattr *opt)
         for (i = 0; i < q->max_bands; i++)
                 q->queues[i] = &noop_qdisc;
 
-        err = multiq_tune(sch,opt);
+        err = multiq_tune(sch, opt);
 
         if (err)
                 kfree(q->queues);
@@ -348,7 +346,7 @@ static int multiq_dump_class(struct Qdisc *sch, unsigned long cl,
         struct multiq_sched_data *q = qdisc_priv(sch);
 
         tcm->tcm_handle |= TC_H_MIN(cl);
-        tcm->tcm_info = q->queues[cl-1]->handle;
+        tcm->tcm_info = q->queues[cl - 1]->handle;
         return 0;
 }
 
@@ -380,7 +378,7 @@ static void multiq_walk(struct Qdisc *sch, struct qdisc_walker *arg)
                         arg->count++;
                         continue;
                 }
-                if (arg->fn(sch, band+1, arg) < 0) {
+                if (arg->fn(sch, band + 1, arg) < 0) {
                         arg->stop = 1;
                         break;
                 }