---

yaml --- r: 203419 b: refs/heads/master c: dd4ba83 h: refs/heads/master i: 203417: 4f373be 203415: 1139c62 v: v3
git-mirror · Jul 9, 2010 · 4b62474 · 4b62474
1 parent af7b9e2
commit 4b62474
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f5152c908a5b0be48ec9a58d0de8bdadd9385854
+refs/heads/master: dd4ba83dc1becbb3bb383851381c10c372e47247
diff --git a/trunk/net/ipv4/ip_gre.c b/trunk/net/ipv4/ip_gre.c
@@ -731,6 +731,8 @@ static netdev_tx_t ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev
 		tos = 0;
 		if (skb->protocol == htons(ETH_P_IP))
 			tos = old_iph->tos;
+		else if (skb->protocol == htons(ETH_P_IPV6))
+			tos = ipv6_get_dsfield((struct ipv6hdr *)old_iph);
 	}
 
 	{