commit b0fe4a31849063fcac0bdc93716ca92615e93f57
author Julian Anastasov <ja@ssi.bg> Sat Jul 23 02:00:41 2011 +0000
committer David S. Miller <davem@davemloft.net> Sat Jul 23 20:05:31 2011 -0700
tree 440cba41924eb7f32a3f1506715c6fc50663d98a
parent f6226dec5081f55bf7820b74a9acb7b20a8930a5

ipv4: use RT_TOS after some rt_tos conversions

rt_tos was changed to iph->tos but it must be filtered by RT_TOS

Signed-off-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: David S. Miller <davem@davemloft.net>

net/ipv4/ipmr.c

diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
index aae2bd8..58e8791 100644
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@ -1796,7 +1796,7 @@
 	struct flowi4 fl4 = {
 		.daddr = iph->daddr,
 		.saddr = iph->saddr,
-		.flowi4_tos = iph->tos,
+		.flowi4_tos = RT_TOS(iph->tos),
 		.flowi4_oif = rt->rt_oif,
 		.flowi4_iif = rt->rt_iif,
 		.flowi4_mark = rt->rt_mark,

net/ipv4/route.c

diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index 3313730..1730689 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -1740,7 +1740,7 @@
 		memset(&fl4, 0, sizeof(fl4));
 		fl4.daddr = iph->daddr;
 		fl4.saddr = iph->saddr;
-		fl4.flowi4_tos = iph->tos;
+		fl4.flowi4_tos = RT_TOS(iph->tos);
 		fl4.flowi4_oif = rt->dst.dev->ifindex;
 		fl4.flowi4_iif = skb->dev->ifindex;
 		fl4.flowi4_mark = skb->mark;