From 4b624746e2af71e03546a5f4e7927965e7e82c98 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <shemminger@vyatta.com>
Date: Thu, 8 Jul 2010 21:35:58 -0700
Subject: [PATCH] --- yaml --- r: 203419 b: refs/heads/master c:
 dd4ba83dc1becbb3bb383851381c10c372e47247 h: refs/heads/master i:   203417:
 4f373be77ba7a3e3b2afacc0d1593dd350826490   203415:
 1139c624e7bba18beef00f7009fedca0ddbb49aa v: v3

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

diff --git a/[refs] b/[refs]
index 46da98ffb279..2822a1e9c035 100644
--- 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
index 749e54889e82..945b20a5ad50 100644
--- 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);
 	}
 
 	{