Commit 6ab04392 authored by Guillaume Nault's avatar Guillaume Nault Committed by Jakub Kicinski
Browse files

ipv4: Prepare ipmr_rt_fib_lookup() to future .flowi4_tos conversion. 



Use ip4h_dscp() to get the DSCP from the IPv4 header, then convert the
dscp_t value to __u8 with inet_dscp_to_dsfield().

Then, when we'll convert .flowi4_tos to dscp_t, we'll just have to drop
the inet_dscp_to_dsfield() call.

Signed-off-by: default avatarGuillaume Nault <gnault@redhat.com>
Reviewed-by: default avatarIdo Schimmel <idosch@nvidia.com>
Link: https://patch.msgid.link/462402a097260357a7aba80228612305f230b6a9.1729530028.git.gnault@redhat.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 0ed37339

net/ipv4/ipmr.c

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

		.flowi4_tos = inet_dscp_to_dsfield(ip4h_dscp(iph)),

		.flowi4_oif = (rt_is_output_route(rt) ?

			       skb->dev->ifindex : 0),

		.flowi4_iif = (rt_is_output_route(rt) ?