Commit a6337463 authored by jamal's avatar jamal Committed by David S. Miller
Browse files

xfrm: use proper kernel types 



kernel side should use uxx instead of __uxx types

Signed-off-by: default avatarJamal Hadi Salim <hadi@cyberus.ca>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent c28e9304

include/net/xfrm.h

+13 −13
Original line number Diff line number Diff line
@@ -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);