[NET_SCHED]: Convert actions from rtnetlink to new netlink API

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 10 insertions, 10 deletions

diff --git a/net/sched/act_pedit.c b/net/sched/act_pedit.c
index b46fab5fb323..88d8a15a1921 100644
--- a/net/sched/act_pedit.c
+++ b/net/sched/act_pedit.c
@@ -33,10 +33,10 @@ static struct tcf_hashinfo pedit_hash_info = {
         .lock   =       &pedit_lock,
 };
 
-static int tcf_pedit_init(struct rtattr *rta, struct rtattr *est,
+static int tcf_pedit_init(struct nlattr *nla, struct nlattr *est,
                           struct tc_action *a, int ovr, int bind)
 {
-        struct rtattr *tb[TCA_PEDIT_MAX];
+        struct nlattr *tb[TCA_PEDIT_MAX + 1];
         struct tc_pedit *parm;
         int ret = 0;
         struct tcf_pedit *p;
@@ -44,15 +44,15 @@ static int tcf_pedit_init(struct rtattr *rta, struct rtattr *est,
         struct tc_pedit_key *keys = NULL;
         int ksize;
 
-        if (rta == NULL || rtattr_parse_nested(tb, TCA_PEDIT_MAX, rta) < 0)
+        if (nla == NULL || nla_parse_nested(tb, TCA_PEDIT_MAX, nla, NULL) < 0)
                 return -EINVAL;
 
-        if (tb[TCA_PEDIT_PARMS - 1] == NULL ||
-            RTA_PAYLOAD(tb[TCA_PEDIT_PARMS-1]) < sizeof(*parm))
+        if (tb[TCA_PEDIT_PARMS] == NULL ||
+            nla_len(tb[TCA_PEDIT_PARMS]) < sizeof(*parm))
                 return -EINVAL;
-        parm = RTA_DATA(tb[TCA_PEDIT_PARMS-1]);
+        parm = nla_data(tb[TCA_PEDIT_PARMS]);
         ksize = parm->nkeys * sizeof(struct tc_pedit_key);
-        if (RTA_PAYLOAD(tb[TCA_PEDIT_PARMS-1]) < sizeof(*parm) + ksize)
+        if (nla_len(tb[TCA_PEDIT_PARMS]) < sizeof(*parm) + ksize)
                 return -EINVAL;
 
         pc = tcf_hash_check(parm->index, a, bind, &pedit_hash_info);
@@ -206,15 +206,15 @@ static int tcf_pedit_dump(struct sk_buff *skb, struct tc_action *a,
         opt->refcnt = p->tcf_refcnt - ref;
         opt->bindcnt = p->tcf_bindcnt - bind;
 
-        RTA_PUT(skb, TCA_PEDIT_PARMS, s, opt);
+        NLA_PUT(skb, TCA_PEDIT_PARMS, s, opt);
         t.install = jiffies_to_clock_t(jiffies - p->tcf_tm.install);
         t.lastuse = jiffies_to_clock_t(jiffies - p->tcf_tm.lastuse);
         t.expires = jiffies_to_clock_t(p->tcf_tm.expires);
-        RTA_PUT(skb, TCA_PEDIT_TM, sizeof(t), &t);
+        NLA_PUT(skb, TCA_PEDIT_TM, sizeof(t), &t);
         kfree(opt);
         return skb->len;
 
-rtattr_failure:
+nla_put_failure:
         nlmsg_trim(skb, b);
         kfree(opt);
         return -1;