---

yaml --- r: 155459 b: refs/heads/master c: ee686ca h: refs/heads/master i: 155457: 40c29bc 155455: bc77a83 v: v3
git-mirror · Jul 14, 2009 · 9d54f83 · 9d54f83
1 parent 2b7d4e0
commit 9d54f83
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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;
 	}
 
 	{