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

Conflicts:
	litmus/sched_cedf.c

1 files changed, 11 insertions, 16 deletions

diff --git a/net/sched/sch_atm.c b/net/sched/sch_atm.c
index 6318e1136b83..3f08158b8688 100644
--- a/net/sched/sch_atm.c
+++ b/net/sched/sch_atm.c
@@ -275,8 +275,7 @@ static int atm_tc_change(struct Qdisc *sch, u32 classid, u32 parent,
                 goto err_out;
         }
         flow->filter_list = NULL;
-        flow->q = qdisc_create_dflt(qdisc_dev(sch), sch->dev_queue,
-                                    &pfifo_qdisc_ops, classid);
+        flow->q = qdisc_create_dflt(sch->dev_queue, &pfifo_qdisc_ops, classid);
         if (!flow->q)
                 flow->q = &noop_qdisc;
         pr_debug("atm_tc_change: qdisc %p\n", flow->q);
@@ -320,7 +319,7 @@ static int atm_tc_delete(struct Qdisc *sch, unsigned long arg)
          * creation), and one for the reference held when calling delete.
          */
         if (flow->ref < 2) {
-                printk(KERN_ERR "atm_tc_delete: flow->ref == %d\n", flow->ref);
+                pr_err("atm_tc_delete: flow->ref == %d\n", flow->ref);
                 return -EINVAL;
         }
         if (flow->ref > 2)
@@ -385,12 +384,12 @@ static int atm_tc_enqueue(struct sk_buff *skb, struct Qdisc *sch)
                         }
                 }
                 flow = NULL;
-        done:
-                ;               
+done:
+                ;
         }
-        if (!flow)
+        if (!flow) {
                 flow = &p->link;
-        else {
+        } else {
                 if (flow->vcc)
                         ATM_SKB(skb)->atm_options = flow->vcc->atm_options;
                 /*@@@ looks good ... but it's not supposed to work :-) */
@@ -423,10 +422,8 @@ drop: __maybe_unused
                 }
                 return ret;
         }
-        sch->bstats.bytes += qdisc_pkt_len(skb);
-        sch->bstats.packets++;
-        flow->bstats.bytes += qdisc_pkt_len(skb);
-        flow->bstats.packets++;
+        qdisc_bstats_update(sch, skb);
+        bstats_update(&flow->bstats, skb);
         /*
          * Okay, this may seem weird. We pretend we've dropped the packet if
          * it goes via ATM. The reason for this is that the outer qdisc
@@ -543,7 +540,7 @@ static int atm_tc_init(struct Qdisc *sch, struct nlattr *opt)
         INIT_LIST_HEAD(&p->flows);
         INIT_LIST_HEAD(&p->link.list);
         list_add(&p->link.list, &p->flows);
-        p->link.q = qdisc_create_dflt(qdisc_dev(sch), sch->dev_queue,
+        p->link.q = qdisc_create_dflt(sch->dev_queue,
                                       &pfifo_qdisc_ops, sch->handle);
         if (!p->link.q)
                 p->link.q = &noop_qdisc;
@@ -579,8 +576,7 @@ static void atm_tc_destroy(struct Qdisc *sch)
 
         list_for_each_entry_safe(flow, tmp, &p->flows, list) {
                 if (flow->ref > 1)
-                        printk(KERN_ERR "atm_destroy: %p->ref = %d\n", flow,
-                               flow->ref);
+                        pr_err("atm_destroy: %p->ref = %d\n", flow, flow->ref);
                 atm_tc_put(sch, (unsigned long)flow);
         }
         tasklet_kill(&p->task);
@@ -619,9 +615,8 @@ static int atm_tc_dump_class(struct Qdisc *sch, unsigned long cl,
         }
         if (flow->excess)
                 NLA_PUT_U32(skb, TCA_ATM_EXCESS, flow->classid);
-        else {
+        else
                 NLA_PUT_U32(skb, TCA_ATM_EXCESS, 0);
-        }
 
         nla_nest_end(skb, nest);
         return skb->len;