Patched in Tegra support.

1 files changed, 9 insertions, 12 deletions

diff --git a/net/sched/sch_dsmark.c b/net/sched/sch_dsmark.c
index 3886365cc20..2c790204d04 100644
--- a/net/sched/sch_dsmark.c
+++ b/net/sched/sch_dsmark.c
@@ -265,7 +265,8 @@ static int dsmark_enqueue(struct sk_buff *skb, struct Qdisc *sch)
         return NET_XMIT_SUCCESS;
 
 drop:
-        qdisc_drop(skb, sch);
+        kfree_skb(skb);
+        sch->qstats.drops++;
         return NET_XMIT_SUCCESS | __NET_XMIT_BYPASS;
 }
 
@@ -428,9 +429,8 @@ static int dsmark_dump_class(struct Qdisc *sch, unsigned long cl,
         opts = nla_nest_start(skb, TCA_OPTIONS);
         if (opts == NULL)
                 goto nla_put_failure;
-        if (nla_put_u8(skb, TCA_DSMARK_MASK, p->mask[cl - 1]) ||
-            nla_put_u8(skb, TCA_DSMARK_VALUE, p->value[cl - 1]))
-                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]);
 
         return nla_nest_end(skb, opts);
 
@@ -447,16 +447,13 @@ static int dsmark_dump(struct Qdisc *sch, struct sk_buff *skb)
         opts = nla_nest_start(skb, TCA_OPTIONS);
         if (opts == NULL)
                 goto nla_put_failure;
-        if (nla_put_u16(skb, TCA_DSMARK_INDICES, p->indices))
-                goto nla_put_failure;
+        NLA_PUT_U16(skb, TCA_DSMARK_INDICES, p->indices);
 
-        if (p->default_index != NO_DEFAULT_INDEX &&
-            nla_put_u16(skb, TCA_DSMARK_DEFAULT_INDEX, p->default_index))
-                goto nla_put_failure;
+        if (p->default_index != NO_DEFAULT_INDEX)
+                NLA_PUT_U16(skb, TCA_DSMARK_DEFAULT_INDEX, p->default_index);
 
-        if (p->set_tc_index &&
-            nla_put_flag(skb, TCA_DSMARK_SET_TC_INDEX))
-                goto nla_put_failure;
+        if (p->set_tc_index)
+                NLA_PUT_FLAG(skb, TCA_DSMARK_SET_TC_INDEX);
 
         return nla_nest_end(skb, opts);