| From stable-bounces@linux.kernel.org Tue Jul 24 21:44:03 2007 |
| From: Al Viro <viro@zeniv.linux.org.uk> |
| Date: Tue, 24 Jul 2007 21:43:58 -0700 (PDT) |
| Subject: Fix ipv6 tunnel endianness bug. |
| To: stable@kernel.org |
| Cc: bunk@stusta.de |
| Message-ID: <20070724.214358.35664196.davem@davemloft.net> |
| |
| |
| From: Al Viro <viro@zeniv.linux.org.uk> |
| |
| [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> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| |
| --- |
| net/ipv6/ip6_tunnel.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/net/ipv6/ip6_tunnel.c |
| +++ b/net/ipv6/ip6_tunnel.c |
| @@ -962,8 +962,8 @@ ip4ip6_tnl_xmit(struct sk_buff *skb, str |
| 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) { |
