tree 2a1f528de455ffc952ab9bc795dd38a863604aaa
parent c8159b2db1b49f6bda4429008c85108e2da60712
author Andreas Jaggi <aj@open.ch> 1247589359 -0700
committer David S. Miller <davem@davemloft.net> 1247589359 -0700

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>