Patched in Tegra support.

1 files changed, 10 insertions, 16 deletions

diff --git a/net/sched/sch_cbq.c b/net/sched/sch_cbq.c
index 0e19948470b..24d94c097b3 100644
--- a/net/sched/sch_cbq.c
+++ b/net/sched/sch_cbq.c
@@ -250,11 +250,10 @@ cbq_classify(struct sk_buff *skb, struct Qdisc *sch, int *qerr)
                         else if ((cl = defmap[res.classid & TC_PRIO_MAX]) == NULL)
                                 cl = defmap[TC_PRIO_BESTEFFORT];
 
-                        if (cl == NULL)
+                        if (cl == NULL || cl->level >= head->level)
                                 goto fallback;
                 }
-                if (cl->level >= head->level)
-                        goto fallback;
+
 #ifdef CONFIG_NET_CLS_ACT
                 switch (result) {
                 case TC_ACT_QUEUED:
@@ -509,7 +508,8 @@ static void cbq_ovl_delay(struct cbq_class *cl)
                         cl->cpriority = TC_CBQ_MAXPRIO;
                         q->pmask |= (1<<TC_CBQ_MAXPRIO);
 
-                        expires = ns_to_ktime(PSCHED_TICKS2NS(sched));
+                        expires = ktime_set(0, 0);
+                        expires = ktime_add_ns(expires, PSCHED_TICKS2NS(sched));
                         if (hrtimer_try_to_cancel(&q->delay_timer) &&
                             ktime_to_ns(ktime_sub(
                                         hrtimer_get_expires(&q->delay_timer),
@@ -1425,8 +1425,7 @@ static int cbq_dump_rate(struct sk_buff *skb, struct cbq_class *cl)
 {
         unsigned char *b = skb_tail_pointer(skb);
 
-        if (nla_put(skb, TCA_CBQ_RATE, sizeof(cl->R_tab->rate), &cl->R_tab->rate))
-                goto nla_put_failure;
+        NLA_PUT(skb, TCA_CBQ_RATE, sizeof(cl->R_tab->rate), &cl->R_tab->rate);
         return skb->len;
 
 nla_put_failure:
@@ -1451,8 +1450,7 @@ static int cbq_dump_lss(struct sk_buff *skb, struct cbq_class *cl)
         opt.minidle = (u32)(-cl->minidle);
         opt.offtime = cl->offtime;
         opt.change = ~0;
-        if (nla_put(skb, TCA_CBQ_LSSOPT, sizeof(opt), &opt))
-                goto nla_put_failure;
+        NLA_PUT(skb, TCA_CBQ_LSSOPT, sizeof(opt), &opt);
         return skb->len;
 
 nla_put_failure:
@@ -1470,8 +1468,7 @@ static int cbq_dump_wrr(struct sk_buff *skb, struct cbq_class *cl)
         opt.priority = cl->priority + 1;
         opt.cpriority = cl->cpriority + 1;
         opt.weight = cl->weight;
-        if (nla_put(skb, TCA_CBQ_WRROPT, sizeof(opt), &opt))
-                goto nla_put_failure;
+        NLA_PUT(skb, TCA_CBQ_WRROPT, sizeof(opt), &opt);
         return skb->len;
 
 nla_put_failure:
@@ -1488,8 +1485,7 @@ static int cbq_dump_ovl(struct sk_buff *skb, struct cbq_class *cl)
         opt.priority2 = cl->priority2 + 1;
         opt.pad = 0;
         opt.penalty = cl->penalty;
-        if (nla_put(skb, TCA_CBQ_OVL_STRATEGY, sizeof(opt), &opt))
-                goto nla_put_failure;
+        NLA_PUT(skb, TCA_CBQ_OVL_STRATEGY, sizeof(opt), &opt);
         return skb->len;
 
 nla_put_failure:
@@ -1506,8 +1502,7 @@ static int cbq_dump_fopt(struct sk_buff *skb, struct cbq_class *cl)
                 opt.split = cl->split ? cl->split->common.classid : 0;
                 opt.defmap = cl->defmap;
                 opt.defchange = ~0;
-                if (nla_put(skb, TCA_CBQ_FOPT, sizeof(opt), &opt))
-                        goto nla_put_failure;
+                NLA_PUT(skb, TCA_CBQ_FOPT, sizeof(opt), &opt);
         }
         return skb->len;
 
@@ -1526,8 +1521,7 @@ static int cbq_dump_police(struct sk_buff *skb, struct cbq_class *cl)
                 opt.police = cl->police;
                 opt.__res1 = 0;
                 opt.__res2 = 0;
-                if (nla_put(skb, TCA_CBQ_POLICE, sizeof(opt), &opt))
-                        goto nla_put_failure;
+                NLA_PUT(skb, TCA_CBQ_POLICE, sizeof(opt), &opt);
         }
         return skb->len;