Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

netfilter: conntrack: remove net_id

No users anymore.

Signed-off-by: Florian Westphal <fw@strlen.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>

authored by

Florian Westphal and committed by
Pablo Neira Ayuso
751fc301 22fc4c4c

+3 -7
+1 -1
include/net/netfilter/nf_conntrack_l4proto.h
··· 79 79 /* Print out the private part of the conntrack. */ 80 80 void (*print_conntrack)(struct seq_file *s, struct nf_conn *); 81 81 #endif 82 - unsigned int *net_id; 82 + 83 83 /* Init l4proto pernet data */ 84 84 int (*init_net)(struct net *net); 85 85
+2 -6
net/netfilter/nf_conntrack_proto.c
··· 163 163 static struct nf_proto_net *nf_ct_l4proto_net(struct net *net, 164 164 const struct nf_conntrack_l4proto *l4proto) 165 165 { 166 - if (l4proto->get_net_proto) { 167 - /* statically built-in protocols use static per-net */ 166 + if (l4proto->get_net_proto) 168 167 return l4proto->get_net_proto(net); 169 - } else if (l4proto->net_id) { 170 - /* ... and loadable protocols use dynamic per-net */ 171 - return net_generic(net, *l4proto->net_id); 172 - } 168 + 173 169 return NULL; 174 170 } 175 171