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

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

[Nick Sillik]

[-- Attachment #1: Type: text/plain, Size: 190 bytes --]

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
n.sillik@temple.edu


[-- Attachment #2: ipconntrack_wundef.patch --]
[-- Type: text/plain, Size: 590 bytes --]

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

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

[David S. Miller]

From: Nick Sillik <n.sillik@temple.edu>
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.

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

[Nick Sillik]

[-- Attachment #1: Type: text/plain, Size: 647 bytes --]

Apologies

Signed-off-by: Nick Sillik <n.sillik@temple.edu>

David S. Miller wrote:
> From: Nick Sillik <n.sillik@temple.edu>
> 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 majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/


[-- Attachment #2: ipconntrack_wundef.patch --]
[-- Type: text/plain, Size: 589 bytes --]

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

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

[David S. Miller]

From: Nick Sillik <n.sillik@temple.edu>
Date: Wed, 27 Jul 2005 17:38:31 -0400

> Apologies
> 
> Signed-off-by: Nick Sillik <n.sillik@temple.edu>

I need it "with" the patch.

Please resend the patch and the signed-off-by line together to me
under seperate cover in private email so we don't have to spam
linux-kernel as we try to get this right :)

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

[David S. Miller]

I'm a butt head, sorry, you did include the patch with
the signed off line, ignore my patheticism in that other
reply :-)