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

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

ipvs: Pass ipvs not net to register_ip_vs_app_inc 



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 a080ce38

include/net/ip_vs.h

+1 −1
Original line number Diff line number Diff line
@@ -1345,7 +1345,7 @@ struct ip_vs_app *register_ip_vs_app(struct net *net, struct ip_vs_app *app); 
void unregister_ip_vs_app(struct net *net, struct ip_vs_app *app);

int ip_vs_bind_app(struct ip_vs_conn *cp, struct ip_vs_protocol *pp);

void ip_vs_unbind_app(struct ip_vs_conn *cp);

int register_ip_vs_app_inc(struct net *net, struct ip_vs_app *app, __u16 proto,

int register_ip_vs_app_inc(struct netns_ipvs *ipvs, struct ip_vs_app *app, __u16 proto,

			   __u16 port);

int ip_vs_app_inc_get(struct ip_vs_app *inc);

void ip_vs_app_inc_put(struct ip_vs_app *inc);

net/netfilter/ipvs/ip_vs_app.c

+1 −2
Original line number Diff line number Diff line
@@ -176,10 +176,9 @@ void ip_vs_app_inc_put(struct ip_vs_app *inc) 
 *	Register an application incarnation in protocol applications

 */

int

register_ip_vs_app_inc(struct net *net, struct ip_vs_app *app, __u16 proto,

register_ip_vs_app_inc(struct netns_ipvs *ipvs, struct ip_vs_app *app, __u16 proto,

		       __u16 port)

{

	struct netns_ipvs *ipvs = net_ipvs(net);

	int result;



	mutex_lock(&__ip_vs_app_mutex);

net/netfilter/ipvs/ip_vs_ftp.c

+1 −1
Original line number Diff line number Diff line
@@ -454,7 +454,7 @@ static int __net_init __ip_vs_ftp_init(struct net *net) 
	for (i = 0; i < ports_count; i++) {

		if (!ports[i])

			continue;

		ret = register_ip_vs_app_inc(net, app, app->protocol, ports[i]);

		ret = register_ip_vs_app_inc(ipvs, app, app->protocol, ports[i]);

		if (ret)

			goto err_unreg;

		pr_info("%s: loaded support on port[%d] = %d\n",