Commit 7532e8d4 authored by Simon Horman's avatar Simon Horman
Browse files

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: default avatarSimon Horman <horms@verge.net.au>
parent 59e0350e

include/net/ip_vs.h

+11 −0
Original line number Diff line number Diff line
@@ -911,6 +911,7 @@ struct netns_ipvs { 


#define DEFAULT_SYNC_THRESHOLD	3

#define DEFAULT_SYNC_PERIOD	50

#define DEFAULT_SYNC_VER	1



#ifdef CONFIG_SYSCTL
@@ -924,6 +925,11 @@ static inline int sysctl_sync_period(struct netns_ipvs *ipvs) 
	return ipvs->sysctl_sync_threshold[1];

}



static inline int sysctl_sync_ver(struct netns_ipvs *ipvs)

{

	return ipvs->sysctl_sync_ver;

}



#else



static inline int sysctl_sync_threshold(struct netns_ipvs *ipvs)
@@ -936,6 +942,11 @@ static inline int sysctl_sync_period(struct netns_ipvs *ipvs) 
	return DEFAULT_SYNC_PERIOD;

}



static inline int sysctl_sync_ver(struct netns_ipvs *ipvs)

{

	return DEFAULT_SYNC_VER;

}



#endif



/*

net/netfilter/ipvs/ip_vs_sync.c

+2 −2
Original line number Diff line number Diff line
@@ -394,7 +394,7 @@ void ip_vs_sync_switch_mode(struct net *net, int mode) 


	if (!(ipvs->sync_state & IP_VS_STATE_MASTER))

		return;

	if (mode == ipvs->sysctl_sync_ver || !ipvs->sync_buff)

	if (mode == sysctl_sync_ver(ipvs) || !ipvs->sync_buff)

		return;



	spin_lock_bh(&ipvs->sync_buff_lock);
@@ -521,7 +521,7 @@ void ip_vs_sync_conn(struct net *net, struct ip_vs_conn *cp) 
	unsigned int len, pe_name_len, pad;



	/* Handle old version of the protocol */

	if (ipvs->sysctl_sync_ver == 0) {

	if (sysctl_sync_ver(ipvs) == 0) {

		ip_vs_sync_conn_v0(net, cp);

		return;

	}