Apologies

Signed-off-by: Nick Sillik <[EMAIL PROTECTED]>

David S. Miller wrote:
From: Nick Sillik <[EMAIL PROTECTED]>
Date: Wed, 27 Jul 2005 16:49:59 -0400


Sorry for the resend and previously bad subject line.

This fixes a single -Wundef error in the file
net/ipv4/netfilter/ip_conntrack_core.c ,


Please supply a proper Signed-off-by: line with your
patch.
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

diff -urN a/net/ipv4/netfilter/ip_conntrack_core.c 
b/net/ipv4/netfilter/ip_conntrack_core.c
--- a/net/ipv4/netfilter/ip_conntrack_core.c    2005-07-27 16:40:16.000000000 
-0400
+++ b/net/ipv4/netfilter/ip_conntrack_core.c    2005-07-27 16:41:00.000000000 
-0400
@@ -723,7 +723,7 @@
                /* Welcome, Mr. Bond.  We've been expecting you... */
                __set_bit(IPS_EXPECTED_BIT, &conntrack->status);
                conntrack->master = exp->master;
-#if CONFIG_IP_NF_CONNTRACK_MARK
+#ifdef CONFIG_IP_NF_CONNTRACK_MARK
                conntrack->mark = exp->master->mark;
 #endif
                nf_conntrack_get(&conntrack->master->ct_general);

Reply via email to