gre: fix ToS/DiffServ inherit bug
authorAndreas Jaggi <aj@open.ch>
Tue, 14 Jul 2009 16:35:59 +0000 (09:35 -0700)
committerDavid S. Miller <davem@davemloft.net>
Tue, 14 Jul 2009 16:35:59 +0000 (09:35 -0700)
commitee686ca919193d7c1f87f907e732df5e2f942523
tree2a1f528de455ffc952ab9bc795dd38a863604aaa
parentc8159b2db1b49f6bda4429008c85108e2da60712
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>
net/ipv4/ip_gre.c