leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

netfilter: conntrack: remove net_id

Browse Source 
No users 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:36 +01:00 committed by Pablo Neira Ayuso
parent 22fc4c4c9f
commit 751fc301ec
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,7 +79,7 @@ struct nf_conntrack_l4proto {
/* Print out the private part of the conntrack. */ /* Print out the private part of the conntrack. */
void (*print_conntrack)(struct seq_file *s, struct nf_conn *); void (*print_conntrack)(struct seq_file *s, struct nf_conn *);
#endif #endif
unsigned int *net_id;
/* Init l4proto pernet data */ /* Init l4proto pernet data */
int (*init_net)(struct net *net); int (*init_net)(struct net *net);

8
net/netfilter/nf_conntrack_proto.c
View File

@ -163,13 +163,9 @@ static int kill_l4proto(struct nf_conn *i, void *data)
static struct nf_proto_net *nf_ct_l4proto_net(struct net *net, static struct nf_proto_net *nf_ct_l4proto_net(struct net *net,
const struct nf_conntrack_l4proto *l4proto) const struct nf_conntrack_l4proto *l4proto)
{ {
if (l4proto->get_net_proto) { if (l4proto->get_net_proto)
/* statically built-in protocols use static per-net */
return l4proto->get_net_proto(net); return l4proto->get_net_proto(net);
} else if (l4proto->net_id) {
/* ... and loadable protocols use dynamic per-net */
return net_generic(net, *l4proto->net_id);
}
return NULL; return NULL;
} }