OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

xfrm: use proper kernel types 

kernel side should use uxx instead of __uxx types

Signed-off-by: Jamal Hadi Salim <hadi@cyberus.ca>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
jamal 2010-02-09 13:21:17 +00:00 committed by David S. Miller
parent c28e93040b
commit a63374631e
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
include/net/xfrm.h
View File

@ -317,8 +317,8 @@ extern void xfrm_state_delete_tunnel(struct xfrm_state *x);
struct xfrm_type {
char *description;
struct module *owner;
__u8 proto;
__u8 flags;
u8 proto;
u8 flags;
#define XFRM_TYPE_NON_FRAGMENT 1
#define XFRM_TYPE_REPLAY_PROT 2
#define XFRM_TYPE_LOCAL_COADDR 4
@ -434,24 +434,24 @@ struct xfrm_tmpl {
unsigned short encap_family;
__u32 reqid;
u32 reqid;
/* Mode: transport, tunnel etc. */
__u8 mode;
u8 mode;
/* Sharing mode: unique, this session only, this user only etc. */
__u8 share;
u8 share;
/* May skip this transfomration if no SA is found */
__u8 optional;
u8 optional;
/* Skip aalgos/ealgos/calgos checks. */
__u8 allalgs;
u8 allalgs;
/* Bit mask of algos allowed for acquisition */
__u32 aalgos;
__u32 ealgos;
__u32 calgos;
u32 aalgos;
u32 ealgos;
u32 calgos;
};
#define XFRM_MAX_DEPTH 6
@ -770,7 +770,7 @@ static __inline__ int addr_match(void *token1, void *token2, int prefixlen)
int pdw;
int pbi;
pdw = prefixlen >> 5; /* num of whole __u32 in prefix */
pdw = prefixlen >> 5; /* num of whole u32 in prefix */
pbi = prefixlen & 0x1f; /* num of bits in incomplete u32 in prefix */
if (pdw)
@ -1259,7 +1259,7 @@ struct xfrm_algo_desc {
/* XFRM tunnel handlers. */
struct xfrm_tunnel {
int (*handler)(struct sk_buff *skb);
int (*err_handler)(struct sk_buff *skb, __u32 info);
int (*err_handler)(struct sk_buff *skb, u32 info);
struct xfrm_tunnel *next;
int priority;
@ -1500,7 +1500,7 @@ static inline int xfrm_addr_cmp(xfrm_address_t *a, xfrm_address_t *b,
switch (family) {
default:
case AF_INET:
return (__force __u32)a->a4 - (__force __u32)b->a4;
return (__force u32)a->a4 - (__force u32)b->a4;
case AF_INET6:
return ipv6_addr_cmp((struct in6_addr *)a,
(struct in6_addr *)b);