diff options
author | Hans Schillstrom <hans.schillstrom@ericsson.com> | 2011-01-03 08:44:42 -0500 |
---|---|---|
committer | Simon Horman <horms@verge.net.au> | 2011-01-12 20:30:26 -0500 |
commit | 61b1ab4583e275af216c8454b9256de680499b19 (patch) | |
tree | 43e7cd6c71030c4d94c4e02dd34de77e57943a2d /include/net/ip_vs.h | |
parent | fee1cc0895fd7bde875a86bbc3a1e82089e540b8 (diff) |
IPVS: netns, add basic init per netns.
Preparation for network name-space init, in this stage
some empty functions exists.
In most files there is a check if it is root ns i.e. init_net
if (!net_eq(net, &init_net))
return ...
this will be removed by the last patch, when enabling name-space.
*v3
ip_vs_conn.c merge error corrected.
net_ipvs #ifdef removed as sugested by Jan Engelhardt
[ horms@verge.net.au: Removed whitespace-change-only hunks ]
Signed-off-by: Hans Schillstrom <hans.schillstrom@ericsson.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 | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h index d858264217ba..c1c2ece3ed94 100644 --- a/include/net/ip_vs.h +++ b/include/net/ip_vs.h | |||
@@ -28,6 +28,15 @@ | |||
28 | #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) | 28 | #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) |
29 | #include <net/netfilter/nf_conntrack.h> | 29 | #include <net/netfilter/nf_conntrack.h> |
30 | #endif | 30 | #endif |
31 | #include <net/net_namespace.h> /* Netw namespace */ | ||
32 | |||
33 | /* | ||
34 | * Generic access of ipvs struct | ||
35 | */ | ||
36 | static inline struct netns_ipvs *net_ipvs(struct net* net) | ||
37 | { | ||
38 | return net->ipvs; | ||
39 | } | ||
31 | 40 | ||
32 | /* Connections' size value needed by ip_vs_ctl.c */ | 41 | /* Connections' size value needed by ip_vs_ctl.c */ |
33 | extern int ip_vs_conn_tab_size; | 42 | extern int ip_vs_conn_tab_size; |
@@ -922,6 +931,8 @@ extern char ip_vs_backup_mcast_ifn[IP_VS_IFNAME_MAXLEN]; | |||
922 | extern int start_sync_thread(int state, char *mcast_ifn, __u8 syncid); | 931 | extern int start_sync_thread(int state, char *mcast_ifn, __u8 syncid); |
923 | extern int stop_sync_thread(int state); | 932 | extern int stop_sync_thread(int state); |
924 | extern void ip_vs_sync_conn(struct ip_vs_conn *cp); | 933 | extern void ip_vs_sync_conn(struct ip_vs_conn *cp); |
934 | extern int ip_vs_sync_init(void); | ||
935 | extern void ip_vs_sync_cleanup(void); | ||
925 | 936 | ||
926 | 937 | ||
927 | /* | 938 | /* |