From c86e3e1e87f4df570cb781041f42b7c13468cd29 Mon Sep 17 00:00:00 2001
From: Martin Josefsson <gandalf@wlug.westbo.se>
Date: Sat, 1 Apr 2006 02:23:21 -0800
Subject: [PATCH] --- yaml --- r: 25023 b: refs/heads/master c:
 bcd1e830a5ac37d708647d492a1436a8a9babb07 h: refs/heads/master i:   25021:
 05b095441c546ac4522d501197fd7f7484262f96   25019:
 29b126f8ba6db335f756b5838ea8db62b74a9734   25015:
 fb286488476e6bedb21506e0afca0bf4ce7ec8c1   25007:
 7e3ee42439e18e885499a56c238ac2634654dd1c   24991:
 a62f1db2e0b6ec5aba9ee3fa8d9faaad6021d0dc   24959:
 45705f4983bc0fc7155ad092428cb9e2157012a9 v: v3

---
 [refs]                                     | 2 +-
 trunk/net/netfilter/nf_conntrack_netlink.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index ce2dc8094838..1cc151f58d85 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a89ecb6a2ef732d04058d87801e2b6bd7e5c7089
+refs/heads/master: bcd1e830a5ac37d708647d492a1436a8a9babb07
diff --git a/trunk/net/netfilter/nf_conntrack_netlink.c b/trunk/net/netfilter/nf_conntrack_netlink.c
index 0e0e9d7b34c8..3138ae79fa21 100644
--- a/trunk/net/netfilter/nf_conntrack_netlink.c
+++ b/trunk/net/netfilter/nf_conntrack_netlink.c
@@ -1022,7 +1022,7 @@ ctnetlink_change_conntrack(struct nf_conn *ct, struct nfattr *cda[])
 			return err;
 	}
 
-#if defined(CONFIG_IP_NF_CONNTRACK_MARK)
+#if defined(CONFIG_NF_CONNTRACK_MARK)
 	if (cda[CTA_MARK-1])
 		ct->mark = ntohl(*(u_int32_t *)NFA_DATA(cda[CTA_MARK-1]));
 #endif
@@ -1062,7 +1062,7 @@ ctnetlink_create_conntrack(struct nfattr *cda[],
 			return err;
 	}
 
-#if defined(CONFIG_IP_NF_CONNTRACK_MARK)
+#if defined(CONFIG_NF_CONNTRACK_MARK)
 	if (cda[CTA_MARK-1])
 		ct->mark = ntohl(*(u_int32_t *)NFA_DATA(cda[CTA_MARK-1]));
 #endif