Hi.
Here's a set of five patches for files in the net/ipv4/netfilter
directory that hat replace the obsolete GCC array initializer syntax
with C99 syntax. The patches are against the 2.5.58 BK Kernel pulled
January 14.
Art Haas
===== net/ipv4/netfilter/arptable_filter.c 1.1 vs edited =====
--- 1.1/net/ipv4/netfilter/arptable_filter.c Fri Mar 15 04:12:06 2002
+++ edited/net/ipv4/netfilter/arptable_filter.c Tue Jan 14 18:59:51 2003
@@ -37,10 +37,10 @@
} initial_table __initdata
= { { "filter", FILTER_VALID_HOOKS, 3,
sizeof(struct arpt_standard) * 2 + sizeof(struct arpt_error),
- { [NF_ARP_IN] 0,
- [NF_ARP_OUT] sizeof(struct arpt_standard) },
- { [NF_ARP_IN] 0,
- [NF_ARP_OUT] sizeof(struct arpt_standard), },
+ { [NF_ARP_IN] = 0,
+ [NF_ARP_OUT] = sizeof(struct arpt_standard) },
+ { [NF_ARP_IN] = 0,
+ [NF_ARP_OUT] = sizeof(struct arpt_standard), },
0, NULL, { } },
{
/* ARP_IN */
===== net/ipv4/netfilter/ip_nat_ftp.c 1.6 vs edited =====
--- 1.6/net/ipv4/netfilter/ip_nat_ftp.c Mon Aug 19 13:51:30 2002
+++ edited/net/ipv4/netfilter/ip_nat_ftp.c Tue Jan 14 18:58:10 2003
@@ -160,10 +160,10 @@
unsigned int,
struct ip_conntrack *,
enum ip_conntrack_info)
-= { [IP_CT_FTP_PORT] mangle_rfc959_packet,
- [IP_CT_FTP_PASV] mangle_rfc959_packet,
- [IP_CT_FTP_EPRT] mangle_eprt_packet,
- [IP_CT_FTP_EPSV] mangle_epsv_packet
+= { [IP_CT_FTP_PORT] = mangle_rfc959_packet,
+ [IP_CT_FTP_PASV] = mangle_rfc959_packet,
+ [IP_CT_FTP_EPRT] = mangle_eprt_packet,
+ [IP_CT_FTP_EPSV] = mangle_epsv_packet
};
static int ftp_data_fixup(const struct ip_ct_ftp_expect *ct_ftp_info,
===== net/ipv4/netfilter/ip_nat_rule.c 1.5 vs edited =====
--- 1.5/net/ipv4/netfilter/ip_nat_rule.c Tue Mar 26 17:16:27 2002
+++ edited/net/ipv4/netfilter/ip_nat_rule.c Tue Jan 14 18:57:32 2003
@@ -56,12 +56,12 @@
} nat_initial_table __initdata
= { { "nat", NAT_VALID_HOOKS, 4,
sizeof(struct ipt_standard) * 3 + sizeof(struct ipt_error),
- { [NF_IP_PRE_ROUTING] 0,
- [NF_IP_POST_ROUTING] sizeof(struct ipt_standard),
- [NF_IP_LOCAL_OUT] sizeof(struct ipt_standard) * 2 },
- { [NF_IP_PRE_ROUTING] 0,
- [NF_IP_POST_ROUTING] sizeof(struct ipt_standard),
- [NF_IP_LOCAL_OUT] sizeof(struct ipt_standard) * 2 },
+ { [NF_IP_PRE_ROUTING] = 0,
+ [NF_IP_POST_ROUTING] = sizeof(struct ipt_standard),
+ [NF_IP_LOCAL_OUT] = sizeof(struct ipt_standard) * 2 },
+ { [NF_IP_PRE_ROUTING] = 0,
+ [NF_IP_POST_ROUTING] = sizeof(struct ipt_standard),
+ [NF_IP_LOCAL_OUT] = sizeof(struct ipt_standard) * 2 },
0, NULL, { } },
{
/* PRE_ROUTING */
===== net/ipv4/netfilter/iptable_filter.c 1.3 vs edited =====
--- 1.3/net/ipv4/netfilter/iptable_filter.c Tue Feb 5 09:24:40 2002
+++ edited/net/ipv4/netfilter/iptable_filter.c Tue Jan 14 18:58:45 2003
@@ -35,12 +35,12 @@
} initial_table __initdata
= { { "filter", FILTER_VALID_HOOKS, 4,
sizeof(struct ipt_standard) * 3 + sizeof(struct ipt_error),
- { [NF_IP_LOCAL_IN] 0,
- [NF_IP_FORWARD] sizeof(struct ipt_standard),
- [NF_IP_LOCAL_OUT] sizeof(struct ipt_standard) * 2 },
- { [NF_IP_LOCAL_IN] 0,
- [NF_IP_FORWARD] sizeof(struct ipt_standard),
- [NF_IP_LOCAL_OUT] sizeof(struct ipt_standard) * 2 },
+ { [NF_IP_LOCAL_IN] = 0,
+ [NF_IP_FORWARD] = sizeof(struct ipt_standard),
+ [NF_IP_LOCAL_OUT] = sizeof(struct ipt_standard) * 2 },
+ { [NF_IP_LOCAL_IN] = 0,
+ [NF_IP_FORWARD] = sizeof(struct ipt_standard),
+ [NF_IP_LOCAL_OUT] = sizeof(struct ipt_standard) * 2 },
0, NULL, { } },
{
/* LOCAL_IN */
===== net/ipv4/netfilter/iptable_mangle.c 1.7 vs edited =====
--- 1.7/net/ipv4/netfilter/iptable_mangle.c Mon Feb 11 01:21:45 2002
+++ edited/net/ipv4/netfilter/iptable_mangle.c Tue Jan 14 18:59:23 2003
@@ -48,16 +48,16 @@
} initial_table __initdata
= { { "mangle", MANGLE_VALID_HOOKS, 6,
sizeof(struct ipt_standard) * 5 + sizeof(struct ipt_error),
- { [NF_IP_PRE_ROUTING] 0,
- [NF_IP_LOCAL_IN] sizeof(struct ipt_standard),
- [NF_IP_FORWARD] sizeof(struct ipt_standard) * 2,
- [NF_IP_LOCAL_OUT] sizeof(struct ipt_standard) * 3,
- [NF_IP_POST_ROUTING] sizeof(struct ipt_standard) * 4 },
- { [NF_IP_PRE_ROUTING] 0,
- [NF_IP_LOCAL_IN] sizeof(struct ipt_standard),
- [NF_IP_FORWARD] sizeof(struct ipt_standard) * 2,
- [NF_IP_LOCAL_OUT] sizeof(struct ipt_standard) * 3,
- [NF_IP_POST_ROUTING] sizeof(struct ipt_standard) * 4 },
+ { [NF_IP_PRE_ROUTING] = 0,
+ [NF_IP_LOCAL_IN] = sizeof(struct ipt_standard),
+ [NF_IP_FORWARD] = sizeof(struct ipt_standard) * 2,
+ [NF_IP_LOCAL_OUT] = sizeof(struct ipt_standard) * 3,
+ [NF_IP_POST_ROUTING] = sizeof(struct ipt_standard) * 4 },
+ { [NF_IP_PRE_ROUTING] = 0,
+ [NF_IP_LOCAL_IN] = sizeof(struct ipt_standard),
+ [NF_IP_FORWARD] = sizeof(struct ipt_standard) * 2,
+ [NF_IP_LOCAL_OUT] = sizeof(struct ipt_standard) * 3,
+ [NF_IP_POST_ROUTING] = sizeof(struct ipt_standard) * 4 },
0, NULL, { } },
{
/* PRE_ROUTING */
--
They that can give up essential liberty to obtain a little temporary safety
deserve neither liberty nor safety.
-- Benjamin Franklin, Historical Review of Pennsylvania, 1759
-
: send the line "unsubscribe linux-net" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
