diff options
| author |   Eric W. Biederman <ebiederm@xmission.com> | 2015-09-21 13:02:32 -0500 |
|---|---|---|
| committer |   Simon Horman <horms@verge.net.au> | 2015-09-24 09:34:40 +0900 |
| commit | 9f8128a56ef241753ea038e92948fe13beacf59f (patch) | |
| tree | 34d50faddeaf3a206a2dc06d672ad77201148fde /include/net/ip_vs.h | |
| parent | ipvs: Pass ipvs not net to register_ip_vs_app_inc (diff) | |
| download | linux-dev-9f8128a56ef241753ea038e92948fe13beacf59f.tar.xz linux-dev-9f8128a56ef241753ea038e92948fe13beacf59f.zip | |
ipvs: Pass ipvs not net to register_ip_vs_app and unregister_ip_vs_app
Also move the tests for net_ipvs being NULL into __ip_vs_ftp_init
and __ip_vs_ftp_exit. The only places where they possibly make
sense.
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>
Diffstat (limited to 'include/net/ip_vs.h')
| -rw-r--r-- | include/net/ip_vs.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h index c06bad39958d..5caafed5af2e 100644 --- a/include/net/ip_vs.h +++ b/include/net/ip_vs.h @@ -1341,8 +1341,8 @@ void ip_vs_service_net_cleanup(struct netns_ipvs *ipvs); * (from ip_vs_app.c) */ #define IP_VS_APP_MAX_PORTS 8 -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); +struct ip_vs_app *register_ip_vs_app(struct netns_ipvs *ipvs, struct ip_vs_app *app); +void unregister_ip_vs_app(struct netns_ipvs *ipvs, 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 netns_ipvs *ipvs, struct ip_vs_app *app, __u16 proto, |