From 83d8080f8c3a9aa82d85cfce4e07045abbea75ca Mon Sep 17 00:00:00 2001
From: Lionel Elie Mamane <lionel@mamane.lu>
Date: Sat, 13 Aug 2011 14:04:38 +0000
Subject: [PATCH] --- yaml --- r: 263224 b: refs/heads/master c:
 c2bceb3d7f145af5a0916bea700f2f9d380901ea h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/net/ipv6/sit.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 0d935b498b62..0c169f2645bc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 588dc91151d99e9307c2f9a8468453274fe43ecd
+refs/heads/master: c2bceb3d7f145af5a0916bea700f2f9d380901ea
diff --git a/trunk/net/ipv6/sit.c b/trunk/net/ipv6/sit.c
index 07bf1085458f..00b15ac7a702 100644
--- a/trunk/net/ipv6/sit.c
+++ b/trunk/net/ipv6/sit.c
@@ -672,6 +672,9 @@ static netdev_tx_t ipip6_tunnel_xmit(struct sk_buff *skb,
 	if (skb->protocol != htons(ETH_P_IPV6))
 		goto tx_error;
 
+	if (tos == 1)
+		tos = ipv6_get_dsfield(iph6);
+
 	/* ISATAP (RFC4214) - must come before 6to4 */
 	if (dev->priv_flags & IFF_ISATAP) {
 		struct neighbour *neigh = NULL;