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

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

ipvs: Pass ipvs not net to ip_vs_zero_all 



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 56d2169b

net/netfilter/ipvs/ip_vs_ctl.c

+3 −4
Original line number Diff line number Diff line
@@ -1576,9 +1576,8 @@ static int ip_vs_zero_service(struct ip_vs_service *svc) 
	return 0;

}



static int ip_vs_zero_all(struct net *net)

static int ip_vs_zero_all(struct netns_ipvs *ipvs)

{

	struct netns_ipvs *ipvs = net_ipvs(net);

	int idx;

	struct ip_vs_service *svc;
@@ -2384,7 +2383,7 @@ do_ip_vs_set_ctl(struct sock *sk, int cmd, void __user *user, unsigned int len) 
	if (cmd == IP_VS_SO_SET_ZERO) {

		/* if no service address is set, zero counters in all */

		if (!usvc.fwmark && !usvc.addr.ip && !usvc.port) {

			ret = ip_vs_zero_all(net);

			ret = ip_vs_zero_all(ipvs);

			goto out_unlock;

		}

	}
@@ -3530,7 +3529,7 @@ static int ip_vs_genl_set_cmd(struct sk_buff *skb, struct genl_info *info) 
		goto out;

	} else if (cmd == IPVS_CMD_ZERO &&

		   !info->attrs[IPVS_CMD_ATTR_SERVICE]) {

		ret = ip_vs_zero_all(net);

		ret = ip_vs_zero_all(ipvs);

		goto out;

	}