diff options
author | Alexey Dobriyan <adobriyan@gmail.com> | 2008-11-25 20:14:31 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-11-25 20:14:31 -0500 |
commit | d62ddc21b674b5ac1466091ff3fbf7baa53bc92c (patch) | |
tree | 13e57abe023b5258b168e7f9108015a78493e481 /include/net | |
parent | c95839693d2a6612af7f75ad877012eba2f69757 (diff) |
netns xfrm: add netns boilerplate
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
-rw-r--r-- | include/net/net_namespace.h | 4 | ||||
-rw-r--r-- | include/net/netns/xfrm.h | 7 | ||||
-rw-r--r-- | include/net/xfrm.h | 3 |
3 files changed, 13 insertions, 1 deletions
diff --git a/include/net/net_namespace.h b/include/net/net_namespace.h index 319557789a40..6fc13d905c5f 100644 --- a/include/net/net_namespace.h +++ b/include/net/net_namespace.h | |||
@@ -19,6 +19,7 @@ | |||
19 | #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) | 19 | #if defined(CONFIG_NF_CONNTRACK) || defined(CONFIG_NF_CONNTRACK_MODULE) |
20 | #include <net/netns/conntrack.h> | 20 | #include <net/netns/conntrack.h> |
21 | #endif | 21 | #endif |
22 | #include <net/netns/xfrm.h> | ||
22 | 23 | ||
23 | struct proc_dir_entry; | 24 | struct proc_dir_entry; |
24 | struct net_device; | 25 | struct net_device; |
@@ -74,6 +75,9 @@ struct net { | |||
74 | struct netns_ct ct; | 75 | struct netns_ct ct; |
75 | #endif | 76 | #endif |
76 | #endif | 77 | #endif |
78 | #ifdef CONFIG_XFRM | ||
79 | struct netns_xfrm xfrm; | ||
80 | #endif | ||
77 | struct net_generic *gen; | 81 | struct net_generic *gen; |
78 | }; | 82 | }; |
79 | 83 | ||
diff --git a/include/net/netns/xfrm.h b/include/net/netns/xfrm.h new file mode 100644 index 000000000000..1cb0024a3b47 --- /dev/null +++ b/include/net/netns/xfrm.h | |||
@@ -0,0 +1,7 @@ | |||
1 | #ifndef __NETNS_XFRM_H | ||
2 | #define __NETNS_XFRM_H | ||
3 | |||
4 | struct netns_xfrm { | ||
5 | }; | ||
6 | |||
7 | #endif | ||
diff --git a/include/net/xfrm.h b/include/net/xfrm.h index 45e11b3631e4..9107d6f5c297 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h | |||
@@ -1269,7 +1269,8 @@ struct xfrm6_tunnel { | |||
1269 | 1269 | ||
1270 | extern void xfrm_init(void); | 1270 | extern void xfrm_init(void); |
1271 | extern void xfrm4_init(void); | 1271 | extern void xfrm4_init(void); |
1272 | extern void xfrm_state_init(void); | 1272 | extern int xfrm_state_init(struct net *net); |
1273 | extern void xfrm_state_fini(struct net *net); | ||
1273 | extern void xfrm4_state_init(void); | 1274 | extern void xfrm4_state_init(void); |
1274 | #ifdef CONFIG_XFRM | 1275 | #ifdef CONFIG_XFRM |
1275 | extern int xfrm6_init(void); | 1276 | extern int xfrm6_init(void); |