diff options
| author |   Paul Mackerras <paulus@samba.org> | 2006-06-01 19:05:23 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-06-01 19:05:23 +1000 |
| commit | c029cc66cb3d83f70c02e0c182f0eed1419f8020 (patch) | |
| tree | b9ed887a0e6434fedebcbf90b3d2ba1aeff68a01 /net/xfrm/xfrm_input.c | |
| parent | [PATCH] remove powerpc bitops in favor of existing generic bitops (diff) | |
| parent | Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus (diff) | |
| download | linux-dev-c029cc66cb3d83f70c02e0c182f0eed1419f8020.tar.xz linux-dev-c029cc66cb3d83f70c02e0c182f0eed1419f8020.zip | |
Merge branch 'merge'
Diffstat (limited to 'net/xfrm/xfrm_input.c')
| -rw-r--r-- | net/xfrm/xfrm_input.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/xfrm/xfrm_input.c b/net/xfrm/xfrm_input.c index b54971059f16..891a6090cc09 100644 --- a/net/xfrm/xfrm_input.c +++ b/net/xfrm/xfrm_input.c @@ -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; - *spi = ntohl(ntohs(*(u16*)(skb->h.raw + 2))); + *spi = htonl(ntohs(*(u16*)(skb->h.raw + 2))); *seq = 0; return 0; default: |