Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 83815dea authored by Herbert Xu's avatar Herbert Xu Committed by David S. Miller
Browse files

[IPSEC]: Move xfrm_state_check into xfrm_output.c 



The functions xfrm_state_check and xfrm_state_check_space are only used by
the output code in xfrm_output.c so we can move them over.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 406ef77c

include/net/xfrm.h

+0 −1
Original line number Diff line number Diff line
@@ -1013,7 +1013,6 @@ extern void xfrm_spd_getinfo(struct xfrmk_spdinfo *si); 
extern int xfrm_replay_check(struct xfrm_state *x, __be32 seq);

extern void xfrm_replay_advance(struct xfrm_state *x, __be32 seq);

extern void xfrm_replay_notify(struct xfrm_state *x, int event);

extern int xfrm_state_check(struct xfrm_state *x, struct sk_buff *skb);

extern int xfrm_state_mtu(struct xfrm_state *x, int mtu);

extern int xfrm_init_state(struct xfrm_state *x);

extern int xfrm_output(struct sk_buff *skb);

net/xfrm/xfrm_output.c

+22 −0
Original line number Diff line number Diff line
@@ -18,6 +18,28 @@ 
#include <net/dst.h>

#include <net/xfrm.h>



static int xfrm_state_check_space(struct xfrm_state *x, struct sk_buff *skb)

{

	int nhead = x->props.header_len + LL_RESERVED_SPACE(skb->dst->dev)

		- skb_headroom(skb);



	if (nhead > 0)

		return pskb_expand_head(skb, nhead, 0, GFP_ATOMIC);



	/* Check tail too... */

	return 0;

}



static int xfrm_state_check(struct xfrm_state *x, struct sk_buff *skb)

{

	int err = xfrm_state_check_expire(x);

	if (err < 0)

		goto err;

	err = xfrm_state_check_space(x, skb);

err:

	return err;

}



int xfrm_output(struct sk_buff *skb)

{

	struct dst_entry *dst = skb->dst;

net/xfrm/xfrm_state.c

+0 −23
Original line number Diff line number Diff line
@@ -1152,29 +1152,6 @@ int xfrm_state_check_expire(struct xfrm_state *x) 
}

EXPORT_SYMBOL(xfrm_state_check_expire);



static int xfrm_state_check_space(struct xfrm_state *x, struct sk_buff *skb)

{

	int nhead = x->props.header_len + LL_RESERVED_SPACE(skb->dst->dev)

		- skb_headroom(skb);



	if (nhead > 0)

		return pskb_expand_head(skb, nhead, 0, GFP_ATOMIC);



	/* Check tail too... */

	return 0;

}



int xfrm_state_check(struct xfrm_state *x, struct sk_buff *skb)

{

	int err = xfrm_state_check_expire(x);

	if (err < 0)

		goto err;

	err = xfrm_state_check_space(x, skb);

err:

	return err;

}

EXPORT_SYMBOL(xfrm_state_check);



struct xfrm_state *

xfrm_state_lookup(xfrm_address_t *daddr, __be32 spi, u8 proto,

		  unsigned short family)