From 9da955b87d43d40cba783bf4c03ad101542a4939 Mon Sep 17 00:00:00 2001
From: Patrick McHardy <kaber@trash.net>
Date: Thu, 20 Jan 2011 20:46:52 +0100
Subject: [PATCH] --- yaml --- r: 236654 b: refs/heads/master c:
 2f1e3176723d74ea2dd975e5be0ef6bb4fed2e2e h: refs/heads/master v: v3

---
 [refs]                                               |  2 +-
 trunk/include/net/netfilter/nf_conntrack_timestamp.h | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 82cd06d8d040..f1a6dbae6fc6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 06988b06935da7a210887e9d3f50f46f2faa4953
+refs/heads/master: 2f1e3176723d74ea2dd975e5be0ef6bb4fed2e2e
diff --git a/trunk/include/net/netfilter/nf_conntrack_timestamp.h b/trunk/include/net/netfilter/nf_conntrack_timestamp.h
index f17dcb664e29..fc9c82b1f06b 100644
--- a/trunk/include/net/netfilter/nf_conntrack_timestamp.h
+++ b/trunk/include/net/netfilter/nf_conntrack_timestamp.h
@@ -47,7 +47,19 @@ static inline void nf_ct_set_tstamp(struct net *net, bool enable)
 	net->ct.sysctl_tstamp = enable;
 }
 
+#ifdef CONFIG_NF_CONNTRACK_TIMESTAMP
 extern int nf_conntrack_tstamp_init(struct net *net);
 extern void nf_conntrack_tstamp_fini(struct net *net);
+#else
+static inline int nf_conntrack_tstamp_init(struct net *net)
+{
+	return 0;
+}
+
+static inline void nf_conntrack_tstamp_fini(struct net *net)
+{
+	return;
+}
+#endif /* CONFIG_NF_CONNTRACK_TIMESTAMP */
 
 #endif /* _NF_CONNTRACK_TSTAMP_H */