diff options
author | Simon Horman <horms@verge.net.au> | 2011-02-04 04:33:01 -0500 |
---|---|---|
committer | Simon Horman <horms@verge.net.au> | 2011-03-14 20:36:57 -0400 |
commit | 7532e8d40ccfdde6667169eeac4fd7778d6eb462 (patch) | |
tree | 11e85b08746b3b714e8d0a0222639444681de951 /net/netfilter | |
parent | 59e0350eada0516a810cb780db37746165f1d516 (diff) |
IPVS: Add sysctl_sync_ver()
In preparation for not including sysctl_sync_ver in
struct netns_ipvs when CONFIG_SYCTL is not defined.
Signed-off-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'net/netfilter')
-rw-r--r-- | net/netfilter/ipvs/ip_vs_sync.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c index e84987fa1bf8..3e7961e85e9c 100644 --- a/net/netfilter/ipvs/ip_vs_sync.c +++ b/net/netfilter/ipvs/ip_vs_sync.c | |||
@@ -394,7 +394,7 @@ void ip_vs_sync_switch_mode(struct net *net, int mode) | |||
394 | 394 | ||
395 | if (!(ipvs->sync_state & IP_VS_STATE_MASTER)) | 395 | if (!(ipvs->sync_state & IP_VS_STATE_MASTER)) |
396 | return; | 396 | return; |
397 | if (mode == ipvs->sysctl_sync_ver || !ipvs->sync_buff) | 397 | if (mode == sysctl_sync_ver(ipvs) || !ipvs->sync_buff) |
398 | return; | 398 | return; |
399 | 399 | ||
400 | spin_lock_bh(&ipvs->sync_buff_lock); | 400 | spin_lock_bh(&ipvs->sync_buff_lock); |
@@ -521,7 +521,7 @@ void ip_vs_sync_conn(struct net *net, struct ip_vs_conn *cp) | |||
521 | unsigned int len, pe_name_len, pad; | 521 | unsigned int len, pe_name_len, pad; |
522 | 522 | ||
523 | /* Handle old version of the protocol */ | 523 | /* Handle old version of the protocol */ |
524 | if (ipvs->sysctl_sync_ver == 0) { | 524 | if (sysctl_sync_ver(ipvs) == 0) { |
525 | ip_vs_sync_conn_v0(net, cp); | 525 | ip_vs_sync_conn_v0(net, cp); |
526 | return; | 526 | return; |
527 | } | 527 | } |