aboutsummaryrefslogtreecommitdiffstats
path: root/net/netfilter/ipvs/ip_vs_est.c
diff options
context:
space:
mode:
authorHans Schillstrom <hans.schillstrom@ericsson.com>2011-01-03 14:45:03 +0100
committerSimon Horman <horms@verge.net.au>2011-01-13 10:30:29 +0900
commitc6d2d445d8dee04cde47eb4021636399a4239e9f (patch)
tree3f1aa27ea7e60ed97d3039b02c6a08e68425a186 /net/netfilter/ipvs/ip_vs_est.c
parentIPVS: netns, misc init_net removal in core. (diff)
downloadlinux-dev-c6d2d445d8dee04cde47eb4021636399a4239e9f.tar.xz
linux-dev-c6d2d445d8dee04cde47eb4021636399a4239e9f.zip
IPVS: netns, final patch enabling network name space.
all init_net removed, (except for some alloc related that needs to be there) 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 'net/netfilter/ipvs/ip_vs_est.c')
-rw-r--r--net/netfilter/ipvs/ip_vs_est.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/net/netfilter/ipvs/ip_vs_est.c b/net/netfilter/ipvs/ip_vs_est.c
index d13616b138cd..f560a05c965a 100644
--- a/net/netfilter/ipvs/ip_vs_est.c
+++ b/net/netfilter/ipvs/ip_vs_est.c
@@ -203,9 +203,6 @@ static int __net_init __ip_vs_estimator_init(struct net *net)
{
struct netns_ipvs *ipvs = net_ipvs(net);
- if (!net_eq(net, &init_net)) /* netns not enabled yet */
- return -EPERM;
-
INIT_LIST_HEAD(&ipvs->est_list);
spin_lock_init(&ipvs->est_lock);
setup_timer(&ipvs->est_timer, estimation_timer, (unsigned long)net);