diff options
author | Eric W. Biederman | 2015-09-21 20:02:11 +0200 |
---|---|---|
committer | Simon Horman | 2015-09-24 02:34:37 +0200 |
commit | b3cf3cbfb57c273cf9f88230416fcc5b97287862 (patch) | |
tree | 6296cb7325d05ac91e29b5d4e3045d13bf4e0ff6 /net/netfilter/ipvs/ip_vs_ctl.c | |
parent | ipvs: Pass ipvs not net to start_sync_thread (diff) | |
download | kernel-qcow2-linux-b3cf3cbfb57c273cf9f88230416fcc5b97287862.tar.gz kernel-qcow2-linux-b3cf3cbfb57c273cf9f88230416fcc5b97287862.tar.xz kernel-qcow2-linux-b3cf3cbfb57c273cf9f88230416fcc5b97287862.zip |
ipvs: Pass ipvs not net to stop_sync_thread
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'net/netfilter/ipvs/ip_vs_ctl.c')
-rw-r--r-- | net/netfilter/ipvs/ip_vs_ctl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c index b63b4c186040..dba75ec2ed53 100644 --- a/net/netfilter/ipvs/ip_vs_ctl.c +++ b/net/netfilter/ipvs/ip_vs_ctl.c @@ -2355,7 +2355,7 @@ do_ip_vs_set_ctl(struct sock *sk, int cmd, void __user *user, unsigned int len) rtnl_unlock(); } else { mutex_lock(&ipvs->sync_mutex); - ret = stop_sync_thread(net, dm->state); + ret = stop_sync_thread(ipvs, dm->state); mutex_unlock(&ipvs->sync_mutex); } goto out_dec; @@ -3447,7 +3447,7 @@ static int ip_vs_genl_del_daemon(struct netns_ipvs *ipvs, struct nlattr **attrs) return -EINVAL; mutex_lock(&ipvs->sync_mutex); - ret = stop_sync_thread(ipvs->net, + ret = stop_sync_thread(ipvs, nla_get_u32(attrs[IPVS_DAEMON_ATTR_STATE])); mutex_unlock(&ipvs->sync_mutex); return ret; |