[NET] IPV4: Fix whitespace errors.

[deliverable/linux.git] / net / ipv4 / netfilter / iptable_raw.c

diff --git a/net/ipv4/netfilter/iptable_raw.c b/net/ipv4/netfilter/iptable_raw.c
index 03cc79a6160a68b89fbae369d06bf71dd95f5fde..18c3d4c9ff51e23ecd8ffece105407d7fed94e91 100644 (file)
--- a/net/ipv4/netfilter/iptable_raw.c
+++ b/net/ipv4/netfilter/iptable_raw.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * 'raw' table, which is the very first hooked in at PRE_ROUTING and LOCAL_OUT .
  *
  * Copyright (C) 2003 Jozsef Kadlecsik <kadlec@blackhole.kfki.hu>
@@ -15,26 +15,26 @@ static struct
        struct ipt_error term;
 } initial_table __initdata = {
        .repl = {
-               .name = "raw", 
-               .valid_hooks = RAW_VALID_HOOKS, 
+               .name = "raw",
+               .valid_hooks = RAW_VALID_HOOKS,
                .num_entries = 3,
                .size = sizeof(struct ipt_standard) * 2 + sizeof(struct ipt_error),
-               .hook_entry = { 
+               .hook_entry = {
                        [NF_IP_PRE_ROUTING] = 0,
                        [NF_IP_LOCAL_OUT] = sizeof(struct ipt_standard) },
-               .underflow = { 
+               .underflow = {
                        [NF_IP_PRE_ROUTING] = 0,
                        [NF_IP_LOCAL_OUT]  = sizeof(struct ipt_standard) },
        },
        .entries = {
             /* PRE_ROUTING */
-            { 
-                    .entry = { 
+            {
+                    .entry = {
                             .target_offset = sizeof(struct ipt_entry),
                             .next_offset = sizeof(struct ipt_standard),
                     },
-                    .target = { 
-                         .target = { 
+                    .target = {
+                         .target = {
                                  .u = {
                                          .target_size = IPT_ALIGN(sizeof(struct ipt_standard_target)),
                                  },
@@ -69,7 +69,7 @@ static struct
                        .target = {
                                .u = {
                                        .user = {
-                                               .target_size = IPT_ALIGN(sizeof(struct ipt_error_target)), 
+                                               .target_size = IPT_ALIGN(sizeof(struct ipt_error_target)),
                                                .name = IPT_ERROR_TARGET,
                                        },
                                },
@@ -79,10 +79,10 @@ static struct
        }
 };
 
-static struct ipt_table packet_raw = { 
-       .name = "raw", 
-       .valid_hooks =  RAW_VALID_HOOKS, 
-       .lock = RW_LOCK_UNLOCKED, 
+static struct xt_table packet_raw = {
+       .name = "raw",
+       .valid_hooks =  RAW_VALID_HOOKS,
+       .lock = RW_LOCK_UNLOCKED,
        .me = THIS_MODULE,
        .af = AF_INET,
 };
@@ -95,24 +95,24 @@ ipt_hook(unsigned int hook,
         const struct net_device *out,
         int (*okfn)(struct sk_buff *))
 {
-       return ipt_do_table(pskb, hook, in, out, &packet_raw, NULL);
+       return ipt_do_table(pskb, hook, in, out, &packet_raw);
 }
 
 /* 'raw' is the very first table. */
 static struct nf_hook_ops ipt_ops[] = {
        {
-         .hook = ipt_hook, 
-         .pf = PF_INET, 
-         .hooknum = NF_IP_PRE_ROUTING, 
-         .priority = NF_IP_PRI_RAW,
-         .owner = THIS_MODULE,
+               .hook = ipt_hook,
+               .pf = PF_INET,
+               .hooknum = NF_IP_PRE_ROUTING,
+               .priority = NF_IP_PRI_RAW,
+               .owner = THIS_MODULE,
        },
        {
-         .hook = ipt_hook, 
-         .pf = PF_INET, 
-         .hooknum = NF_IP_LOCAL_OUT, 
-         .priority = NF_IP_PRI_RAW,
-         .owner = THIS_MODULE,
+               .hook = ipt_hook,
+               .pf = PF_INET,
+               .hooknum = NF_IP_LOCAL_OUT,
+               .priority = NF_IP_PRI_RAW,
+               .owner = THIS_MODULE,
        },
 };
 
@@ -126,31 +126,20 @@ static int __init iptable_raw_init(void)
                return ret;
 
        /* Register hooks */
-       ret = nf_register_hook(&ipt_ops[0]);
+       ret = nf_register_hooks(ipt_ops, ARRAY_SIZE(ipt_ops));
        if (ret < 0)
                goto cleanup_table;
 
-       ret = nf_register_hook(&ipt_ops[1]);
-       if (ret < 0)
-               goto cleanup_hook0;
-
        return ret;
 
- cleanup_hook0:
-       nf_unregister_hook(&ipt_ops[0]);
  cleanup_table:
        ipt_unregister_table(&packet_raw);
-
        return ret;
 }
 
 static void __exit iptable_raw_fini(void)
 {
-       unsigned int i;
-
-       for (i = 0; i < sizeof(ipt_ops)/sizeof(struct nf_hook_ops); i++)
-               nf_unregister_hook(&ipt_ops[i]);
-
+       nf_unregister_hooks(ipt_ops, ARRAY_SIZE(ipt_ops));
        ipt_unregister_table(&packet_raw);
 }