From: Simon Horman <horms@verge.net.au>
Date: Fri, 4 Feb 2011 09:33:02 +0000 (+0900)
Subject: IPVS: Conditional ip_vs_conntrack_enabled()
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=a4e2f5a700cb93448b2da0e158149d18dc5290ef;p=deliverable%2Flinux.git

IPVS: Conditional ip_vs_conntrack_enabled()

ip_vs_conntrack_enabled() becomes a noop when CONFIG_SYSCTL is undefined.

In preparation for not including sysctl_conntrack in
struct netns_ipvs when CONFIG_SYCTL is not defined.

Signed-off-by: Simon Horman <horms@verge.net.au>
---

diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h
index 77ebece7e68c..299aeb537899 100644
--- a/include/net/ip_vs.h
+++ b/include/net/ip_vs.h
@@ -1359,7 +1359,11 @@ static inline void ip_vs_notrack(struct sk_buff *skb)
  */
 static inline int ip_vs_conntrack_enabled(struct netns_ipvs *ipvs)
 {
+#ifdef CONFIG_SYSCTL
 	return ipvs->sysctl_conntrack;
+#else
+	return 0;
+#endif
 }
 
 extern void ip_vs_update_conntrack(struct sk_buff *skb, struct ip_vs_conn *cp,