From 9d54f833f8d5505a7dd2125984719784da5dcfdb Mon Sep 17 00:00:00 2001
From: Andreas Jaggi <aj@open.ch>
Date: Tue, 14 Jul 2009 09:35:59 -0700
Subject: [PATCH] --- yaml --- r: 155459 b: refs/heads/master c:
 ee686ca919193d7c1f87f907e732df5e2f942523 h: refs/heads/master i:   155457:
 40c29bcc8339130edcdd2ba6894eb9337eeb4f20   155455:
 bc77a83ad1728efec6bc18f34c6c4ab8a787d58d v: v3

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

diff --git a/[refs] b/[refs]
index 6785348a03e0..8a337695daf3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c8159b2db1b49f6bda4429008c85108e2da60712
+refs/heads/master: ee686ca919193d7c1f87f907e732df5e2f942523
diff --git a/trunk/net/ipv4/ip_gre.c b/trunk/net/ipv4/ip_gre.c
index 44e2a3d2359a..cb4a0f4bd5e5 100644
--- a/trunk/net/ipv4/ip_gre.c
+++ b/trunk/net/ipv4/ip_gre.c
@@ -735,10 +735,10 @@ static int ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev)
 	}
 
 	tos = tiph->tos;
-	if (tos&1) {
+	if (tos == 1) {
+		tos = 0;
 		if (skb->protocol == htons(ETH_P_IP))
 			tos = old_iph->tos;
-		tos &= ~1;
 	}
 
 	{