Patched in Tegra support.

1 files changed, 6 insertions, 17 deletions

diff --git a/net/sched/act_gact.c b/net/sched/act_gact.c
index 05d60859d8e..b77f5a06a65 100644
--- a/net/sched/act_gact.c
+++ b/net/sched/act_gact.c
@@ -67,9 +67,6 @@ static int tcf_gact_init(struct nlattr *nla, struct nlattr *est,
         struct tcf_common *pc;
         int ret = 0;
         int err;
-#ifdef CONFIG_GACT_PROB
-        struct tc_gact_p *p_parm = NULL;
-#endif
 
         if (nla == NULL)
                 return -EINVAL;
@@ -85,12 +82,6 @@ static int tcf_gact_init(struct nlattr *nla, struct nlattr *est,
 #ifndef CONFIG_GACT_PROB
         if (tb[TCA_GACT_PROB] != NULL)
                 return -EOPNOTSUPP;
-#else
-        if (tb[TCA_GACT_PROB]) {
-                p_parm = nla_data(tb[TCA_GACT_PROB]);
-                if (p_parm->ptype >= MAX_RAND)
-                        return -EINVAL;
-        }
 #endif
 
         pc = tcf_hash_check(parm->index, a, bind, &gact_hash_info);
@@ -112,7 +103,8 @@ static int tcf_gact_init(struct nlattr *nla, struct nlattr *est,
         spin_lock_bh(&gact->tcf_lock);
         gact->tcf_action = parm->action;
 #ifdef CONFIG_GACT_PROB
-        if (p_parm) {
+        if (tb[TCA_GACT_PROB] != NULL) {
+                struct tc_gact_p *p_parm = nla_data(tb[TCA_GACT_PROB]);
                 gact->tcfg_paction = p_parm->paction;
                 gact->tcfg_pval    = p_parm->pval;
                 gact->tcfg_ptype   = p_parm->ptype;
@@ -141,7 +133,7 @@ static int tcf_gact(struct sk_buff *skb, const struct tc_action *a,
 
         spin_lock(&gact->tcf_lock);
 #ifdef CONFIG_GACT_PROB
-        if (gact->tcfg_ptype)
+        if (gact->tcfg_ptype && gact_rand[gact->tcfg_ptype] != NULL)
                 action = gact_rand[gact->tcfg_ptype](gact);
         else
                 action = gact->tcf_action;
@@ -170,8 +162,7 @@ static int tcf_gact_dump(struct sk_buff *skb, struct tc_action *a, int bind, int
         };
         struct tcf_t t;
 
-        if (nla_put(skb, TCA_GACT_PARMS, sizeof(opt), &opt))
-                goto nla_put_failure;
+        NLA_PUT(skb, TCA_GACT_PARMS, sizeof(opt), &opt);
 #ifdef CONFIG_GACT_PROB
         if (gact->tcfg_ptype) {
                 struct tc_gact_p p_opt = {
@@ -180,15 +171,13 @@ static int tcf_gact_dump(struct sk_buff *skb, struct tc_action *a, int bind, int
                         .ptype   = gact->tcfg_ptype,
                 };
 
-                if (nla_put(skb, TCA_GACT_PROB, sizeof(p_opt), &p_opt))
-                        goto nla_put_failure;
+                NLA_PUT(skb, TCA_GACT_PROB, sizeof(p_opt), &p_opt);
         }
 #endif
         t.install = jiffies_to_clock_t(jiffies - gact->tcf_tm.install);
         t.lastuse = jiffies_to_clock_t(jiffies - gact->tcf_tm.lastuse);
         t.expires = jiffies_to_clock_t(gact->tcf_tm.expires);
-        if (nla_put(skb, TCA_GACT_TM, sizeof(t), &t))
-                goto nla_put_failure;
+        NLA_PUT(skb, TCA_GACT_TM, sizeof(t), &t);
         return skb->len;
 
 nla_put_failure: