Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...

[~andy/linux] / net / sched / act_nat.c

diff --git a/net/sched/act_nat.c b/net/sched/act_nat.c
index 76869538d0287148e48bf43660d3e243912a6e30..81f0404bb33555244faf74504af4a8becf00d65a 100644 (file)
--- a/net/sched/act_nat.c
+++ b/net/sched/act_nat.c
@@ -30,15 +30,8 @@
 
 
 #define NAT_TAB_MASK   15
-static struct tcf_common *tcf_nat_ht[NAT_TAB_MASK + 1];
-static u32 nat_idx_gen;
-static DEFINE_RWLOCK(nat_lock);
-
-static struct tcf_hashinfo nat_hash_info = {
-       .htab   =       tcf_nat_ht,
-       .hmask  =       NAT_TAB_MASK,
-       .lock   =       &nat_lock,
-};
+
+static struct tcf_hashinfo nat_hash_info;
 
 static const struct nla_policy nat_policy[TCA_NAT_MAX + 1] = {
        [TCA_NAT_PARMS] = { .len = sizeof(struct tc_nat) },
@@ -64,17 +57,16 @@ static int tcf_nat_init(struct net *net, struct nlattr *nla, struct nlattr *est,
                return -EINVAL;
        parm = nla_data(tb[TCA_NAT_PARMS]);
 
-       pc = tcf_hash_check(parm->index, a, bind, &nat_hash_info);
+       pc = tcf_hash_check(parm->index, a, bind);
        if (!pc) {
-               pc = tcf_hash_create(parm->index, est, a, sizeof(*p), bind,
-                                    &nat_idx_gen, &nat_hash_info);
+               pc = tcf_hash_create(parm->index, est, a, sizeof(*p), bind);
                if (IS_ERR(pc))
                        return PTR_ERR(pc);
                ret = ACT_P_CREATED;
        } else {
                if (bind)
                        return 0;
-               tcf_hash_release(pc, bind, &nat_hash_info);
+               tcf_hash_release(pc, bind, a->ops->hinfo);
                if (!ovr)
                        return -EEXIST;
        }
@@ -90,7 +82,7 @@ static int tcf_nat_init(struct net *net, struct nlattr *nla, struct nlattr *est,
        spin_unlock_bh(&p->tcf_lock);
 
        if (ret == ACT_P_CREATED)
-               tcf_hash_insert(pc, &nat_hash_info);
+               tcf_hash_insert(pc, a->ops->hinfo);
 
        return ret;
 }
@@ -303,7 +295,6 @@ static struct tc_action_ops act_nat_ops = {
        .kind           =       "nat",
        .hinfo          =       &nat_hash_info,
        .type           =       TCA_ACT_NAT,
-       .capab          =       TCA_CAP_NONE,
        .owner          =       THIS_MODULE,
        .act            =       tcf_nat,
        .dump           =       tcf_nat_dump,
@@ -316,12 +307,16 @@ MODULE_LICENSE("GPL");
 
 static int __init nat_init_module(void)
 {
+       int err = tcf_hashinfo_init(&nat_hash_info, NAT_TAB_MASK);
+       if (err)
+               return err;
        return tcf_register_action(&act_nat_ops);
 }
 
 static void __exit nat_cleanup_module(void)
 {
        tcf_unregister_action(&act_nat_ops);
+       tcf_hashinfo_destroy(&nat_hash_info);
 }
 
 module_init(nat_init_module);