diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-05-26 16:06:58 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-05-26 16:06:58 -0400 |
| commit | f587fb74b26a10354f1eb73e8d054cd15e5a2fe2 (patch) | |
| tree | a453a270fc86ada85d808487c911387739ce2296 /net/ipv4/xfrm4_policy.c | |
| parent | df8ccb9bf1ca360581a94c2245efb9fa613fbb29 (diff) | |
| parent | 705af309505681f197f81618440954d10f120dc0 (diff) | |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'net/ipv4/xfrm4_policy.c')
| -rw-r--r-- | net/ipv4/xfrm4_policy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c index f285bbf296e..8604c747bca 100644 --- a/net/ipv4/xfrm4_policy.c +++ b/net/ipv4/xfrm4_policy.c @@ -221,7 +221,7 @@ _decode_session4(struct sk_buff *skb, struct flowi *fl) if (pskb_may_pull(skb, xprth + 4 - skb->data)) { u16 *ipcomp_hdr = (u16 *)xprth; - fl->fl_ipsec_spi = ntohl(ntohs(ipcomp_hdr[1])); + fl->fl_ipsec_spi = htonl(ntohs(ipcomp_hdr[1])); } break; default: |