Patched in Tegra support.

1 files changed, 4 insertions, 5 deletions

diff --git a/net/sched/sch_drr.c b/net/sched/sch_drr.c
index 71e50c80315..6b7fe4a84f1 100644
--- a/net/sched/sch_drr.c
+++ b/net/sched/sch_drr.c
@@ -260,8 +260,7 @@ static int drr_dump_class(struct Qdisc *sch, unsigned long arg,
         nest = nla_nest_start(skb, TCA_OPTIONS);
         if (nest == NULL)
                 goto nla_put_failure;
-        if (nla_put_u32(skb, TCA_DRR_QUANTUM, cl->quantum))
-                goto nla_put_failure;
+        NLA_PUT_U32(skb, TCA_DRR_QUANTUM, cl->quantum);
         return nla_nest_end(skb, nest);
 
 nla_put_failure:
@@ -352,7 +351,7 @@ static int drr_enqueue(struct sk_buff *skb, struct Qdisc *sch)
 {
         struct drr_sched *q = qdisc_priv(sch);
         struct drr_class *cl;
-        int err = 0;
+        int err;
 
         cl = drr_classify(skb, sch, &err);
         if (cl == NULL) {
@@ -376,6 +375,8 @@ static int drr_enqueue(struct sk_buff *skb, struct Qdisc *sch)
                 cl->deficit = cl->quantum;
         }
 
+        bstats_update(&cl->bstats, skb);
+
         sch->q.qlen++;
         return err;
 }
@@ -401,8 +402,6 @@ static struct sk_buff *drr_dequeue(struct Qdisc *sch)
                         skb = qdisc_dequeue_peeked(cl->qdisc);
                         if (cl->qdisc->q.qlen == 0)
                                 list_del(&cl->alist);
-
-                        bstats_update(&cl->bstats, skb);
                         qdisc_bstats_update(sch, skb);
                         sch->q.qlen--;
                         return skb;