pkt_sched: Stop using NLA_PUT*().

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / net / sched / act_skbedit.c

diff --git a/net/sched/act_skbedit.c b/net/sched/act_skbedit.c
index 35dbbe91027e3734e1b9ccd52b5b9ce2edbcbf5a..476e0fac6712292a133d5645f98ca889af52a8c4 100644 (file)
--- a/net/sched/act_skbedit.c
+++ b/net/sched/act_skbedit.c
@@ -166,20 +166,25 @@ static int tcf_skbedit_dump(struct sk_buff *skb, struct tc_action *a,
        };
        struct tcf_t t;
 
-       NLA_PUT(skb, TCA_SKBEDIT_PARMS, sizeof(opt), &opt);
-       if (d->flags & SKBEDIT_F_PRIORITY)
-               NLA_PUT(skb, TCA_SKBEDIT_PRIORITY, sizeof(d->priority),
-                       &d->priority);
-       if (d->flags & SKBEDIT_F_QUEUE_MAPPING)
-               NLA_PUT(skb, TCA_SKBEDIT_QUEUE_MAPPING,
-                       sizeof(d->queue_mapping), &d->queue_mapping);
-       if (d->flags & SKBEDIT_F_MARK)
-               NLA_PUT(skb, TCA_SKBEDIT_MARK, sizeof(d->mark),
-                       &d->mark);
+       if (nla_put(skb, TCA_SKBEDIT_PARMS, sizeof(opt), &opt))
+               goto nla_put_failure;
+       if ((d->flags & SKBEDIT_F_PRIORITY) &&
+           nla_put(skb, TCA_SKBEDIT_PRIORITY, sizeof(d->priority),
+                   &d->priority))
+               goto nla_put_failure;
+       if ((d->flags & SKBEDIT_F_QUEUE_MAPPING) &&
+           nla_put(skb, TCA_SKBEDIT_QUEUE_MAPPING,
+                   sizeof(d->queue_mapping), &d->queue_mapping))
+               goto nla_put_failure;
+       if ((d->flags & SKBEDIT_F_MARK) &&
+           nla_put(skb, TCA_SKBEDIT_MARK, sizeof(d->mark),
+                   &d->mark))
+               goto nla_put_failure;
        t.install = jiffies_to_clock_t(jiffies - d->tcf_tm.install);
        t.lastuse = jiffies_to_clock_t(jiffies - d->tcf_tm.lastuse);
        t.expires = jiffies_to_clock_t(d->tcf_tm.expires);
-       NLA_PUT(skb, TCA_SKBEDIT_TM, sizeof(t), &t);
+       if (nla_put(skb, TCA_SKBEDIT_TM, sizeof(t), &t))
+               goto nla_put_failure;
        return skb->len;
 
 nla_put_failure: