Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27059746 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6

parents 263fb5b1 7c9989a7

net/netfilter/ipvs/ip_vs_proto_sctp.c

+1 −1
Original line number Diff line number Diff line
@@ -1101,7 +1101,7 @@ static void __ip_vs_sctp_init(struct net *net, struct ip_vs_proto_data *pd) 
	struct netns_ipvs *ipvs = net_ipvs(net);



	ip_vs_init_hash_table(ipvs->sctp_apps, SCTP_APP_TAB_SIZE);

	spin_lock_init(&ipvs->tcp_app_lock);

	spin_lock_init(&ipvs->sctp_app_lock);

	pd->timeout_table = ip_vs_create_timeout_table((int *)sctp_timeouts,

							sizeof(sctp_timeouts));

}

net/netfilter/ipvs/ip_vs_sync.c

+1 −1
Original line number Diff line number Diff line
@@ -392,7 +392,7 @@ void ip_vs_sync_switch_mode(struct net *net, int mode) 
{

	struct netns_ipvs *ipvs = net_ipvs(net);



	if (!ipvs->sync_state & IP_VS_STATE_MASTER)

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

		return;

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

		return;