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

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

ipvs: Pass ipvs not net to ip_vs_set_timeout 



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 18d6ade6

net/netfilter/ipvs/ip_vs_ctl.c

+4 −4
Original line number Diff line number Diff line
@@ -2202,10 +2202,9 @@ static const struct file_operations ip_vs_stats_percpu_fops = { 
/*

 *	Set timeout values for tcp tcpfin udp in the timeout_table.

 */

static int ip_vs_set_timeout(struct net *net, struct ip_vs_timeout_user *u)

static int ip_vs_set_timeout(struct netns_ipvs *ipvs, struct ip_vs_timeout_user *u)

{

#if defined(CONFIG_IP_VS_PROTO_TCP) || defined(CONFIG_IP_VS_PROTO_UDP)

	struct netns_ipvs *ipvs = net_ipvs(net);

	struct ip_vs_proto_data *pd;

#endif
@@ -2369,7 +2368,7 @@ do_ip_vs_set_ctl(struct sock *sk, int cmd, void __user *user, unsigned int len) 
		goto out_unlock;

	} else if (cmd == IP_VS_SO_SET_TIMEOUT) {

		/* Set timeout values for (tcp tcpfin udp) */

		ret = ip_vs_set_timeout(net, (struct ip_vs_timeout_user *)arg);

		ret = ip_vs_set_timeout(ipvs, (struct ip_vs_timeout_user *)arg);

		goto out_unlock;

	}
@@ -3461,6 +3460,7 @@ static int ip_vs_genl_del_daemon(struct net *net, struct nlattr **attrs) 


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

{

	struct netns_ipvs *ipvs = net_ipvs(net);

	struct ip_vs_timeout_user t;



	__ip_vs_get_timeouts(net, &t);
@@ -3475,7 +3475,7 @@ static int ip_vs_genl_set_config(struct net *net, struct nlattr **attrs) 
	if (attrs[IPVS_CMD_ATTR_TIMEOUT_UDP])

		t.udp_timeout = nla_get_u32(attrs[IPVS_CMD_ATTR_TIMEOUT_UDP]);



	return ip_vs_set_timeout(net, &t);

	return ip_vs_set_timeout(ipvs, &t);

}



static int ip_vs_genl_set_daemon(struct sk_buff *skb, struct genl_info *info)