From: Julian Anastasov Date: Sat, 23 Jul 2011 02:00:41 +0000 (+0000) Subject: ipv4: use RT_TOS after some rt_tos conversions X-Git-Tag: upstream/snapshot3+hdmi~9563^2~8 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b0fe4a31849063fcac0bdc93716ca92615e93f57;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git 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 Signed-off-by: David S. Miller --- 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 @@ static struct mr_table *ipmr_rt_fib_lookup(struct net *net, struct sk_buff *skb) 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, 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 @@ void ip_rt_get_source(u8 *addr, struct sk_buff *skb, struct rtable *rt) 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;