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: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ee686ca919193d7c1f87f907e732df5e2f942523;p=pandora-kernel.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>
---

Reading git-diff-tree failed