netfilter: net/ipv[46]/netfilter: Move && and || to end of previous line

[safe/jmp/linux-2.6] / net / ipv6 / netfilter / ip6table_filter.c

diff --git a/net/ipv6/netfilter/ip6table_filter.c b/net/ipv6/netfilter/ip6table_filter.c
index 7e32e2a..ad378ef 100644 (file)
--- a/net/ipv6/netfilter/ip6table_filter.c
+++ b/net/ipv6/netfilter/ip6table_filter.c
@@ -17,28 +17,30 @@ MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Netfilter Core Team <coreteam@netfilter.org>");
 MODULE_DESCRIPTION("ip6tables filter table");
 
-#define FILTER_VALID_HOOKS ((1 << NF_IP6_LOCAL_IN) | (1 << NF_IP6_FORWARD) | (1 << NF_IP6_LOCAL_OUT))
+#define FILTER_VALID_HOOKS ((1 << NF_INET_LOCAL_IN) | \
+                           (1 << NF_INET_FORWARD) | \
+                           (1 << NF_INET_LOCAL_OUT))
 
 static struct
 {
        struct ip6t_replace repl;
        struct ip6t_standard entries[3];
        struct ip6t_error term;
-} initial_table __initdata = {
+} initial_table __net_initdata = {
        .repl = {
                .name = "filter",
                .valid_hooks = FILTER_VALID_HOOKS,
                .num_entries = 4,
                .size = sizeof(struct ip6t_standard) * 3 + sizeof(struct ip6t_error),
                .hook_entry = {
-                       [NF_IP6_LOCAL_IN] = 0,
-                       [NF_IP6_FORWARD] = sizeof(struct ip6t_standard),
-                       [NF_IP6_LOCAL_OUT] = sizeof(struct ip6t_standard) * 2
+                       [NF_INET_LOCAL_IN] = 0,
+                       [NF_INET_FORWARD] = sizeof(struct ip6t_standard),
+                       [NF_INET_LOCAL_OUT] = sizeof(struct ip6t_standard) * 2
                },
                .underflow = {
-                       [NF_IP6_LOCAL_IN] = 0,
-                       [NF_IP6_FORWARD] = sizeof(struct ip6t_standard),
-                       [NF_IP6_LOCAL_OUT] = sizeof(struct ip6t_standard) * 2
+                       [NF_INET_LOCAL_IN] = 0,
+                       [NF_INET_FORWARD] = sizeof(struct ip6t_standard),
+                       [NF_INET_LOCAL_OUT] = sizeof(struct ip6t_standard) * 2
                },
        },
        .entries = {
@@ -49,65 +51,66 @@ static struct
        .term = IP6T_ERROR_INIT,                /* ERROR */
 };
 
-static struct xt_table packet_filter = {
+static const struct xt_table packet_filter = {
        .name           = "filter",
        .valid_hooks    = FILTER_VALID_HOOKS,
-       .lock           = RW_LOCK_UNLOCKED,
        .me             = THIS_MODULE,
-       .af             = AF_INET6,
+       .af             = NFPROTO_IPV6,
 };
 
 /* The work comes in here from netfilter.c. */
 static unsigned int
-ip6t_hook(unsigned int hook,
-        struct sk_buff **pskb,
-        const struct net_device *in,
-        const struct net_device *out,
-        int (*okfn)(struct sk_buff *))
+ip6t_in_hook(unsigned int hook,
+                  struct sk_buff *skb,
+                  const struct net_device *in,
+                  const struct net_device *out,
+                  int (*okfn)(struct sk_buff *))
 {
-       return ip6t_do_table(pskb, hook, in, out, &packet_filter);
+       return ip6t_do_table(skb, hook, in, out,
+                            dev_net(in)->ipv6.ip6table_filter);
 }
 
 static unsigned int
 ip6t_local_out_hook(unsigned int hook,
-                  struct sk_buff **pskb,
+                  struct sk_buff *skb,
                   const struct net_device *in,
                   const struct net_device *out,
                   int (*okfn)(struct sk_buff *))
 {
 #if 0
        /* root is playing with raw sockets. */
-       if ((*pskb)->len < sizeof(struct iphdr)
-           || ip_hdrlen(*pskb) < sizeof(struct iphdr)) {
+       if (skb->len < sizeof(struct iphdr) ||
+           ip_hdrlen(skb) < sizeof(struct iphdr)) {
                if (net_ratelimit())
                        printk("ip6t_hook: happy cracking.\n");
                return NF_ACCEPT;
        }
 #endif
 
-       return ip6t_do_table(pskb, hook, in, out, &packet_filter);
+       return ip6t_do_table(skb, hook, in, out,
+                            dev_net(out)->ipv6.ip6table_filter);
 }
 
-static struct nf_hook_ops ip6t_ops[] = {
+static struct nf_hook_ops ip6t_ops[] __read_mostly = {
        {
-               .hook           = ip6t_hook,
+               .hook           = ip6t_in_hook,
                .owner          = THIS_MODULE,
-               .pf             = PF_INET6,
-               .hooknum        = NF_IP6_LOCAL_IN,
+               .pf             = NFPROTO_IPV6,
+               .hooknum        = NF_INET_LOCAL_IN,
                .priority       = NF_IP6_PRI_FILTER,
        },
        {
-               .hook           = ip6t_hook,
+               .hook           = ip6t_in_hook,
                .owner          = THIS_MODULE,
-               .pf             = PF_INET6,
-               .hooknum        = NF_IP6_FORWARD,
+               .pf             = NFPROTO_IPV6,
+               .hooknum        = NF_INET_FORWARD,
                .priority       = NF_IP6_PRI_FILTER,
        },
        {
                .hook           = ip6t_local_out_hook,
                .owner          = THIS_MODULE,
-               .pf             = PF_INET6,
-               .hooknum        = NF_IP6_LOCAL_OUT,
+               .pf             = NFPROTO_IPV6,
+               .hooknum        = NF_INET_LOCAL_OUT,
                .priority       = NF_IP6_PRI_FILTER,
        },
 };
@@ -116,6 +119,26 @@ static struct nf_hook_ops ip6t_ops[] = {
 static int forward = NF_ACCEPT;
 module_param(forward, bool, 0000);
 
+static int __net_init ip6table_filter_net_init(struct net *net)
+{
+       /* Register table */
+       net->ipv6.ip6table_filter =
+               ip6t_register_table(net, &packet_filter, &initial_table.repl);
+       if (IS_ERR(net->ipv6.ip6table_filter))
+               return PTR_ERR(net->ipv6.ip6table_filter);
+       return 0;
+}
+
+static void __net_exit ip6table_filter_net_exit(struct net *net)
+{
+       ip6t_unregister_table(net->ipv6.ip6table_filter);
+}
+
+static struct pernet_operations ip6table_filter_net_ops = {
+       .init = ip6table_filter_net_init,
+       .exit = ip6table_filter_net_exit,
+};
+
 static int __init ip6table_filter_init(void)
 {
        int ret;
@@ -128,8 +151,7 @@ static int __init ip6table_filter_init(void)
        /* Entry 1 is the FORWARD hook */
        initial_table.entries[1].target.verdict = -forward - 1;
 
-       /* Register table */
-       ret = ip6t_register_table(&packet_filter, &initial_table.repl);
+       ret = register_pernet_subsys(&ip6table_filter_net_ops);
        if (ret < 0)
                return ret;
 
@@ -141,14 +163,14 @@ static int __init ip6table_filter_init(void)
        return ret;
 
  cleanup_table:
-       ip6t_unregister_table(&packet_filter);
+       unregister_pernet_subsys(&ip6table_filter_net_ops);
        return ret;
 }
 
 static void __exit ip6table_filter_fini(void)
 {
        nf_unregister_hooks(ip6t_ops, ARRAY_SIZE(ip6t_ops));
-       ip6t_unregister_table(&packet_filter);
+       unregister_pernet_subsys(&ip6table_filter_net_ops);
 }
 
 module_init(ip6table_filter_init);