aboutsummaryrefslogtreecommitdiffstats
path: root/net/xfrm
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2006-03-20 22:18:37 -0500
committerDavid S. Miller <davem@davemloft.net>2006-03-20 22:18:37 -0500
commitee857a7d672859cf4eb735d32bce22c8b7ad0bd2 (patch)
tree4a6274454ed4af42fb2806151d14280f778f2281 /net/xfrm
parent0ac8475248164553ffe21948c7b1a4b9d2a935dc (diff)
[XFRM]: Move xfrm_nl to xfrm_state.c from xfrm_user.c
xfrm_user could be modular, and since generic code uses this symbol now... Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/xfrm')
-rw-r--r--net/xfrm/xfrm_state.c3
-rw-r--r--net/xfrm/xfrm_user.c3
2 files changed, 3 insertions, 3 deletions
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c
index cd1d5e11ee74..037bc8e4d667 100644
--- a/net/xfrm/xfrm_state.c
+++ b/net/xfrm/xfrm_state.c
@@ -20,6 +20,9 @@
20#include <linux/module.h> 20#include <linux/module.h>
21#include <asm/uaccess.h> 21#include <asm/uaccess.h>
22 22
23struct sock *xfrm_nl;
24EXPORT_SYMBOL(xfrm_nl);
25
23u32 sysctl_xfrm_aevent_etime = XFRM_AE_ETIME; 26u32 sysctl_xfrm_aevent_etime = XFRM_AE_ETIME;
24u32 sysctl_xfrm_aevent_rseqth = XFRM_AE_SEQT_SIZE; 27u32 sysctl_xfrm_aevent_rseqth = XFRM_AE_SEQT_SIZE;
25/* Each xfrm_state may be linked to two tables: 28/* Each xfrm_state may be linked to two tables:
diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c
index b46ee7d4dae7..07b71680cde0 100644
--- a/net/xfrm/xfrm_user.c
+++ b/net/xfrm/xfrm_user.c
@@ -28,8 +28,6 @@
28#include <net/netlink.h> 28#include <net/netlink.h>
29#include <asm/uaccess.h> 29#include <asm/uaccess.h>
30 30
31struct sock *xfrm_nl;
32
33static int verify_one_alg(struct rtattr **xfrma, enum xfrm_attr_type_t type) 31static int verify_one_alg(struct rtattr **xfrma, enum xfrm_attr_type_t type)
34{ 32{
35 struct rtattr *rt = xfrma[type - 1]; 33 struct rtattr *rt = xfrma[type - 1];
@@ -1974,5 +1972,4 @@ module_init(xfrm_user_init);
1974module_exit(xfrm_user_exit); 1972module_exit(xfrm_user_exit);
1975MODULE_LICENSE("GPL"); 1973MODULE_LICENSE("GPL");
1976MODULE_ALIAS_NET_PF_PROTO(PF_NETLINK, NETLINK_XFRM); 1974MODULE_ALIAS_NET_PF_PROTO(PF_NETLINK, NETLINK_XFRM);
1977EXPORT_SYMBOL(xfrm_nl);
1978 1975