[PATCH 2.6.13-rc3-mm2]net/ipv4/netfilter/ip_conntrack_core.c fix -Wundef error

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 Apply

Nick Sillik
[email protected]

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);

---

• Follow-Ups:
  • Re: [PATCH 2.6.13-rc3-mm2]net/ipv4/netfilter/ip_conntrack_core.c fix -Wundef error
    • From: "David S. Miller" <[email protected]>

• Prev by Date: Re: [2.6 patch] mm/slab: unexport kmem_cache_alloc_node
• Next by Date: Re: [swsusp] encrypt suspend data for
• Previous by thread: x86-64 timing patch after 2.6.12-rc5 with 2 cpu above system
• Next by thread: Re: [PATCH 2.6.13-rc3-mm2]net/ipv4/netfilter/ip_conntrack_core.c fix -Wundef error
• Index(es):
  • Date
  • Thread

[Index of Archives]     [Kernel Newbies]     [Netfilter]     [Bugtraq]     [Photo]     [Gimp]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Video 4 Linux]     [Linux for the blind]