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

Commit cacd1e60 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_set_config 



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 ebea1f7c

net/netfilter/ipvs/ip_vs_ctl.c

+2 −3
Original line number Diff line number Diff line
@@ -3453,9 +3453,8 @@ static int ip_vs_genl_del_daemon(struct netns_ipvs *ipvs, struct nlattr **attrs) 
	return ret;

}



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

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

{

	struct netns_ipvs *ipvs = net_ipvs(net);

	struct ip_vs_timeout_user t;



	__ip_vs_get_timeouts(ipvs, &t);
@@ -3522,7 +3521,7 @@ static int ip_vs_genl_set_cmd(struct sk_buff *skb, struct genl_info *info) 
		ret = ip_vs_flush(ipvs, false);

		goto out;

	} else if (cmd == IPVS_CMD_SET_CONFIG) {

		ret = ip_vs_genl_set_config(net, info->attrs);

		ret = ip_vs_genl_set_config(ipvs, info->attrs);

		goto out;

	} else if (cmd == IPVS_CMD_ZERO &&

		   !info->attrs[IPVS_CMD_ATTR_SERVICE]) {