[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20090714153648.GC8461@urbino.open.ch>
Date: Tue, 14 Jul 2009 17:36:48 +0200
From: Andreas Jaggi <aj@...n.ch>
To: Wojtek Sawasciuk <voyo@...ip.pl>
Cc: netdev@...r.kernel.org, kuznet@....inr.ac.ru, kaber@...sh.net,
davem@...emloft.net
Subject: [PATCH] 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@...n.ch>
--- vanilla-linux-2.6.29.4/net/ipv4/ip_gre.c 2009-05-19 01:52:34.000000000 +0200
+++ gre-dev-2/net/ipv4/ip_gre.c 2009-07-14 17:14:34.000000000 +0200
@@ -677,10 +677,10 @@
}
tos = tiph->tos;
- if (tos&1) {
+ if (tos == 1) {
+ tos = 0;
if (skb->protocol == htons(ETH_P_IP))
tos = old_iph->tos;
- tos &= ~1;
}
{
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists