Browse Source

ipvs: Pass ipvs not net to ip_vs_genl_set_config

Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Acked-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>
Eric W. Biederman 10 years ago
parent
commit
cacd1e60f1
1 changed files with 2 additions and 3 deletions
  1. 2 3
      net/netfilter/ipvs/ip_vs_ctl.c

+ 2 - 3
net/netfilter/ipvs/ip_vs_ctl.c

@@ -3453,9 +3453,8 @@ static int ip_vs_genl_del_daemon(struct netns_ipvs *ipvs, struct nlattr **attrs)
 	return ret;
 	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;
 	struct ip_vs_timeout_user t;
 
 
 	__ip_vs_get_timeouts(ipvs, &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);
 		ret = ip_vs_flush(ipvs, false);
 		goto out;
 		goto out;
 	} else if (cmd == IPVS_CMD_SET_CONFIG) {
 	} 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;
 		goto out;
 	} else if (cmd == IPVS_CMD_ZERO &&
 	} else if (cmd == IPVS_CMD_ZERO &&
 		   !info->attrs[IPVS_CMD_ATTR_SERVICE]) {
 		   !info->attrs[IPVS_CMD_ATTR_SERVICE]) {