Commit df04ffb7 authored by Eric W. Biederman's avatar Eric W. Biederman Committed by Simon Horman
Browse files

ipvs: Pass ipvs not net to ip_vs_genl_del_daemon 



Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: default avatarJulian Anastasov <ja@ssi.bg>
Signed-off-by: default avatarSimon Horman <horms@verge.net.au>
parent d8443c5f

net/netfilter/ipvs/ip_vs_ctl.c

+3 −4
Original line number Diff line number Diff line
@@ -3439,16 +3439,15 @@ static int ip_vs_genl_new_daemon(struct netns_ipvs *ipvs, struct nlattr **attrs) 
	return ret;

}



static int ip_vs_genl_del_daemon(struct net *net, struct nlattr **attrs)

static int ip_vs_genl_del_daemon(struct netns_ipvs *ipvs, struct nlattr **attrs)

{

	struct netns_ipvs *ipvs = net_ipvs(net);

	int ret;



	if (!attrs[IPVS_DAEMON_ATTR_STATE])

		return -EINVAL;



	mutex_lock(&ipvs->sync_mutex);

	ret = stop_sync_thread(net,

	ret = stop_sync_thread(ipvs->net,

			       nla_get_u32(attrs[IPVS_DAEMON_ATTR_STATE]));

	mutex_unlock(&ipvs->sync_mutex);

	return ret;
@@ -3496,7 +3495,7 @@ static int ip_vs_genl_set_daemon(struct sk_buff *skb, struct genl_info *info) 
		if (cmd == IPVS_CMD_NEW_DAEMON)

			ret = ip_vs_genl_new_daemon(ipvs, daemon_attrs);

		else

			ret = ip_vs_genl_del_daemon(net, daemon_attrs);

			ret = ip_vs_genl_del_daemon(ipvs, daemon_attrs);

	}



out: