1 files changed, 15 insertions, 13 deletions

diff --git a/net/sched/act_pedit.c b/net/sched/act_pedit.c
index 82d3c1479029..b54d56d4959b 100644
--- a/net/sched/act_pedit.c
+++ b/net/sched/act_pedit.c
@@ -26,13 +26,14 @@
 #define PEDIT_TAB_MASK  15
 
 static int pedit_net_id;
+static struct tc_action_ops act_pedit_ops;
 
 static const struct nla_policy pedit_policy[TCA_PEDIT_MAX + 1] = {
         [TCA_PEDIT_PARMS]       = { .len = sizeof(struct tc_pedit) },
 };
 
 static int tcf_pedit_init(struct net *net, struct nlattr *nla,
-                          struct nlattr *est, struct tc_action *a,
+                          struct nlattr *est, struct tc_action **a,
                           int ovr, int bind)
 {
         struct tc_action_net *tn = net_generic(net, pedit_net_id);
@@ -61,23 +62,23 @@ static int tcf_pedit_init(struct net *net, struct nlattr *nla,
                 if (!parm->nkeys)
                         return -EINVAL;
                 ret = tcf_hash_create(tn, parm->index, est, a,
-                                      sizeof(*p), bind, false);
+                                      &act_pedit_ops, bind, false);
                 if (ret)
                         return ret;
-                p = to_pedit(a);
+                p = to_pedit(*a);
                 keys = kmalloc(ksize, GFP_KERNEL);
                 if (keys == NULL) {
-                        tcf_hash_cleanup(a, est);
+                        tcf_hash_cleanup(*a, est);
                         return -ENOMEM;
                 }
                 ret = ACT_P_CREATED;
         } else {
                 if (bind)
                         return 0;
-                tcf_hash_release(a, bind);
+                tcf_hash_release(*a, bind);
                 if (!ovr)
                         return -EEXIST;
-                p = to_pedit(a);
+                p = to_pedit(*a);
                 if (p->tcfp_nkeys && p->tcfp_nkeys != parm->nkeys) {
                         keys = kmalloc(ksize, GFP_KERNEL);
                         if (keys == NULL)
@@ -96,13 +97,13 @@ static int tcf_pedit_init(struct net *net, struct nlattr *nla,
         memcpy(p->tcfp_keys, parm->keys, ksize);
         spin_unlock_bh(&p->tcf_lock);
         if (ret == ACT_P_CREATED)
-                tcf_hash_insert(tn, a);
+                tcf_hash_insert(tn, *a);
         return ret;
 }
 
 static void tcf_pedit_cleanup(struct tc_action *a, int bind)
 {
-        struct tcf_pedit *p = a->priv;
+        struct tcf_pedit *p = to_pedit(a);
         struct tc_pedit_key *keys = p->tcfp_keys;
         kfree(keys);
 }
@@ -110,7 +111,7 @@ static void tcf_pedit_cleanup(struct tc_action *a, int bind)
 static int tcf_pedit(struct sk_buff *skb, const struct tc_action *a,
                      struct tcf_result *res)
 {
-        struct tcf_pedit *p = a->priv;
+        struct tcf_pedit *p = to_pedit(a);
         int i;
         unsigned int off;
 
@@ -177,7 +178,7 @@ static int tcf_pedit_dump(struct sk_buff *skb, struct tc_action *a,
                           int bind, int ref)
 {
         unsigned char *b = skb_tail_pointer(skb);
-        struct tcf_pedit *p = a->priv;
+        struct tcf_pedit *p = to_pedit(a);
         struct tc_pedit *opt;
         struct tcf_t t;
         int s;
@@ -216,14 +217,14 @@ nla_put_failure:
 
 static int tcf_pedit_walker(struct net *net, struct sk_buff *skb,
                             struct netlink_callback *cb, int type,
-                            struct tc_action *a)
+                            const struct tc_action_ops *ops)
 {
         struct tc_action_net *tn = net_generic(net, pedit_net_id);
 
-        return tcf_generic_walker(tn, skb, cb, type, a);
+        return tcf_generic_walker(tn, skb, cb, type, ops);
 }
 
-static int tcf_pedit_search(struct net *net, struct tc_action *a, u32 index)
+static int tcf_pedit_search(struct net *net, struct tc_action **a, u32 index)
 {
         struct tc_action_net *tn = net_generic(net, pedit_net_id);
 
@@ -240,6 +241,7 @@ static struct tc_action_ops act_pedit_ops = {
         .init           =       tcf_pedit_init,
         .walk           =       tcf_pedit_walker,
         .lookup         =       tcf_pedit_search,
+        .size           =       sizeof(struct tcf_pedit),
 };
 
 static __net_init int pedit_init_net(struct net *net)