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

ipv4: Prepare fib_compute_spec_dst() 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/a0eba69cce94f747e4c7516184a85ffd0abbe3f0.1729530028.git.gnault@redhat.com


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

net/ipv4/fib_frontend.c

+1 −1
Original line number Diff line number Diff line
@@ -293,7 +293,7 @@ __be32 fib_compute_spec_dst(struct sk_buff *skb) 
			.flowi4_iif = LOOPBACK_IFINDEX,

			.flowi4_l3mdev = l3mdev_master_ifindex_rcu(dev),

			.daddr = ip_hdr(skb)->saddr,

			.flowi4_tos = ip_hdr(skb)->tos & INET_DSCP_MASK,

			.flowi4_tos = inet_dscp_to_dsfield(ip4h_dscp(ip_hdr(skb))),

			.flowi4_scope = scope,

			.flowi4_mark = vmark ? skb->mark : 0,

		};