Merge branch 'pablo/nf-2.6-updates' of git://1984.lsi.us.es/net-2.6
This commit is contained in:
commit
9bbc052d5e
14 changed files with 280 additions and 162 deletions
|
|
@ -791,6 +791,7 @@ struct ip_vs_app {
|
|||
/* IPVS in network namespace */
|
||||
struct netns_ipvs {
|
||||
int gen; /* Generation */
|
||||
int enable; /* enable like nf_hooks do */
|
||||
/*
|
||||
* Hash table: for real service lookups
|
||||
*/
|
||||
|
|
@ -1089,6 +1090,22 @@ ip_vs_control_add(struct ip_vs_conn *cp, struct ip_vs_conn *ctl_cp)
|
|||
atomic_inc(&ctl_cp->n_control);
|
||||
}
|
||||
|
||||
/*
|
||||
* IPVS netns init & cleanup functions
|
||||
*/
|
||||
extern int __ip_vs_estimator_init(struct net *net);
|
||||
extern int __ip_vs_control_init(struct net *net);
|
||||
extern int __ip_vs_protocol_init(struct net *net);
|
||||
extern int __ip_vs_app_init(struct net *net);
|
||||
extern int __ip_vs_conn_init(struct net *net);
|
||||
extern int __ip_vs_sync_init(struct net *net);
|
||||
extern void __ip_vs_conn_cleanup(struct net *net);
|
||||
extern void __ip_vs_app_cleanup(struct net *net);
|
||||
extern void __ip_vs_protocol_cleanup(struct net *net);
|
||||
extern void __ip_vs_control_cleanup(struct net *net);
|
||||
extern void __ip_vs_estimator_cleanup(struct net *net);
|
||||
extern void __ip_vs_sync_cleanup(struct net *net);
|
||||
extern void __ip_vs_service_cleanup(struct net *net);
|
||||
|
||||
/*
|
||||
* IPVS application functions
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue