diff options
| author | Julian Anastasov <ja@ssi.bg> | 2011-07-23 02:00:41 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-07-23 20:05:31 -0700 |
| commit | b0fe4a31849063fcac0bdc93716ca92615e93f57 (patch) | |
| tree | 440cba41924eb7f32a3f1506715c6fc50663d98a /net/ipv4 | |
| parent | f6226dec5081f55bf7820b74a9acb7b20a8930a5 (diff) | |
| download | linux-3.10-b0fe4a31849063fcac0bdc93716ca92615e93f57.tar.gz linux-3.10-b0fe4a31849063fcac0bdc93716ca92615e93f57.tar.bz2 linux-3.10-b0fe4a31849063fcac0bdc93716ca92615e93f57.zip | |
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>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/ipmr.c | 2 | ||||
| -rw-r--r-- | net/ipv4/route.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index aae2bd8cd92..58e87915797 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 33137307d52..1730689f560 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; |