Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b0fe4a31 authored by Julian Anastasov's avatar Julian Anastasov Committed by David S. Miller
Browse files

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: default avatarJulian Anastasov <ja@ssi.bg>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f6226dec

net/ipv4/ipmr.c

+1 −1
Original line number Diff line number Diff line
@@ -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,

net/ipv4/route.c

+1 −1
Original line number Diff line number Diff line
@@ -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;