diff -urN RC14-rc3-git4-sata_sil/net/ipv4/netfilter/ip_conntrack_core.c RC14-rc3-git4-net-noise/net/ipv4/netfilter/ip_conntrack_core.c
--- RC14-rc3-git4-sata_sil/net/ipv4/netfilter/ip_conntrack_core.c	2005-09-26 00:19:12.000000000 -0400
+++ RC14-rc3-git4-net-noise/net/ipv4/netfilter/ip_conntrack_core.c	2005-10-04 15:14:27.000000000 -0400
@@ -1348,7 +1348,7 @@
 				     * ip_conntrack_htable_size));
 }
 
-void ip_conntrack_flush()
+void ip_conntrack_flush(void)
 {
 	/* This makes sure all current packets have passed through
            netfilter framework.  Roll on, two-stage module
diff -urN RC14-rc3-git4-sata_sil/net/ipv6/ipv6_sockglue.c RC14-rc3-git4-net-noise/net/ipv6/ipv6_sockglue.c
--- RC14-rc3-git4-sata_sil/net/ipv6/ipv6_sockglue.c	2005-09-10 15:41:35.000000000 -0400
+++ RC14-rc3-git4-net-noise/net/ipv6/ipv6_sockglue.c	2005-10-04 15:14:27.000000000 -0400
@@ -288,7 +288,7 @@
 	{
 		struct ipv6_txoptions *opt;
 		if (optlen == 0)
-			optval = 0;
+			optval = NULL;
 
 		/* hop-by-hop / destination options are privileged option */
 		retv = -EPERM;