projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] oom: don't kill current when another OOM in progress
[powerpc.git]
/
net
/
xfrm
/
xfrm_input.c
diff --git
a/net/xfrm/xfrm_input.c
b/net/xfrm/xfrm_input.c
index
dfc90bb
..
e8198a2
100644
(file)
--- a/
net/xfrm/xfrm_input.c
+++ b/
net/xfrm/xfrm_input.c
@@
-46,7
+46,7
@@
EXPORT_SYMBOL(secpath_dup);
/* Fetch spi and seq from ipsec header */
/* Fetch spi and seq from ipsec header */
-int xfrm_parse_spi(struct sk_buff *skb, u8 nexthdr,
u32 *spi, u
32 *seq)
+int xfrm_parse_spi(struct sk_buff *skb, u8 nexthdr,
__be32 *spi, __be
32 *seq)
{
int offset, offset_seq;
{
int offset, offset_seq;
@@
-62,7
+62,7
@@
int xfrm_parse_spi(struct sk_buff *skb, u8 nexthdr, u32 *spi, u32 *seq)
case IPPROTO_COMP:
if (!pskb_may_pull(skb, sizeof(struct ip_comp_hdr)))
return -EINVAL;
case IPPROTO_COMP:
if (!pskb_may_pull(skb, sizeof(struct ip_comp_hdr)))
return -EINVAL;
- *spi = htonl(ntohs(*(
u
16*)(skb->h.raw + 2)));
+ *spi = htonl(ntohs(*(
__be
16*)(skb->h.raw + 2)));
*seq = 0;
return 0;
default:
*seq = 0;
return 0;
default:
@@
-72,8
+72,8
@@
int xfrm_parse_spi(struct sk_buff *skb, u8 nexthdr, u32 *spi, u32 *seq)
if (!pskb_may_pull(skb, 16))
return -EINVAL;
if (!pskb_may_pull(skb, 16))
return -EINVAL;
- *spi = *(
u
32*)(skb->h.raw + offset);
- *seq = *(
u
32*)(skb->h.raw + offset_seq);
+ *spi = *(
__be
32*)(skb->h.raw + offset);
+ *seq = *(
__be
32*)(skb->h.raw + offset_seq);
return 0;
}
EXPORT_SYMBOL(xfrm_parse_spi);
return 0;
}
EXPORT_SYMBOL(xfrm_parse_spi);