- Update to 2.6.25-rc3.

[linux-flexiantxendom0-3.2.10.git] / net / ipv6 / netfilter / ip6table_raw.c

diff --git a/net/ipv6/netfilter/ip6table_raw.c b/net/ipv6/netfilter/ip6table_raw.c
index 8f7109f..5cd8420 100644 (file)
--- a/net/ipv6/netfilter/ip6table_raw.c
+++ b/net/ipv6/netfilter/ip6table_raw.c
@@ -6,26 +6,26 @@
 #include <linux/module.h>
 #include <linux/netfilter_ipv6/ip6_tables.h>
 
-#define RAW_VALID_HOOKS ((1 << NF_IP6_PRE_ROUTING) | (1 << NF_IP6_LOCAL_OUT))
+#define RAW_VALID_HOOKS ((1 << NF_INET_PRE_ROUTING) | (1 << NF_INET_LOCAL_OUT))
 
 static struct
 {
        struct ip6t_replace repl;
        struct ip6t_standard entries[2];
        struct ip6t_error term;
-} initial_table __initdata = {
+} initial_table __net_initdata = {
        .repl = {
                .name = "raw",
                .valid_hooks = RAW_VALID_HOOKS,
                .num_entries = 3,
                .size = sizeof(struct ip6t_standard) * 2 + sizeof(struct ip6t_error),
                .hook_entry = {
-                       [NF_IP6_PRE_ROUTING] = 0,
-                       [NF_IP6_LOCAL_OUT] = sizeof(struct ip6t_standard)
+                       [NF_INET_PRE_ROUTING] = 0,
+                       [NF_INET_LOCAL_OUT] = sizeof(struct ip6t_standard)
                },
                .underflow = {
-                       [NF_IP6_PRE_ROUTING] = 0,
-                       [NF_IP6_LOCAL_OUT] = sizeof(struct ip6t_standard)
+                       [NF_INET_PRE_ROUTING] = 0,
+                       [NF_INET_LOCAL_OUT] = sizeof(struct ip6t_standard)
                },
        },
        .entries = {
@@ -51,32 +51,51 @@ ip6t_hook(unsigned int hook,
         const struct net_device *out,
         int (*okfn)(struct sk_buff *))
 {
-       return ip6t_do_table(skb, hook, in, out, &packet_raw);
+       return ip6t_do_table(skb, hook, in, out, init_net.ipv6.ip6table_raw);
 }
 
-static struct nf_hook_ops ip6t_ops[] = {
+static struct nf_hook_ops ip6t_ops[] __read_mostly = {
        {
          .hook = ip6t_hook,
          .pf = PF_INET6,
-         .hooknum = NF_IP6_PRE_ROUTING,
+         .hooknum = NF_INET_PRE_ROUTING,
          .priority = NF_IP6_PRI_FIRST,
          .owner = THIS_MODULE,
        },
        {
          .hook = ip6t_hook,
          .pf = PF_INET6,
-         .hooknum = NF_IP6_LOCAL_OUT,
+         .hooknum = NF_INET_LOCAL_OUT,
          .priority = NF_IP6_PRI_FIRST,
          .owner = THIS_MODULE,
        },
 };
 
+static int __net_init ip6table_raw_net_init(struct net *net)
+{
+       /* Register table */
+       net->ipv6.ip6table_raw =
+               ip6t_register_table(net, &packet_raw, &initial_table.repl);
+       if (IS_ERR(net->ipv6.ip6table_raw))
+               return PTR_ERR(net->ipv6.ip6table_raw);
+       return 0;
+}
+
+static void __net_exit ip6table_raw_net_exit(struct net *net)
+{
+       ip6t_unregister_table(net->ipv6.ip6table_raw);
+}
+
+static struct pernet_operations ip6table_raw_net_ops = {
+       .init = ip6table_raw_net_init,
+       .exit = ip6table_raw_net_exit,
+};
+
 static int __init ip6table_raw_init(void)
 {
        int ret;
 
-       /* Register table */
-       ret = ip6t_register_table(&packet_raw, &initial_table.repl);
+       ret = register_pernet_subsys(&ip6table_raw_net_ops);
        if (ret < 0)
                return ret;
 
@@ -88,14 +107,14 @@ static int __init ip6table_raw_init(void)
        return ret;
 
  cleanup_table:
-       ip6t_unregister_table(&packet_raw);
+       unregister_pernet_subsys(&ip6table_raw_net_ops);
        return ret;
 }
 
 static void __exit ip6table_raw_fini(void)
 {
        nf_unregister_hooks(ip6t_ops, ARRAY_SIZE(ip6t_ops));
-       ip6t_unregister_table(&packet_raw);
+       unregister_pernet_subsys(&ip6table_raw_net_ops);
 }
 
 module_init(ip6table_raw_init);