Commit d8443c5f 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_new_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 34c2f514

net/netfilter/ipvs/ip_vs_ctl.c

+3 −4
Original line number Diff line number Diff line
@@ -3374,9 +3374,8 @@ static int ip_vs_genl_dump_daemons(struct sk_buff *skb, 
	return skb->len;

}



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

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

{

	struct netns_ipvs *ipvs = net_ipvs(net);

	struct ipvs_sync_daemon_cfg c;

	struct nlattr *a;

	int ret;
@@ -3433,7 +3432,7 @@ static int ip_vs_genl_new_daemon(struct net *net, struct nlattr **attrs) 


	rtnl_lock();

	mutex_lock(&ipvs->sync_mutex);

	ret = start_sync_thread(net, &c,

	ret = start_sync_thread(ipvs->net, &c,

				nla_get_u32(attrs[IPVS_DAEMON_ATTR_STATE]));

	mutex_unlock(&ipvs->sync_mutex);

	rtnl_unlock();
@@ -3495,7 +3494,7 @@ static int ip_vs_genl_set_daemon(struct sk_buff *skb, struct genl_info *info) 
			goto out;



		if (cmd == IPVS_CMD_NEW_DAEMON)

			ret = ip_vs_genl_new_daemon(net, daemon_attrs);

			ret = ip_vs_genl_new_daemon(ipvs, daemon_attrs);

		else

			ret = ip_vs_genl_del_daemon(net, daemon_attrs);

	}