diff options
| author |   Hans Schillstrom <hans.schillstrom@ericsson.com> | 2011-01-03 14:44:54 +0100 |
|---|---|---|
| committer |   Simon Horman <horms@verge.net.au> | 2011-01-13 10:30:28 +0900 |
| commit | 29c2026fd4980c144d9c746dc1565060f08e5796 (patch) | |
| tree | 37373a66fac997e01c83e774c21e00dca713598a /include/net | |
| parent | IPVS: netns awareness to ip_vs_app (diff) | |
| download | linux-dev-29c2026fd4980c144d9c746dc1565060f08e5796.tar.xz linux-dev-29c2026fd4980c144d9c746dc1565060f08e5796.zip | |
IPVS: netns awareness to ip_vs_est
All variables moved to struct ipvs,
most external changes fixed (i.e. init_net removed)
*v3
timer per ns instead of a common timer in estimator.
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')
| -rw-r--r-- | include/net/ip_vs.h | 4 | ||||
| -rw-r--r-- | include/net/netns/ip_vs.h | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/include/net/ip_vs.h b/include/net/ip_vs.h index 0cdd8ce454c2..c08927bb1728 100644 --- a/include/net/ip_vs.h +++ b/include/net/ip_vs.h @@ -1004,8 +1004,8 @@ extern void ip_vs_sync_cleanup(void); */ extern int ip_vs_estimator_init(void); extern void ip_vs_estimator_cleanup(void); -extern void ip_vs_new_estimator(struct ip_vs_stats *stats); -extern void ip_vs_kill_estimator(struct ip_vs_stats *stats); +extern void ip_vs_new_estimator(struct net *net, struct ip_vs_stats *stats); +extern void ip_vs_kill_estimator(struct net *net, struct ip_vs_stats *stats); extern void ip_vs_zero_estimator(struct ip_vs_stats *stats); /* diff --git a/include/net/netns/ip_vs.h b/include/net/netns/ip_vs.h index 03f7fe1bede6..db0240198339 100644 --- a/include/net/netns/ip_vs.h +++ b/include/net/netns/ip_vs.h @@ -70,6 +70,10 @@ struct netns_ipvs { int sysctl_lblcr_expiration; struct ctl_table_header *lblcr_ctl_header; struct ctl_table *lblcr_ctl_table; + /* ip_vs_est */ + struct list_head est_list; /* estimator list */ + spinlock_t est_lock; + struct timer_list est_timer; /* Estimation timer */ }; #endif /* IP_VS_H_ */ |