xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

netfilter: conntrack: remove pernet l4 proto register interface

Browse Source 
No used anymore.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Florian Westphal
2019-01-15 22:03:41 +01:00
committed by Pablo Neira Ayuso
parent 44fb87f635
commit edf0338dab
2 changed files with 12 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/net/netfilter/nf_conntrack_l4proto.h
View File

@@ -144,18 +144,6 @@ const struct nf_conntrack_l4proto *__nf_ct_l4proto_find(u8 l4proto);
const struct nf_conntrack_l4proto *nf_ct_l4proto_find_get(u8 l4proto); const struct nf_conntrack_l4proto *nf_ct_l4proto_find_get(u8 l4proto);
/* Protocol pernet registration. */
int nf_ct_l4proto_pernet_register_one(struct net *net,
const struct nf_conntrack_l4proto *proto);
void nf_ct_l4proto_pernet_unregister_one(struct net *net,
const struct nf_conntrack_l4proto *proto);
int nf_ct_l4proto_pernet_register(struct net *net,
const struct nf_conntrack_l4proto *const proto[],
unsigned int num_proto);
void nf_ct_l4proto_pernet_unregister(struct net *net,
const struct nf_conntrack_l4proto *const proto[],
unsigned int num_proto);
/* Protocol global registration. */ /* Protocol global registration. */
int nf_ct_l4proto_register_one(const struct nf_conntrack_l4proto *proto); int nf_ct_l4proto_register_one(const struct nf_conntrack_l4proto *proto);
void nf_ct_l4proto_unregister_one(const struct nf_conntrack_l4proto *proto); void nf_ct_l4proto_unregister_one(const struct nf_conntrack_l4proto *proto);

26
net/netfilter/nf_conntrack_proto.c
View File

@@ -221,7 +221,7 @@ out_unlock:
} }
EXPORT_SYMBOL_GPL(nf_ct_l4proto_register_one); EXPORT_SYMBOL_GPL(nf_ct_l4proto_register_one);
int nf_ct_l4proto_pernet_register_one(struct net *net, static int nf_ct_l4proto_pernet_register_one(struct net *net,
const struct nf_conntrack_l4proto *l4proto) const struct nf_conntrack_l4proto *l4proto)
{ {
int ret = 0; int ret = 0;
@@ -245,7 +245,6 @@ int nf_ct_l4proto_pernet_register_one(struct net *net,
out: out:
return ret; return ret;
} }
EXPORT_SYMBOL_GPL(nf_ct_l4proto_pernet_register_one);
static void __nf_ct_l4proto_unregister_one(const struct nf_conntrack_l4proto *l4proto) static void __nf_ct_l4proto_unregister_one(const struct nf_conntrack_l4proto *l4proto)
@@ -272,7 +271,7 @@ void nf_ct_l4proto_unregister_one(const struct nf_conntrack_l4proto *l4proto)
} }
EXPORT_SYMBOL_GPL(nf_ct_l4proto_unregister_one); EXPORT_SYMBOL_GPL(nf_ct_l4proto_unregister_one);
void nf_ct_l4proto_pernet_unregister_one(struct net *net, static void nf_ct_l4proto_pernet_unregister_one(struct net *net,
const struct nf_conntrack_l4proto *l4proto) const struct nf_conntrack_l4proto *l4proto)
{ {
struct nf_proto_net *pn = nf_ct_l4proto_net(net, l4proto); struct nf_proto_net *pn = nf_ct_l4proto_net(net, l4proto);
@@ -283,7 +282,6 @@ void nf_ct_l4proto_pernet_unregister_one(struct net *net,
pn->users--; pn->users--;
nf_ct_l4proto_unregister_sysctl(pn); nf_ct_l4proto_unregister_sysctl(pn);
} }
EXPORT_SYMBOL_GPL(nf_ct_l4proto_pernet_unregister_one);
static void static void
nf_ct_l4proto_unregister(const struct nf_conntrack_l4proto * const l4proto[], nf_ct_l4proto_unregister(const struct nf_conntrack_l4proto * const l4proto[],
@@ -322,7 +320,15 @@ nf_ct_l4proto_register(const struct nf_conntrack_l4proto * const l4proto[],
return ret; return ret;
} }
int nf_ct_l4proto_pernet_register(struct net *net, static void nf_ct_l4proto_pernet_unregister(struct net *net,
const struct nf_conntrack_l4proto *const l4proto[],
unsigned int num_proto)
{
while (num_proto-- != 0)
nf_ct_l4proto_pernet_unregister_one(net, l4proto[num_proto]);
}
static int nf_ct_l4proto_pernet_register(struct net *net,
const struct nf_conntrack_l4proto *const l4proto[], const struct nf_conntrack_l4proto *const l4proto[],
unsigned int num_proto) unsigned int num_proto)
{ {
@@ -341,16 +347,6 @@ int nf_ct_l4proto_pernet_register(struct net *net,
} }
return ret; return ret;
} }
EXPORT_SYMBOL_GPL(nf_ct_l4proto_pernet_register);
void nf_ct_l4proto_pernet_unregister(struct net *net,
const struct nf_conntrack_l4proto *const l4proto[],
unsigned int num_proto)
{
while (num_proto-- != 0)
nf_ct_l4proto_pernet_unregister_one(net, l4proto[num_proto]);
}
EXPORT_SYMBOL_GPL(nf_ct_l4proto_pernet_unregister);
static unsigned int nf_confirm(struct sk_buff *skb, static unsigned int nf_confirm(struct sk_buff *skb,
unsigned int protoff, unsigned int protoff,