diff options
| author | Julian Anastasov <ja@ssi.bg> | 2012-07-12 22:06:20 +0200 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2012-08-10 03:34:51 +0200 |
| commit | be97fdb5fbcc828240c51769cd28cba609158703 (patch) | |
| tree | 512958698e5023506ef8728d0c5c1800ba2dba06 /include/net | |
| parent | ipvs: ip_vs_ftp depends on nf_conntrack_ftp helper (diff) | |
| download | linux-be97fdb5fbcc828240c51769cd28cba609158703.tar.xz linux-be97fdb5fbcc828240c51769cd28cba609158703.zip | |
ipvs: generalize app registration in netns
Get rid of the ftp_app pointer and allow applications
to be registered without adding fields in the netns_ipvs structure.
v2: fix coding style as suggested by Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/ip_vs.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h index 95374d1696a1..4b8f18ff4789 100644 --- a/include/net/ip_vs.h +++ b/include/net/ip_vs.h @@ -808,8 +808,6 @@ struct netns_ipvs { struct list_head rs_table[IP_VS_RTAB_SIZE]; /* ip_vs_app */ struct list_head app_list; - /* ip_vs_ftp */ - struct ip_vs_app *ftp_app; /* ip_vs_proto */ #define IP_VS_PROTO_TAB_SIZE 32 /* must be power of 2 */ struct ip_vs_proto_data *proto_data_table[IP_VS_PROTO_TAB_SIZE]; @@ -1179,7 +1177,8 @@ extern void ip_vs_service_net_cleanup(struct net *net); * (from ip_vs_app.c) */ #define IP_VS_APP_MAX_PORTS 8 -extern int register_ip_vs_app(struct net *net, struct ip_vs_app *app); +extern struct ip_vs_app *register_ip_vs_app(struct net *net, + struct ip_vs_app *app); extern void unregister_ip_vs_app(struct net *net, struct ip_vs_app *app); extern int ip_vs_bind_app(struct ip_vs_conn *cp, struct ip_vs_protocol *pp); extern void ip_vs_unbind_app(struct ip_vs_conn *cp); |