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

Commit 26977b4e authored by Al Viro's avatar Al Viro Committed by David S. Miller
Browse files

[XFRM]: xfrm_alloc_spi() annotated 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 737b5761

include/net/xfrm.h

+1 −1
Original line number Diff line number Diff line
@@ -989,7 +989,7 @@ struct xfrm_policy *xfrm_policy_bysel_ctx(u8 type, int dir, 
struct xfrm_policy *xfrm_policy_byid(u8, int dir, u32 id, int delete);

void xfrm_policy_flush(u8 type);

u32 xfrm_get_acqseq(void);

void xfrm_alloc_spi(struct xfrm_state *x, u32 minspi, u32 maxspi);

void xfrm_alloc_spi(struct xfrm_state *x, __be32 minspi, __be32 maxspi);

struct xfrm_state * xfrm_find_acq(u8 mode, u32 reqid, u8 proto, 

				  xfrm_address_t *daddr, xfrm_address_t *saddr, 

				  int create, unsigned short family);

net/xfrm/xfrm_state.c

+5 −5
Original line number Diff line number Diff line
@@ -1040,7 +1040,7 @@ u32 xfrm_get_acqseq(void) 
EXPORT_SYMBOL(xfrm_get_acqseq);



void

xfrm_alloc_spi(struct xfrm_state *x, u32 minspi, u32 maxspi)

xfrm_alloc_spi(struct xfrm_state *x, __be32 minspi, __be32 maxspi)

{

	unsigned int h;

	struct xfrm_state *x0;
@@ -1057,10 +1057,10 @@ xfrm_alloc_spi(struct xfrm_state *x, u32 minspi, u32 maxspi) 
		x->id.spi = minspi;

	} else {

		u32 spi = 0;

		minspi = ntohl(minspi);

		maxspi = ntohl(maxspi);

		for (h=0; h<maxspi-minspi+1; h++) {

			spi = minspi + net_random()%(maxspi-minspi+1);

		u32 low = ntohl(minspi);

		u32 high = ntohl(maxspi);

		for (h=0; h<high-low+1; h++) {

			spi = low + net_random()%(high-low+1);

			x0 = xfrm_state_lookup(&x->id.daddr, htonl(spi), x->id.proto, x->props.family);

			if (x0 == NULL) {

				x->id.spi = htonl(spi);