p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

netfilter: remove unused parameters in nf_ct_l4proto_[un]register_sysctl() 

These parameters aren't used now.
So remove them.

Signed-off-by: Yafang Shao <laoar.shao@gmail.com>
Acked-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Yafang Shao 2018-12-13 22:39:21 +08:00 committed by Pablo Neira Ayuso
parent a504b703bb
commit df7043bed4
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
net/netfilter/nf_conntrack_proto.c
View File

@ -175,8 +175,7 @@ static struct nf_proto_net *nf_ct_l4proto_net(struct net *net,
static static
int nf_ct_l4proto_register_sysctl(struct net *net, int nf_ct_l4proto_register_sysctl(struct net *net,
struct nf_proto_net *pn, struct nf_proto_net *pn)
const struct nf_conntrack_l4proto *l4proto)
{ {
int err = 0; int err = 0;
@ -198,9 +197,7 @@ int nf_ct_l4proto_register_sysctl(struct net *net,
} }
static static
void nf_ct_l4proto_unregister_sysctl(struct net *net, void nf_ct_l4proto_unregister_sysctl(struct nf_proto_net *pn)
struct nf_proto_net *pn,
const struct nf_conntrack_l4proto *l4proto)
{ {
#ifdef CONFIG_SYSCTL #ifdef CONFIG_SYSCTL
if (pn->ctl_table_header != NULL) if (pn->ctl_table_header != NULL)
@ -252,7 +249,7 @@ int nf_ct_l4proto_pernet_register_one(struct net *net,
if (pn == NULL) if (pn == NULL)
goto out; goto out;
ret = nf_ct_l4proto_register_sysctl(net, pn, l4proto); ret = nf_ct_l4proto_register_sysctl(net, pn);
if (ret < 0) if (ret < 0)
goto out; goto out;
@ -296,7 +293,7 @@ void nf_ct_l4proto_pernet_unregister_one(struct net *net,
return; return;
pn->users--; pn->users--;
nf_ct_l4proto_unregister_sysctl(net, pn, l4proto); nf_ct_l4proto_unregister_sysctl(pn);
} }
EXPORT_SYMBOL_GPL(nf_ct_l4proto_pernet_unregister_one); EXPORT_SYMBOL_GPL(nf_ct_l4proto_pernet_unregister_one);
@ -946,16 +943,14 @@ int nf_conntrack_proto_pernet_init(struct net *net)
if (err < 0) if (err < 0)
return err; return err;
err = nf_ct_l4proto_register_sysctl(net, err = nf_ct_l4proto_register_sysctl(net,
pn, pn);
&nf_conntrack_l4proto_generic);
if (err < 0) if (err < 0)
return err; return err;
err = nf_ct_l4proto_pernet_register(net, builtin_l4proto, err = nf_ct_l4proto_pernet_register(net, builtin_l4proto,
ARRAY_SIZE(builtin_l4proto)); ARRAY_SIZE(builtin_l4proto));
if (err < 0) { if (err < 0) {
nf_ct_l4proto_unregister_sysctl(net, pn, nf_ct_l4proto_unregister_sysctl(pn);
&nf_conntrack_l4proto_generic);
return err; return err;
} }
@ -971,9 +966,7 @@ void nf_conntrack_proto_pernet_fini(struct net *net)
nf_ct_l4proto_pernet_unregister(net, builtin_l4proto, nf_ct_l4proto_pernet_unregister(net, builtin_l4proto,
ARRAY_SIZE(builtin_l4proto)); ARRAY_SIZE(builtin_l4proto));
pn->users--; pn->users--;
nf_ct_l4proto_unregister_sysctl(net, nf_ct_l4proto_unregister_sysctl(pn);
pn,
&nf_conntrack_l4proto_generic);
} }