From: Andreas Jaggi <aj@open.ch>
Date: Tue, 14 Jul 2009 16:35:59 +0000 (-0700)
Subject: gre: fix ToS/DiffServ inherit bug
X-Git-Tag: v2.6.31-rc4~55^2~4
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=ee686ca919193d7c1f87f907e732df5e2f942523;p=~shefty%2Frdma-dev.git

gre: fix ToS/DiffServ inherit bug

Fixes two bugs:
- ToS/DiffServ inheritance was unintentionally activated when using impair fixed ToS values
- ECN bit was lost during ToS/DiffServ inheritance

Signed-off-by: Andreas Jaggi <aj@open.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c
index 44e2a3d2359..cb4a0f4bd5e 100644
--- a/net/ipv4/ip_gre.c
+++ b/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;
 	}
 
 	{