Patched in Tegra support.

1 files changed, 11 insertions, 11 deletions

diff --git a/net/sched/act_mirred.c b/net/sched/act_mirred.c
index 9c0fd0c7881..e051398fdf6 100644
--- a/net/sched/act_mirred.c
+++ b/net/sched/act_mirred.c
@@ -174,8 +174,9 @@ static int tcf_mirred(struct sk_buff *skb, const struct tc_action *a,
         }
 
         if (!(dev->flags & IFF_UP)) {
-                net_notice_ratelimited("tc mirred to Houston: device %s is down\n",
-                                       dev->name);
+                if (net_ratelimit())
+                        pr_notice("tc mirred to Houston: device %s is down\n",
+                                  dev->name);
                 goto out;
         }
 
@@ -200,12 +201,13 @@ static int tcf_mirred(struct sk_buff *skb, const struct tc_action *a,
 out:
         if (err) {
                 m->tcf_qstats.overlimits++;
-                if (m->tcfm_eaction != TCA_EGRESS_MIRROR)
-                        retval = TC_ACT_SHOT;
-                else
-                        retval = m->tcf_action;
-        } else
+                /* should we be asking for packet to be dropped?
+                 * may make sense for redirect case only
+                 */
+                retval = TC_ACT_SHOT;
+        } else {
                 retval = m->tcf_action;
+        }
         spin_unlock(&m->tcf_lock);
 
         return retval;
@@ -225,13 +227,11 @@ static int tcf_mirred_dump(struct sk_buff *skb, struct tc_action *a, int bind, i
         };
         struct tcf_t t;
 
-        if (nla_put(skb, TCA_MIRRED_PARMS, sizeof(opt), &opt))
-                goto nla_put_failure;
+        NLA_PUT(skb, TCA_MIRRED_PARMS, sizeof(opt), &opt);
         t.install = jiffies_to_clock_t(jiffies - m->tcf_tm.install);
         t.lastuse = jiffies_to_clock_t(jiffies - m->tcf_tm.lastuse);
         t.expires = jiffies_to_clock_t(m->tcf_tm.expires);
-        if (nla_put(skb, TCA_MIRRED_TM, sizeof(t), &t))
-                goto nla_put_failure;
+        NLA_PUT(skb, TCA_MIRRED_TM, sizeof(t), &t);
         return skb->len;
 
 nla_put_failure: