---

yaml --- r: 236654 b: refs/heads/master c: 2f1e317 h: refs/heads/master v: v3
git-mirror · Jan 20, 2011 · 9da955b · 9da955b
1 parent 0bd0407
commit 9da955b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git 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
@@ -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 */