[NETFILTER]: Clean up table initialization

- move arp_tables initial table structure definitions to arp_tables.h
  similar to ip_tables and ip6_tables

- use C99 initializers

- use initializer macros where possible

Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 23 insertions, 47 deletions

diff --git a/net/ipv6/netfilter/ip6table_filter.c b/net/ipv6/netfilter/ip6table_filter.c
index 76f0cf66f95..7e32e2aaf7f 100644
--- a/net/ipv6/netfilter/ip6table_filter.c
+++ b/net/ipv6/netfilter/ip6table_filter.c
@@ -24,53 +24,29 @@ static struct
         struct ip6t_replace repl;
         struct ip6t_standard entries[3];
         struct ip6t_error term;
-} initial_table __initdata
-= { { "filter", FILTER_VALID_HOOKS, 4,
-      sizeof(struct ip6t_standard) * 3 + sizeof(struct ip6t_error),
-      { [NF_IP6_LOCAL_IN] = 0,
-        [NF_IP6_FORWARD] = sizeof(struct ip6t_standard),
-        [NF_IP6_LOCAL_OUT] = sizeof(struct ip6t_standard) * 2 },
-      { [NF_IP6_LOCAL_IN] = 0,
-        [NF_IP6_FORWARD] = sizeof(struct ip6t_standard),
-        [NF_IP6_LOCAL_OUT] = sizeof(struct ip6t_standard) * 2 },
-      0, NULL, { } },
-    {
-            /* LOCAL_IN */
-            { { { { { { 0 } } }, { { { 0 } } }, { { { 0 } } }, { { { 0 } } }, "", "", { 0 }, { 0 }, 0, 0, 0 },
-                0,
-                sizeof(struct ip6t_entry),
-                sizeof(struct ip6t_standard),
-                0, { 0, 0 }, { } },
-              { { { { IP6T_ALIGN(sizeof(struct ip6t_standard_target)), "" } }, { } },
-                -NF_ACCEPT - 1 } },
-            /* FORWARD */
-            { { { { { { 0 } } }, { { { 0 } } }, { { { 0 } } }, { { { 0 } } }, "", "", { 0 }, { 0 }, 0, 0, 0 },
-                0,
-                sizeof(struct ip6t_entry),
-                sizeof(struct ip6t_standard),
-                0, { 0, 0 }, { } },
-              { { { { IP6T_ALIGN(sizeof(struct ip6t_standard_target)), "" } }, { } },
-                -NF_ACCEPT - 1 } },
-            /* LOCAL_OUT */
-            { { { { { { 0 } } }, { { { 0 } } }, { { { 0 } } }, { { { 0 } } }, "", "", { 0 }, { 0 }, 0, 0, 0 },
-                0,
-                sizeof(struct ip6t_entry),
-                sizeof(struct ip6t_standard),
-                0, { 0, 0 }, { } },
-              { { { { IP6T_ALIGN(sizeof(struct ip6t_standard_target)), "" } }, { } },
-                -NF_ACCEPT - 1 } }
-    },
-    /* ERROR */
-    { { { { { { 0 } } }, { { { 0 } } }, { { { 0 } } }, { { { 0 } } }, "", "", { 0 }, { 0 }, 0, 0, 0 },
-        0,
-        sizeof(struct ip6t_entry),
-        sizeof(struct ip6t_error),
-        0, { 0, 0 }, { } },
-      { { { { IP6T_ALIGN(sizeof(struct ip6t_error_target)), IP6T_ERROR_TARGET } },
-          { } },
-        "ERROR"
-      }
-    }
+} initial_table __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
+                },
+                .underflow = {
+                        [NF_IP6_LOCAL_IN] = 0,
+                        [NF_IP6_FORWARD] = sizeof(struct ip6t_standard),
+                        [NF_IP6_LOCAL_OUT] = sizeof(struct ip6t_standard) * 2
+                },
+        },
+        .entries = {
+                IP6T_STANDARD_INIT(NF_ACCEPT),  /* LOCAL_IN */
+                IP6T_STANDARD_INIT(NF_ACCEPT),  /* FORWARD */
+                IP6T_STANDARD_INIT(NF_ACCEPT),  /* LOCAL_OUT */
+        },
+        .term = IP6T_ERROR_INIT,                /* ERROR */
 };
 
 static struct xt_table packet_filter = {