[XFRM]: xfrm_alloc_spi() annotated
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
737b5761df
commit
26977b4ed7
|
@ -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);
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in a new issue