---

yaml --- r: 263224 b: refs/heads/master c: c2bceb3 h: refs/heads/master v: v3
git-mirror · Aug 16, 2011 · 83d8080 · 83d8080
1 parent 1d2c863
commit 83d8080
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git 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
@@ -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;