diff options
author | Julian Anastasov <ja@ssi.bg> | 2011-03-04 05:18:07 -0500 |
---|---|---|
committer | Simon Horman <horms@verge.net.au> | 2011-03-14 20:36:50 -0400 |
commit | 2553d064ff4bf999f369c8c3dfacaa797dbef1d9 (patch) | |
tree | 2c83d5dd203f252d5e00d2b0ff643478c465f3dc /include/net/net_namespace.h | |
parent | 06b69390a652bfe4fa7e18e27c938e75ffe86ba0 (diff) |
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.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h index b3b4a34cb2cc..3ae491932bc8 100644 --- a/include/net/net_namespace.h +++ b/include/net/net_namespace.h | |||
@@ -20,7 +20,6 @@ | |||
20 | #include <net/netns/conntrack.h> | 20 | #include <net/netns/conntrack.h> |
21 | #endif | 21 | #endif |
22 | #include <net/netns/xfrm.h> | 22 | #include <net/netns/xfrm.h> |
23 | #include <net/netns/ip_vs.h> | ||
24 | 23 | ||
25 | struct proc_dir_entry; | 24 | struct proc_dir_entry; |
26 | struct net_device; | 25 | struct net_device; |
@@ -28,6 +27,7 @@ struct sock; | |||
28 | struct ctl_table_header; | 27 | struct ctl_table_header; |
29 | struct net_generic; | 28 | struct net_generic; |
30 | struct sock; | 29 | struct sock; |
30 | struct netns_ipvs; | ||
31 | 31 | ||
32 | 32 | ||
33 | #define NETDEV_HASHBITS 8 | 33 | #define NETDEV_HASHBITS 8 |