diff options
author | Simon Horman <horms@verge.net.au> | 2011-02-04 04:33:02 -0500 |
---|---|---|
committer | Simon Horman <horms@verge.net.au> | 2011-03-14 20:37:00 -0400 |
commit | a4e2f5a700cb93448b2da0e158149d18dc5290ef (patch) | |
tree | e0d2926c920a3ddab0e5687d1cfef457a09e2cd9 /include/net | |
parent | 3a1bbf1885e94ecedf1deaaab1ace8409330aa7e (diff) |
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>
Diffstat (limited to 'include/net')
-rw-r--r-- | include/net/ip_vs.h | 4 |
1 files changed, 4 insertions, 0 deletions
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) | |||
1359 | */ | 1359 | */ |
1360 | static inline int ip_vs_conntrack_enabled(struct netns_ipvs *ipvs) | 1360 | static inline int ip_vs_conntrack_enabled(struct netns_ipvs *ipvs) |
1361 | { | 1361 | { |
1362 | #ifdef CONFIG_SYSCTL | ||
1362 | return ipvs->sysctl_conntrack; | 1363 | return ipvs->sysctl_conntrack; |
1364 | #else | ||
1365 | return 0; | ||
1366 | #endif | ||
1363 | } | 1367 | } |
1364 | 1368 | ||
1365 | extern void ip_vs_update_conntrack(struct sk_buff *skb, struct ip_vs_conn *cp, | 1369 | extern void ip_vs_update_conntrack(struct sk_buff *skb, struct ip_vs_conn *cp, |