netfilter: conntrack: gre: switch module to be built-in

[linux-2.6-microblaze.git] / net / netfilter / nf_conntrack_proto_gre.c

diff --git a/net/netfilter/nf_conntrack_proto_gre.c b/net/netfilter/nf_conntrack_proto_gre.c
index 34dd894..68f9bfb 100644 (file)
--- a/net/netfilter/nf_conntrack_proto_gre.c
+++ b/net/netfilter/nf_conntrack_proto_gre.c
@@ -48,18 +48,17 @@ static const unsigned int gre_timeouts[GRE_CT_MAX] = {
        [GRE_CT_REPLIED]        = 180*HZ,
 };
 
-static unsigned int proto_gre_net_id __read_mostly;
 /* used when expectation is added */
 static DEFINE_SPINLOCK(keymap_lock);
 
-static inline struct netns_proto_gre *gre_pernet(struct net *net)
+static inline struct nf_gre_net *gre_pernet(struct net *net)
 {
-       return net_generic(net, proto_gre_net_id);
+       return &net->ct.nf_ct_proto.gre;
 }
 
-static void nf_ct_gre_keymap_flush(struct net *net)
+void nf_ct_gre_keymap_flush(struct net *net)
 {
-       struct netns_proto_gre *net_gre = gre_pernet(net);
+       struct nf_gre_net *net_gre = gre_pernet(net);
        struct nf_ct_gre_keymap *km, *tmp;
 
        spin_lock_bh(&keymap_lock);
@@ -83,7 +82,7 @@ static inline int gre_key_cmpfn(const struct nf_ct_gre_keymap *km,
 /* look up the source key for a given tuple */
 static __be16 gre_keymap_lookup(struct net *net, struct nf_conntrack_tuple *t)
 {
-       struct netns_proto_gre *net_gre = gre_pernet(net);
+       struct nf_gre_net *net_gre = gre_pernet(net);
        struct nf_ct_gre_keymap *km;
        __be16 key = 0;
 
@@ -105,7 +104,7 @@ int nf_ct_gre_keymap_add(struct nf_conn *ct, enum ip_conntrack_dir dir,
                         struct nf_conntrack_tuple *t)
 {
        struct net *net = nf_ct_net(ct);
-       struct netns_proto_gre *net_gre = gre_pernet(net);
+       struct nf_gre_net *net_gre = gre_pernet(net);
        struct nf_ct_pptp_master *ct_pptp_info = nfct_help_data(ct);
        struct nf_ct_gre_keymap **kmp, *km;
 
@@ -210,7 +209,7 @@ static void gre_print_conntrack(struct seq_file *s, struct nf_conn *ct)
 
 static unsigned int *gre_get_timeouts(struct net *net)
 {
-       return gre_pernet(net)->gre_timeouts;
+       return gre_pernet(net)->timeouts;
 }
 
 /* Returns verdict for packet, and may modify conntrack */
@@ -272,13 +271,13 @@ static int gre_timeout_nlattr_to_obj(struct nlattr *tb[],
                                     struct net *net, void *data)
 {
        unsigned int *timeouts = data;
-       struct netns_proto_gre *net_gre = gre_pernet(net);
+       struct nf_gre_net *net_gre = gre_pernet(net);
 
        if (!timeouts)
                timeouts = gre_get_timeouts(net);
        /* set default timeouts for GRE. */
-       timeouts[GRE_CT_UNREPLIED] = net_gre->gre_timeouts[GRE_CT_UNREPLIED];
-       timeouts[GRE_CT_REPLIED] = net_gre->gre_timeouts[GRE_CT_REPLIED];
+       timeouts[GRE_CT_UNREPLIED] = net_gre->timeouts[GRE_CT_UNREPLIED];
+       timeouts[GRE_CT_REPLIED] = net_gre->timeouts[GRE_CT_REPLIED];
 
        if (tb[CTA_TIMEOUT_GRE_UNREPLIED]) {
                timeouts[GRE_CT_UNREPLIED] =
@@ -332,10 +331,11 @@ static struct ctl_table gre_sysctl_table[] = {
 };
 #endif
 
-static int gre_kmemdup_sysctl_table(struct net *net, struct nf_proto_net *nf,
-                                   struct netns_proto_gre *net_gre)
+static int gre_kmemdup_sysctl_table(struct net *net)
 {
 #ifdef CONFIG_SYSCTL
+       struct nf_gre_net *net_gre = gre_pernet(net);
+       struct nf_proto_net *nf = &net_gre->nf;
        int i;
 
        if (nf->ctl_table)
@@ -348,26 +348,25 @@ static int gre_kmemdup_sysctl_table(struct net *net, struct nf_proto_net *nf,
                return -ENOMEM;
 
        for (i = 0; i < GRE_CT_MAX; i++)
-               nf->ctl_table[i].data = &net_gre->gre_timeouts[i];
+               nf->ctl_table[i].data = &net_gre->timeouts[i];
 #endif
        return 0;
 }
 
 static int gre_init_net(struct net *net)
 {
-       struct netns_proto_gre *net_gre = gre_pernet(net);
-       struct nf_proto_net *nf = &net_gre->nf;
+       struct nf_gre_net *net_gre = gre_pernet(net);
        int i;
 
        INIT_LIST_HEAD(&net_gre->keymap_list);
        for (i = 0; i < GRE_CT_MAX; i++)
-               net_gre->gre_timeouts[i] = gre_timeouts[i];
+               net_gre->timeouts[i] = gre_timeouts[i];
 
-       return gre_kmemdup_sysctl_table(net, nf, net_gre);
+       return gre_kmemdup_sysctl_table(net);
 }
 
 /* protocol helper struct */
-static const struct nf_conntrack_l4proto nf_conntrack_l4proto_gre4 = {
+const struct nf_conntrack_l4proto nf_conntrack_l4proto_gre = {
        .l4proto         = IPPROTO_GRE,
        .pkt_to_tuple    = gre_pkt_to_tuple,
 #ifdef CONFIG_NF_CONNTRACK_PROCFS
@@ -391,61 +390,5 @@ static const struct nf_conntrack_l4proto nf_conntrack_l4proto_gre4 = {
                .nla_policy     = gre_timeout_nla_policy,
        },
 #endif /* CONFIG_NF_CONNTRACK_TIMEOUT */
-       .net_id         = &proto_gre_net_id,
        .init_net       = gre_init_net,
 };
-
-static int proto_gre_net_init(struct net *net)
-{
-       int ret = 0;
-
-       ret = nf_ct_l4proto_pernet_register_one(net,
-                                               &nf_conntrack_l4proto_gre4);
-       if (ret < 0)
-               pr_err("nf_conntrack_gre4: pernet registration failed.\n");
-       return ret;
-}
-
-static void proto_gre_net_exit(struct net *net)
-{
-       nf_ct_l4proto_pernet_unregister_one(net, &nf_conntrack_l4proto_gre4);
-       nf_ct_gre_keymap_flush(net);
-}
-
-static struct pernet_operations proto_gre_net_ops = {
-       .init = proto_gre_net_init,
-       .exit = proto_gre_net_exit,
-       .id   = &proto_gre_net_id,
-       .size = sizeof(struct netns_proto_gre),
-};
-
-static int __init nf_ct_proto_gre_init(void)
-{
-       int ret;
-
-       BUILD_BUG_ON(offsetof(struct netns_proto_gre, nf) != 0);
-
-       ret = register_pernet_subsys(&proto_gre_net_ops);
-       if (ret < 0)
-               goto out_pernet;
-       ret = nf_ct_l4proto_register_one(&nf_conntrack_l4proto_gre4);
-       if (ret < 0)
-               goto out_gre4;
-
-       return 0;
-out_gre4:
-       unregister_pernet_subsys(&proto_gre_net_ops);
-out_pernet:
-       return ret;
-}
-
-static void __exit nf_ct_proto_gre_fini(void)
-{
-       nf_ct_l4proto_unregister_one(&nf_conntrack_l4proto_gre4);
-       unregister_pernet_subsys(&proto_gre_net_ops);
-}
-
-module_init(nf_ct_proto_gre_init);
-module_exit(nf_ct_proto_gre_fini);
-
-MODULE_LICENSE("GPL");