History

Merge branch 'pablo/nf-2.6-updates' of git://1984.lsi.us.es/net-2.6

David S. Miller committed 15 years ago

Commit 9bbc0522 parents 0d4420a 93bbce114 files · +279 −161Browse files

Showing the changes to include (1 of 14 files). Show all

Unified · Split

include/net/ip_vs.h+17−0
@@ -791,6 +791,7 @@ struct ip_vs_app { · 790 unmodified lines
791791 /* IPVS in network namespace */
792792 struct netns_ipvs {
793793 int gen; /* Generation */
794+ int enable; /* enable like nf_hooks do */
794795 /*
795796 * Hash table: for real service lookups
796797 */
@@ -1089,6 +1090,22 @@ ip_vs_control_add(struct ip_vs_conn *cp, struct ip_vs_conn *ctl_cp) · 292 unmodified lines
10891090 atomic_inc(&ctl_cp->n_control);
10901091 }
10911092
1093+/*
1094+ * IPVS netns init & cleanup functions
1095+ */
1096+extern int __ip_vs_estimator_init(struct net *net);
1097+extern int __ip_vs_control_init(struct net *net);
1098+extern int __ip_vs_protocol_init(struct net *net);
1099+extern int __ip_vs_app_init(struct net *net);
1100+extern int __ip_vs_conn_init(struct net *net);
1101+extern int __ip_vs_sync_init(struct net *net);
1102+extern void __ip_vs_conn_cleanup(struct net *net);
1103+extern void __ip_vs_app_cleanup(struct net *net);
1104+extern void __ip_vs_protocol_cleanup(struct net *net);
1105+extern void __ip_vs_control_cleanup(struct net *net);
1106+extern void __ip_vs_estimator_cleanup(struct net *net);
1107+extern void __ip_vs_sync_cleanup(struct net *net);
1108+extern void __ip_vs_service_cleanup(struct net *net);
10921109
10931110 /*
10941111 * IPVS application functions