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

2 files changed, 2 insertions, 2 deletions

diff --git a/net/netfilter/ipvs/ip_vs_proto_sctp.c b/net/netfilter/ipvs/ip_vs_proto_sctp.c
index fb2d04ac5d4e..b027ccc49f43 100644
--- a/net/netfilter/ipvs/ip_vs_proto_sctp.c
+++ b/net/netfilter/ipvs/ip_vs_proto_sctp.c
@@ -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));
 }
diff --git a/net/netfilter/ipvs/ip_vs_sync.c b/net/netfilter/ipvs/ip_vs_sync.c
index 2a2a8363ca16..d1b7298e5894 100644
--- a/net/netfilter/ipvs/ip_vs_sync.c
+++ b/net/netfilter/ipvs/ip_vs_sync.c
@@ -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;