diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2007-07-21 19:09:41 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2007-07-21 19:09:41 -0700 |
| commit | b77f2fa6299af4bbb7aa50c5064a0f087ea089d9 (patch) | |
| tree | 3b6a14539b29c66b67d0ffd04e0353319f0a1ec3 /net | |
| parent | 43a415138d8133587c0901d29941b821b86e9e7d (diff) | |
| download | blackbird-op-linux-b77f2fa6299af4bbb7aa50c5064a0f087ea089d9.tar.gz blackbird-op-linux-b77f2fa6299af4bbb7aa50c5064a0f087ea089d9.zip | |
[IPV6]: endianness bug in ip6_tunnel
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv6/ip6_tunnel.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index 281aee42d3f0..df30976f6dfd 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c @@ -962,8 +962,8 @@ ip4ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev) dsfield = ipv4_get_dsfield(iph); if ((t->parms.flags & IP6_TNL_F_USE_ORIG_TCLASS)) - fl.fl6_flowlabel |= ntohl(((__u32)iph->tos << IPV6_TCLASS_SHIFT) - & IPV6_TCLASS_MASK); + fl.fl6_flowlabel |= htonl((__u32)iph->tos << IPV6_TCLASS_SHIFT) + & IPV6_TCLASS_MASK; err = ip6_tnl_xmit2(skb, dev, dsfield, &fl, encap_limit, &mtu); if (err != 0) { |
