1 files changed, 13 insertions, 17 deletions

diff --git a/net/sched/sch_dsmark.c b/net/sched/sch_dsmark.c
index 63d41f86679c..2c790204d042 100644
--- a/net/sched/sch_dsmark.c
+++ b/net/sched/sch_dsmark.c
@@ -61,8 +61,7 @@ static int dsmark_graft(struct Qdisc *sch, unsigned long arg,
                 sch, p, new, old);
 
         if (new == NULL) {
-                new = qdisc_create_dflt(qdisc_dev(sch), sch->dev_queue,
-                                        &pfifo_qdisc_ops,
+                new = qdisc_create_dflt(sch->dev_queue, &pfifo_qdisc_ops,
                                         sch->handle);
                 if (new == NULL)
                         new = &noop_qdisc;
@@ -138,10 +137,10 @@ static int dsmark_change(struct Qdisc *sch, u32 classid, u32 parent,
                 mask = nla_get_u8(tb[TCA_DSMARK_MASK]);
 
         if (tb[TCA_DSMARK_VALUE])
-                p->value[*arg-1] = nla_get_u8(tb[TCA_DSMARK_VALUE]);
+                p->value[*arg - 1] = nla_get_u8(tb[TCA_DSMARK_VALUE]);
 
         if (tb[TCA_DSMARK_MASK])
-                p->mask[*arg-1] = mask;
+                p->mask[*arg - 1] = mask;
 
         err = 0;
 
@@ -156,8 +155,8 @@ static int dsmark_delete(struct Qdisc *sch, unsigned long arg)
         if (!dsmark_valid_index(p, arg))
                 return -EINVAL;
 
-        p->mask[arg-1] = 0xff;
-        p->value[arg-1] = 0;
+        p->mask[arg - 1] = 0xff;
+        p->value[arg - 1] = 0;
 
         return 0;
 }
@@ -176,7 +175,7 @@ static void dsmark_walk(struct Qdisc *sch, struct qdisc_walker *walker)
                 if (p->mask[i] == 0xff && !p->value[i])
                         goto ignore;
                 if (walker->count >= walker->skip) {
-                        if (walker->fn(sch, i+1, walker) < 0) {
+                        if (walker->fn(sch, i + 1, walker) < 0) {
                                 walker->stop = 1;
                                 break;
                         }
@@ -261,8 +260,6 @@ static int dsmark_enqueue(struct sk_buff *skb, struct Qdisc *sch)
                 return err;
         }
 
-        sch->bstats.bytes += qdisc_pkt_len(skb);
-        sch->bstats.packets++;
         sch->q.qlen++;
 
         return NET_XMIT_SUCCESS;
@@ -285,6 +282,7 @@ static struct sk_buff *dsmark_dequeue(struct Qdisc *sch)
         if (skb == NULL)
                 return NULL;
 
+        qdisc_bstats_update(sch, skb);
         sch->q.qlen--;
 
         index = skb->tc_index & (p->indices - 1);
@@ -306,9 +304,8 @@ static struct sk_buff *dsmark_dequeue(struct Qdisc *sch)
                  * and don't need yet another qdisc as a bypass.
                  */
                 if (p->mask[index] != 0xff || p->value[index])
-                        printk(KERN_WARNING
-                               "dsmark_dequeue: unsupported protocol %d\n",
-                               ntohs(skb->protocol));
+                        pr_warning("dsmark_dequeue: unsupported protocol %d\n",
+                                   ntohs(skb->protocol));
                 break;
         }
 
@@ -384,8 +381,7 @@ static int dsmark_init(struct Qdisc *sch, struct nlattr *opt)
         p->default_index = default_index;
         p->set_tc_index = nla_get_flag(tb[TCA_DSMARK_SET_TC_INDEX]);
 
-        p->q = qdisc_create_dflt(qdisc_dev(sch), sch->dev_queue,
-                                 &pfifo_qdisc_ops, sch->handle);
+        p->q = qdisc_create_dflt(sch->dev_queue, &pfifo_qdisc_ops, sch->handle);
         if (p->q == NULL)
                 p->q = &noop_qdisc;
 
@@ -427,14 +423,14 @@ static int dsmark_dump_class(struct Qdisc *sch, unsigned long cl,
         if (!dsmark_valid_index(p, cl))
                 return -EINVAL;
 
-        tcm->tcm_handle = TC_H_MAKE(TC_H_MAJ(sch->handle), cl-1);
+        tcm->tcm_handle = TC_H_MAKE(TC_H_MAJ(sch->handle), cl - 1);
         tcm->tcm_info = p->q->handle;
 
         opts = nla_nest_start(skb, TCA_OPTIONS);
         if (opts == NULL)
                 goto nla_put_failure;
-        NLA_PUT_U8(skb, TCA_DSMARK_MASK, p->mask[cl-1]);
-        NLA_PUT_U8(skb, TCA_DSMARK_VALUE, p->value[cl-1]);
+        NLA_PUT_U8(skb, TCA_DSMARK_MASK, p->mask[cl - 1]);
+        NLA_PUT_U8(skb, TCA_DSMARK_VALUE, p->value[cl - 1]);
 
         return nla_nest_end(skb, opts);