aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/ipmr.c
diff options
context:
space:
mode:
authorJulian Anastasov <ja@ssi.bg>2011-07-23 02:00:41 +0000
committerGreg Kroah-Hartman <gregkh@suse.de>2011-08-15 18:31:39 -0700
commitcb737cb02933192dcbb141480e3dc8153b89be48 (patch)
tree2f39e114f7e7a9ca692ac4dc542cef3b43000993 /net/ipv4/ipmr.c
parentc8656c500dd6e88d427547abe2859213a916a3ea (diff)
downloadkernel_samsung_smdk4412-cb737cb02933192dcbb141480e3dc8153b89be48.zip
kernel_samsung_smdk4412-cb737cb02933192dcbb141480e3dc8153b89be48.tar.gz
kernel_samsung_smdk4412-cb737cb02933192dcbb141480e3dc8153b89be48.tar.bz2
ipv4: use RT_TOS after some rt_tos conversions
[ Upstream commit b0fe4a31849063fcac0bdc93716ca92615e93f57 ] 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> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'net/ipv4/ipmr.c')
-rw-r--r--net/ipv4/ipmr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
index 30a7763..f81af8d 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,