VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

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

diff --git a/net/ipv6/netfilter/ip6table_raw.c b/net/ipv6/netfilter/ip6table_raw.c
index 62ba337..b7077e9 100644 (file)
--- a/net/ipv6/netfilter/ip6table_raw.c
+++ b/net/ipv6/netfilter/ip6table_raw.c
@@ -38,43 +38,72 @@ static struct
        struct ip6t_replace repl;
        struct ip6t_standard entries[2];
        struct ip6t_error term;
-} initial_table __initdata 
-= { { "raw", RAW_VALID_HOOKS, 3,
-      sizeof(struct ip6t_standard) * 2 + sizeof(struct ip6t_error),
-      { [NF_IP6_PRE_ROUTING]   0,
-       [NF_IP6_LOCAL_OUT]      sizeof(struct ip6t_standard) },
-      { [NF_IP6_PRE_ROUTING]   0,
-       [NF_IP6_LOCAL_OUT]      sizeof(struct ip6t_standard) },
-      0, NULL, { } },
-    {
-           /* PRE_ROUTING */
-            { { { { { { 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 = "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)
+               },
+               .underflow = {
+                       [NF_IP6_PRE_ROUTING] = 0,
+                       [NF_IP6_LOCAL_OUT] = sizeof(struct ip6t_standard)
+               },
+       },
+       .entries = {
+               /* PRE_ROUTING */
+               {
+                       .entry = {
+                               .target_offset = sizeof(struct ip6t_entry),
+                               .next_offset = sizeof(struct ip6t_standard),
+                       },
+                       .target = {
+                               .target = {
+                                       .u = {
+                                               .target_size = IP6T_ALIGN(sizeof(struct ip6t_standard_target)),
+                                       },
+                               },
+                               .verdict = -NF_ACCEPT - 1,
+                       },
+               },
+
+               /* LOCAL_OUT */
+               {
+                       .entry = {
+                               .target_offset = sizeof(struct ip6t_entry),
+                               .next_offset = sizeof(struct ip6t_standard),
+                       },
+                       .target = {
+                               .target = {
+                                       .u = {
+                                               .target_size = IP6T_ALIGN(sizeof(struct ip6t_standard_target)),
+                                       },
+                               },
+                               .verdict = -NF_ACCEPT - 1,
+                       },
+               },
+       },
+       /* ERROR */
+       .term = {
+               .entry = {
+                       .target_offset = sizeof(struct ip6t_entry),
+                       .next_offset = sizeof(struct ip6t_error),
+               },
+               .target = {
+                       .target = {
+                               .u = {
+                                       .user = {
+                                               .target_size = IP6T_ALIGN(sizeof(struct ip6t_error_target)),
+                                               .name = IP6T_ERROR_TARGET,
+                                       },
+                               },
+                       },
+                       .errorname = "ERROR",
+               },
+       }
 };
 
 static struct ip6t_table packet_raw = {