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>

diff --git a/include/net/netfilter/nf_conntrack_l4proto.h b/include/net/netfilter/nf_conntrack_l4proto.h
index fded3f164dcc7e8eaafd4cb65f1287685bc6a7b3..3585f8666fc0f9db58c137aa1830daa6de3f872a 100644 (file)
--- a/include/net/netfilter/nf_conntrack_l4proto.h
+++ b/include/net/netfilter/nf_conntrack_l4proto.h
@@ -79,7 +79,7 @@ struct nf_conntrack_l4proto {
        /* Print out the private part of the conntrack. */
        void (*print_conntrack)(struct seq_file *s, struct nf_conn *);
 #endif
-       unsigned int    *net_id;
+
        /* Init l4proto pernet data */
        int (*init_net)(struct net *net);
 

diff --git a/net/netfilter/nf_conntrack_proto.c b/net/netfilter/nf_conntrack_proto.c
index e113bb2dc88d58c4e3a47b6eeb524428a4b7e0cc..47b9294a86f718a4172190fc1b23ee51fbb64591 100644 (file)
--- a/net/netfilter/nf_conntrack_proto.c
+++ b/net/netfilter/nf_conntrack_proto.c
@@ -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,
                                const struct nf_conntrack_l4proto *l4proto)
 {
-       if (l4proto->get_net_proto) {
-               /* statically built-in protocols use static per-net */
+       if (l4proto->get_net_proto)
                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;
 }