---

yaml --- r: 351987 b: refs/heads/master c: 040468a h: refs/heads/master i: 351985: 35317b5 351983: 0832a97 v: v3
git-mirror · Jan 29, 2013 · b2ec0b8 · b2ec0b8
1 parent d32febc
commit b2ec0b8
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: 5c766d642bcaffd0c2a5b354db2068515b3846cf
+refs/heads/master: 040468a0a7b3f9c7966126d98151bc64f1423657
diff --git a/trunk/net/ipv4/ip_gre.c b/trunk/net/ipv4/ip_gre.c
@@ -820,8 +820,8 @@ static netdev_tx_t ipgre_tunnel_xmit(struct sk_buff *skb, struct net_device *dev
 
 	ttl = tiph->ttl;
 	tos = tiph->tos;
-	if (tos == 1) {
-		tos = 0;
+	if (tos & 0x1) {
+		tos &= ~0x1;
 		if (skb->protocol == htons(ETH_P_IP))
 			tos = old_iph->tos;
 		else if (skb->protocol == htons(ETH_P_IPV6))