redonkable/alistair23-linux
redonkable/alistair23-linux
1
0
Fork 0
Code Releases Activity

xfrm: Mark token args to addr_match() const.

Browse source 
Also, make it return a real bool.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2011-02-22 18:02:12 -08:00
parent 8f029de281
commit 1744a8fe09
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
include/net/xfrm.h
View file

@ -765,10 +765,11 @@ static inline void xfrm_state_hold(struct xfrm_state *x)
atomic_inc(&x->refcnt); atomic_inc(&x->refcnt);
} }
static __inline__ int addr_match(void *token1, void *token2, int prefixlen) static inline bool addr_match(const void *token1, const void *token2,
int prefixlen)
{ {
__be32 *a1 = token1; const __be32 *a1 = token1;
__be32 *a2 = token2; const __be32 *a2 = token2;
int pdw; int pdw;
int pbi; int pbi;
@ -777,7 +778,7 @@ static __inline__ int addr_match(void *token1, void *token2, int prefixlen)
if (pdw) if (pdw)
if (memcmp(a1, a2, pdw << 2)) if (memcmp(a1, a2, pdw << 2))
return 0; return false;
if (pbi) { if (pbi) {
__be32 mask; __be32 mask;
@ -785,10 +786,10 @@ static __inline__ int addr_match(void *token1, void *token2, int prefixlen)
mask = htonl((0xffffffff) << (32 - pbi)); mask = htonl((0xffffffff) << (32 - pbi));
if ((a1[pdw] ^ a2[pdw]) & mask) if ((a1[pdw] ^ a2[pdw]) & mask)
return 0; return false;
} }
return 1; return true;
} }
static __inline__ static __inline__