kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[IPSEC]: Make xfrm_lookup flags argument a bit-field

Browse source 
This patch introduces an enum for bits in the flags argument of xfrm_lookup.
This is so that we can cram more information into it later.

Since all current users use just the values 0 and 1, XFRM_LOOKUP_WAIT has
been added with the value 1 << 0 to represent the current meaning of flags.

The test in __xfrm_lookup has been changed accordingly.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Herbert Xu 2007-12-12 10:36:59 -08:00 committed by David S. Miller
parent 3f71c81ac3
commit 815f4e57e9
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/net/dst.h
View file

@ -265,6 +265,11 @@ static inline struct dst_entry *dst_check(struct dst_entry *dst, u32 cookie)
extern void dst_init(void); extern void dst_init(void);
/* Flags for xfrm_lookup flags argument. */
enum {
XFRM_LOOKUP_WAIT = 1 << 0,
};
struct flowi; struct flowi;
#ifndef CONFIG_XFRM #ifndef CONFIG_XFRM
static inline int xfrm_lookup(struct dst_entry **dst_p, struct flowi *fl, static inline int xfrm_lookup(struct dst_entry **dst_p, struct flowi *fl,

2
net/xfrm/xfrm_policy.c
View file

@ -1565,7 +1565,7 @@ restart:
xfrm_pol_put(policy); xfrm_pol_put(policy);
return -EREMOTE; return -EREMOTE;
} }
if (err == -EAGAIN && flags) { if (err == -EAGAIN && (flags & XFRM_LOOKUP_WAIT)) {
DECLARE_WAITQUEUE(wait, current); DECLARE_WAITQUEUE(wait, current);
add_wait_queue(&km_waitq, &wait); add_wait_queue(&km_waitq, &wait);