This patch removes xfrm_export.c and moves the EXPORT_SYMBOL{,_GPL}'s to
the files where the actual functions are.
Signed-off-by: Adrian Bunk <[EMAIL PROTECTED]>
---
diffstat output:
net/xfrm/Makefile |3 -
net/xfrm/xfrm_algo.c | 12 +++
net/xfrm/xfrm_export.c | 62 -
net/xfrm/xfrm_input.c |4 ++
net/xfrm/xfrm_policy.c | 20 -
net/xfrm/xfrm_state.c | 29 +--
6 files changed, 63 insertions(+), 67 deletions(-)
--- linux-2.6.11-rc1-mm1-full/net/xfrm/Makefile.old 2005-01-19
09:43:09.0 +0100
+++ linux-2.6.11-rc1-mm1-full/net/xfrm/Makefile 2005-01-19 09:43:23.0
+0100
@@ -2,7 +2,6 @@
# Makefile for the XFRM subsystem.
#
-obj-$(CONFIG_XFRM) := xfrm_policy.o xfrm_state.o xfrm_input.o xfrm_algo.o \
- xfrm_export.o
+obj-$(CONFIG_XFRM) := xfrm_policy.o xfrm_state.o xfrm_input.o xfrm_algo.o
obj-$(CONFIG_XFRM_USER) += xfrm_user.o
--- linux-2.6.11-rc1-mm1-full/net/xfrm/xfrm_state.c.old 2005-01-19
09:44:46.0 +0100
+++ linux-2.6.11-rc1-mm1-full/net/xfrm/xfrm_state.c 2005-01-19
09:58:22.0 +0100
@@ -17,6 +17,7 @@
#include
#include
#include
+#include
#include
/* Each xfrm_state may be linked to two tables:
@@ -38,6 +39,7 @@
static struct list_head xfrm_state_byspi[XFRM_DST_HSIZE];
DECLARE_WAIT_QUEUE_HEAD(km_waitq);
+EXPORT_SYMBOL(km_waitq);
static DEFINE_RWLOCK(xfrm_state_afinfo_lock);
static struct xfrm_state_afinfo *xfrm_state_afinfo[NPROTO];
@@ -193,6 +195,7 @@
}
return x;
}
+EXPORT_SYMBOL(xfrm_state_alloc);
void __xfrm_state_destroy(struct xfrm_state *x)
{
@@ -203,6 +206,7 @@
spin_unlock_bh(&xfrm_state_gc_lock);
schedule_work(&xfrm_state_gc_work);
}
+EXPORT_SYMBOL(__xfrm_state_destroy);
static void __xfrm_state_delete(struct xfrm_state *x)
{
@@ -241,6 +245,7 @@
__xfrm_state_delete(x);
spin_unlock_bh(&x->lock);
}
+EXPORT_SYMBOL(xfrm_state_delete);
void xfrm_state_flush(u8 proto)
{
@@ -267,6 +272,7 @@
spin_unlock_bh(&xfrm_state_lock);
wake_up(&km_waitq);
}
+EXPORT_SYMBOL(xfrm_state_flush);
static int
xfrm_init_tempsel(struct xfrm_state *x, struct flowi *fl,
@@ -392,6 +398,7 @@
__xfrm_state_insert(x);
spin_unlock_bh(&xfrm_state_lock);
}
+EXPORT_SYMBOL(xfrm_state_insert);
static struct xfrm_state *__xfrm_find_acq_byseq(u32 seq);
@@ -444,6 +451,7 @@
return err;
}
+EXPORT_SYMBOL(xfrm_state_add);
int xfrm_state_update(struct xfrm_state *x)
{
@@ -508,6 +516,7 @@
return err;
}
+EXPORT_SYMBOL(xfrm_state_update);
int xfrm_state_check_expire(struct xfrm_state *x)
{
@@ -531,6 +540,7 @@
km_state_expired(x, 0);
return 0;
}
+EXPORT_SYMBOL(xfrm_state_check_expire);
static int xfrm_state_check_space(struct xfrm_state *x, struct sk_buff *skb)
{
@@ -553,6 +563,7 @@
err:
return err;
}
+EXPORT_SYMBOL(xfrm_state_check);
struct xfrm_state *
xfrm_state_lookup(xfrm_address_t *daddr, u32 spi, u8 proto,
@@ -569,6 +580,7 @@
xfrm_state_put_afinfo(afinfo);
return x;
}
+EXPORT_SYMBOL(xfrm_state_lookup);
struct xfrm_state *
xfrm_find_acq(u8 mode, u32 reqid, u8 proto,
@@ -586,6 +598,7 @@
xfrm_state_put_afinfo(afinfo);
return x;
}
+EXPORT_SYMBOL(xfrm_find_acq);
/* Silly enough, but I'm lazy to build resolution list */
@@ -614,7 +627,8 @@
spin_unlock_bh(&xfrm_state_lock);
return x;
}
-
+EXPORT_SYMBOL(xfrm_find_acq_byseq);
+
u32 xfrm_get_acqseq(void)
{
u32 res;
@@ -626,6 +640,7 @@
spin_unlock_bh(&acqseq_lock);
return res;
}
+EXPORT_SYMBOL(xfrm_get_acqseq);
void
xfrm_alloc_spi(struct xfrm_state *x, u32 minspi, u32 maxspi)
@@ -666,6 +681,7 @@
wake_up(&km_waitq);
}
}
+EXPORT_SYMBOL(xfrm_alloc_spi);
int xfrm_state_walk(u8 proto, int (*func)(struct xfrm_state *, int, void*),
void *data)
@@ -700,7 +716,7 @@
spin_unlock_bh(&xfrm_state_lock);
return err;
}
-
+EXPORT_SYMBOL(xfrm_state_walk);
int xfrm_replay_check(struct xfrm_state *x, u32 seq)
{
@@ -726,6 +742,7 @@
}
return 0;
}
+EXPORT_SYMBOL(xfrm_replay_check);
void xfrm_replay_advance(struct xfrm_state *x, u32 seq)
{
@@ -745,6 +762,7 @@
x->replay.bitmap |= (1U << diff);
}
}
+EXPORT_SYMBOL(xfrm_replay_advance);
static struct list_head xfrm_km_list = LIST_HEAD_INIT(xfrm_km_list);
static DEFINE_RWLOCK(xfrm_km_lock);
@@ -797,6 +815,7 @@
read_unlock(&xfrm_km_lock);
return err;
}
+EXPORT_SYMBOL(km_new_mapping);
void km_policy_expired(struct xfrm_policy *pol, int dir, int hard)
{
@@ -850,6 +869,7 @@
kfree(data);
return err;
}
+EXPORT_SYMBOL(xfrm_user_policy);
int xfrm_register_km(struct xfrm_mgr *km)
{
@@ -858,6 +878,7 @@
write_unlock_bh(&xfrm_km_lock);
return 0;
}
+EXPORT_SYMBOL(xfrm_register_km);
