summaryrefslogtreecommitdiffstats
path: root/include/net/net_namespace.h
diff options
context:
space:
mode:
authorJulian Anastasov <ja@ssi.bg>2011-03-04 12:18:07 +0200
committerSimon Horman <horms@verge.net.au>2011-03-15 09:36:50 +0900
commit2553d064ff4bf999f369c8c3dfacaa797dbef1d9 (patch)
tree2c83d5dd203f252d5e00d2b0ff643478c465f3dc /include/net/net_namespace.h
parent06b69390a652bfe4fa7e18e27c938e75ffe86ba0 (diff)
downloadop-kernel-dev-2553d064ff4bf999f369c8c3dfacaa797dbef1d9.zip
op-kernel-dev-2553d064ff4bf999f369c8c3dfacaa797dbef1d9.tar.gz
ipvs: move struct netns_ipvs
Remove include/net/netns/ip_vs.h because it depends on structures from include/net/ip_vs.h. As ipvs is pointer in struct net it is better to move struct netns_ipvs into include/net/ip_vs.h, so that we can easily use other structures in struct netns_ipvs. Signed-off-by: Julian Anastasov <ja@ssi.bg> Signed-off-by: Simon Horman <horms@verge.net.au>
Diffstat (limited to 'include/net/net_namespace.h')
-rw-r--r--include/net/net_namespace.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h
index b3b4a34..3ae4919 100644
--- a/include/net/net_namespace.h
+++ b/include/net/net_namespace.h
@@ -20,7 +20,6 @@
#include <net/netns/conntrack.h>
#endif
#include <net/netns/xfrm.h>
-#include <net/netns/ip_vs.h>
struct proc_dir_entry;
struct net_device;
@@ -28,6 +27,7 @@ struct sock;
struct ctl_table_header;
struct net_generic;
struct sock;
+struct netns_ipvs;
#define NETDEV_HASHBITS 8
OpenPOWER on IntegriCloud