Commit 54911c4d authored by Art Haas's avatar Art Haas Committed by David S. Miller

[NETFILTER]: C99 initializers for net_ipv4_netfilter.

parent 0a0c06a2
...@@ -37,10 +37,10 @@ static struct ...@@ -37,10 +37,10 @@ static struct
} initial_table __initdata } initial_table __initdata
= { { "filter", FILTER_VALID_HOOKS, 3, = { { "filter", FILTER_VALID_HOOKS, 3,
sizeof(struct arpt_standard) * 2 + sizeof(struct arpt_error), sizeof(struct arpt_standard) * 2 + sizeof(struct arpt_error),
{ [NF_ARP_IN] 0, { [NF_ARP_IN] = 0,
[NF_ARP_OUT] sizeof(struct arpt_standard) }, [NF_ARP_OUT] = sizeof(struct arpt_standard) },
{ [NF_ARP_IN] 0, { [NF_ARP_IN] = 0,
[NF_ARP_OUT] sizeof(struct arpt_standard), }, [NF_ARP_OUT] = sizeof(struct arpt_standard), },
0, NULL, { } }, 0, NULL, { } },
{ {
/* ARP_IN */ /* ARP_IN */
......
...@@ -160,10 +160,10 @@ static int (*mangle[])(struct sk_buff **, u_int32_t, u_int16_t, ...@@ -160,10 +160,10 @@ static int (*mangle[])(struct sk_buff **, u_int32_t, u_int16_t,
unsigned int, unsigned int,
struct ip_conntrack *, struct ip_conntrack *,
enum ip_conntrack_info) enum ip_conntrack_info)
= { [IP_CT_FTP_PORT] mangle_rfc959_packet, = { [IP_CT_FTP_PORT] = mangle_rfc959_packet,
[IP_CT_FTP_PASV] mangle_rfc959_packet, [IP_CT_FTP_PASV] = mangle_rfc959_packet,
[IP_CT_FTP_EPRT] mangle_eprt_packet, [IP_CT_FTP_EPRT] = mangle_eprt_packet,
[IP_CT_FTP_EPSV] mangle_epsv_packet [IP_CT_FTP_EPSV] = mangle_epsv_packet
}; };
static int ftp_data_fixup(const struct ip_ct_ftp_expect *ct_ftp_info, static int ftp_data_fixup(const struct ip_ct_ftp_expect *ct_ftp_info,
......
...@@ -56,12 +56,12 @@ static struct ...@@ -56,12 +56,12 @@ static struct
} nat_initial_table __initdata } nat_initial_table __initdata
= { { "nat", NAT_VALID_HOOKS, 4, = { { "nat", NAT_VALID_HOOKS, 4,
sizeof(struct ipt_standard) * 3 + sizeof(struct ipt_error), sizeof(struct ipt_standard) * 3 + sizeof(struct ipt_error),
{ [NF_IP_PRE_ROUTING] 0, { [NF_IP_PRE_ROUTING] = 0,
[NF_IP_POST_ROUTING] sizeof(struct ipt_standard), [NF_IP_POST_ROUTING] = sizeof(struct ipt_standard),
[NF_IP_LOCAL_OUT] sizeof(struct ipt_standard) * 2 }, [NF_IP_LOCAL_OUT] = sizeof(struct ipt_standard) * 2 },
{ [NF_IP_PRE_ROUTING] 0, { [NF_IP_PRE_ROUTING] = 0,
[NF_IP_POST_ROUTING] sizeof(struct ipt_standard), [NF_IP_POST_ROUTING] = sizeof(struct ipt_standard),
[NF_IP_LOCAL_OUT] sizeof(struct ipt_standard) * 2 }, [NF_IP_LOCAL_OUT] = sizeof(struct ipt_standard) * 2 },
0, NULL, { } }, 0, NULL, { } },
{ {
/* PRE_ROUTING */ /* PRE_ROUTING */
......
...@@ -35,12 +35,12 @@ static struct ...@@ -35,12 +35,12 @@ static struct
} initial_table __initdata } initial_table __initdata
= { { "filter", FILTER_VALID_HOOKS, 4, = { { "filter", FILTER_VALID_HOOKS, 4,
sizeof(struct ipt_standard) * 3 + sizeof(struct ipt_error), sizeof(struct ipt_standard) * 3 + sizeof(struct ipt_error),
{ [NF_IP_LOCAL_IN] 0, { [NF_IP_LOCAL_IN] = 0,
[NF_IP_FORWARD] sizeof(struct ipt_standard), [NF_IP_FORWARD] = sizeof(struct ipt_standard),
[NF_IP_LOCAL_OUT] sizeof(struct ipt_standard) * 2 }, [NF_IP_LOCAL_OUT] = sizeof(struct ipt_standard) * 2 },
{ [NF_IP_LOCAL_IN] 0, { [NF_IP_LOCAL_IN] = 0,
[NF_IP_FORWARD] sizeof(struct ipt_standard), [NF_IP_FORWARD] = sizeof(struct ipt_standard),
[NF_IP_LOCAL_OUT] sizeof(struct ipt_standard) * 2 }, [NF_IP_LOCAL_OUT] = sizeof(struct ipt_standard) * 2 },
0, NULL, { } }, 0, NULL, { } },
{ {
/* LOCAL_IN */ /* LOCAL_IN */
......
...@@ -48,16 +48,16 @@ static struct ...@@ -48,16 +48,16 @@ static struct
} initial_table __initdata } initial_table __initdata
= { { "mangle", MANGLE_VALID_HOOKS, 6, = { { "mangle", MANGLE_VALID_HOOKS, 6,
sizeof(struct ipt_standard) * 5 + sizeof(struct ipt_error), sizeof(struct ipt_standard) * 5 + sizeof(struct ipt_error),
{ [NF_IP_PRE_ROUTING] 0, { [NF_IP_PRE_ROUTING] = 0,
[NF_IP_LOCAL_IN] sizeof(struct ipt_standard), [NF_IP_LOCAL_IN] = sizeof(struct ipt_standard),
[NF_IP_FORWARD] sizeof(struct ipt_standard) * 2, [NF_IP_FORWARD] = sizeof(struct ipt_standard) * 2,
[NF_IP_LOCAL_OUT] sizeof(struct ipt_standard) * 3, [NF_IP_LOCAL_OUT] = sizeof(struct ipt_standard) * 3,
[NF_IP_POST_ROUTING] sizeof(struct ipt_standard) * 4 }, [NF_IP_POST_ROUTING] = sizeof(struct ipt_standard) * 4 },
{ [NF_IP_PRE_ROUTING] 0, { [NF_IP_PRE_ROUTING] = 0,
[NF_IP_LOCAL_IN] sizeof(struct ipt_standard), [NF_IP_LOCAL_IN] = sizeof(struct ipt_standard),
[NF_IP_FORWARD] sizeof(struct ipt_standard) * 2, [NF_IP_FORWARD] = sizeof(struct ipt_standard) * 2,
[NF_IP_LOCAL_OUT] sizeof(struct ipt_standard) * 3, [NF_IP_LOCAL_OUT] = sizeof(struct ipt_standard) * 3,
[NF_IP_POST_ROUTING] sizeof(struct ipt_standard) * 4 }, [NF_IP_POST_ROUTING] = sizeof(struct ipt_standard) * 4 },
0, NULL, { } }, 0, NULL, { } },
{ {
/* PRE_ROUTING */ /* PRE_ROUTING */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment