Commit a379854d authored by Florian Westphal's avatar Florian Westphal Committed by Pablo Neira Ayuso

netfilter: conntrack: remove unused init_net hook

since adf05168 ("netfilter: remove ip_conntrack* sysctl compat code")
the only user (ipv4 tracker) sets this to an empty stub function.

After this change nf_ct_l3proto_pernet_register() is also empty,
but this will change in a followup patch to add conditional register
of the hooks.
Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 9b91c96c
...@@ -63,9 +63,6 @@ struct nf_conntrack_l3proto { ...@@ -63,9 +63,6 @@ struct nf_conntrack_l3proto {
size_t nla_size; size_t nla_size;
/* Init l3proto pernet data */
int (*init_net)(struct net *net);
/* Module (if any) which this is connected to. */ /* Module (if any) which this is connected to. */
struct module *me; struct module *me;
}; };
......
...@@ -307,11 +307,6 @@ static struct nf_sockopt_ops so_getorigdst = { ...@@ -307,11 +307,6 @@ static struct nf_sockopt_ops so_getorigdst = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
}; };
static int ipv4_init_net(struct net *net)
{
return 0;
}
struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv4 __read_mostly = { struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv4 __read_mostly = {
.l3proto = PF_INET, .l3proto = PF_INET,
.name = "ipv4", .name = "ipv4",
...@@ -325,7 +320,6 @@ struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv4 __read_mostly = { ...@@ -325,7 +320,6 @@ struct nf_conntrack_l3proto nf_conntrack_l3proto_ipv4 __read_mostly = {
.nlattr_to_tuple = ipv4_nlattr_to_tuple, .nlattr_to_tuple = ipv4_nlattr_to_tuple,
.nla_policy = ipv4_nla_policy, .nla_policy = ipv4_nla_policy,
#endif #endif
.init_net = ipv4_init_net,
.me = THIS_MODULE, .me = THIS_MODULE,
}; };
......
...@@ -193,14 +193,6 @@ EXPORT_SYMBOL_GPL(nf_ct_l3proto_register); ...@@ -193,14 +193,6 @@ EXPORT_SYMBOL_GPL(nf_ct_l3proto_register);
int nf_ct_l3proto_pernet_register(struct net *net, int nf_ct_l3proto_pernet_register(struct net *net,
struct nf_conntrack_l3proto *proto) struct nf_conntrack_l3proto *proto)
{ {
int ret;
if (proto->init_net) {
ret = proto->init_net(net);
if (ret < 0)
return ret;
}
return 0; return 0;
} }
EXPORT_SYMBOL_GPL(nf_ct_l3proto_pernet_register); EXPORT_SYMBOL_GPL(nf_ct_l3proto_pernet_register);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment