Skip to contentSkip to conversation

net/ipv4/netfilter/ip_conntrack_core.c fix -Wundef error

PATCH In review Nick Sillik 2 participants 5 messages Jul 27, 2005

Subsystems (2)
Networking netfilter
lore
Share & tools
lore

Nick Sillik

author
#0 lore raw

PATCH 1/1 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]

net/ipv4/netfilter/ip_conntrack_core.c +1 -1
diff -urN a/net/ipv4/netfilter/ip_conntrack_core.c b/net/ipv4/netfilter/ip_conntrack_core.c
@@ -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);
maintainer
#1 lore raw

From: Nick Sillik <[email protected]>
Date: Wed, 27 Jul 2005 16:49:59 -0400

Quoted 4 lines

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.

author
#2 lore raw

Apologies

Signed-off-by Nick Sillik <[email protected]>
Quoted 10 lines · David S. Miller

From: Nick Sillik <[email protected]>
Date: Wed, 27 Jul 2005 16:49:59 -0400

Quoted 4 lines

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 ,

Quoted 7 lines

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/

net/ipv4/netfilter/ip_conntrack_core.c +1 -1
diff -urN a/net/ipv4/netfilter/ip_conntrack_core.c b/net/ipv4/netfilter/ip_conntrack_core.c
@@ -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);
maintainer
#3 lore raw

From: Nick Sillik <[email protected]>
Date: Wed, 27 Jul 2005 17:38:31 -0400

Quoted 3 lines

Apologies

Signed-off-by Nick Sillik <[email protected]>

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