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

Conflicts:
	litmus/sched_cedf.c

1 files changed, 37 insertions, 37 deletions

diff --git a/net/sched/sch_red.c b/net/sched/sch_red.c
index 8d42bb3ba540..6649463da1b6 100644
--- a/net/sched/sch_red.c
+++ b/net/sched/sch_red.c
@@ -36,8 +36,7 @@
         if RED works correctly.
  */
 
-struct red_sched_data
-{
+struct red_sched_data {
         u32                     limit;          /* HARD maximal queue length */
         unsigned char           flags;
         struct red_parms        parms;
@@ -55,7 +54,7 @@ static inline int red_use_harddrop(struct red_sched_data *q)
         return q->flags & TC_RED_HARDDROP;
 }
 
-static int red_enqueue(struct sk_buff *skb, struct Qdisc* sch)
+static int red_enqueue(struct sk_buff *skb, struct Qdisc *sch)
 {
         struct red_sched_data *q = qdisc_priv(sch);
         struct Qdisc *child = q->qdisc;
@@ -67,35 +66,33 @@ static int red_enqueue(struct sk_buff *skb, struct Qdisc* sch)
                 red_end_of_idle_period(&q->parms);
 
         switch (red_action(&q->parms, q->parms.qavg)) {
-                case RED_DONT_MARK:
-                        break;
-
-                case RED_PROB_MARK:
-                        sch->qstats.overlimits++;
-                        if (!red_use_ecn(q) || !INET_ECN_set_ce(skb)) {
-                                q->stats.prob_drop++;
-                                goto congestion_drop;
-                        }
-
-                        q->stats.prob_mark++;
-                        break;
-
-                case RED_HARD_MARK:
-                        sch->qstats.overlimits++;
-                        if (red_use_harddrop(q) || !red_use_ecn(q) ||
-                            !INET_ECN_set_ce(skb)) {
-                                q->stats.forced_drop++;
-                                goto congestion_drop;
-                        }
-
-                        q->stats.forced_mark++;
-                        break;
+        case RED_DONT_MARK:
+                break;
+
+        case RED_PROB_MARK:
+                sch->qstats.overlimits++;
+                if (!red_use_ecn(q) || !INET_ECN_set_ce(skb)) {
+                        q->stats.prob_drop++;
+                        goto congestion_drop;
+                }
+
+                q->stats.prob_mark++;
+                break;
+
+        case RED_HARD_MARK:
+                sch->qstats.overlimits++;
+                if (red_use_harddrop(q) || !red_use_ecn(q) ||
+                    !INET_ECN_set_ce(skb)) {
+                        q->stats.forced_drop++;
+                        goto congestion_drop;
+                }
+
+                q->stats.forced_mark++;
+                break;
         }
 
         ret = qdisc_enqueue(skb, child);
         if (likely(ret == NET_XMIT_SUCCESS)) {
-                sch->bstats.bytes += qdisc_pkt_len(skb);
-                sch->bstats.packets++;
                 sch->q.qlen++;
         } else if (net_xmit_drop_count(ret)) {
                 q->stats.pdrop++;
@@ -108,22 +105,24 @@ congestion_drop:
         return NET_XMIT_CN;
 }
 
-static struct sk_buff * red_dequeue(struct Qdisc* sch)
+static struct sk_buff *red_dequeue(struct Qdisc *sch)
 {
         struct sk_buff *skb;
         struct red_sched_data *q = qdisc_priv(sch);
         struct Qdisc *child = q->qdisc;
 
         skb = child->dequeue(child);
-        if (skb)
+        if (skb) {
+                qdisc_bstats_update(sch, skb);
                 sch->q.qlen--;
-        else if (!red_is_idling(&q->parms))
-                red_start_of_idle_period(&q->parms);
-
+        } else {
+                if (!red_is_idling(&q->parms))
+                        red_start_of_idle_period(&q->parms);
+        }
         return skb;
 }
 
-static struct sk_buff * red_peek(struct Qdisc* sch)
+static struct sk_buff *red_peek(struct Qdisc *sch)
 {
         struct red_sched_data *q = qdisc_priv(sch);
         struct Qdisc *child = q->qdisc;
@@ -131,7 +130,7 @@ static struct sk_buff * red_peek(struct Qdisc* sch)
         return child->ops->peek(child);
 }
 
-static unsigned int red_drop(struct Qdisc* sch)
+static unsigned int red_drop(struct Qdisc *sch)
 {
         struct red_sched_data *q = qdisc_priv(sch);
         struct Qdisc *child = q->qdisc;
@@ -150,7 +149,7 @@ static unsigned int red_drop(struct Qdisc* sch)
         return 0;
 }
 
-static void red_reset(struct Qdisc* sch)
+static void red_reset(struct Qdisc *sch)
 {
         struct red_sched_data *q = qdisc_priv(sch);
 
@@ -217,7 +216,7 @@ static int red_change(struct Qdisc *sch, struct nlattr *opt)
         return 0;
 }
 
-static int red_init(struct Qdisc* sch, struct nlattr *opt)
+static int red_init(struct Qdisc *sch, struct nlattr *opt)
 {
         struct red_sched_data *q = qdisc_priv(sch);
 
@@ -239,6 +238,7 @@ static int red_dump(struct Qdisc *sch, struct sk_buff *skb)
                 .Scell_log      = q->parms.Scell_log,
         };
 
+        sch->qstats.backlog = q->qdisc->qstats.backlog;
         opts = nla_nest_start(skb, TCA_OPTIONS);
         if (opts == NULL)
                 goto nla_put_failure;