From: Guillaume Nault Date: Wed, 30 Oct 2024 13:27:19 +0000 (+0100) Subject: vrf: Prepare vrf_process_v4_outbound() to future .flowi4_tos conversion. X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=937677f481259b5291001ef7c68242d366e23b64;p=users%2Fdwmw2%2Flinux.git vrf: Prepare vrf_process_v4_outbound() 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: Guillaume Nault Reviewed-by: David Ahern Link: https://patch.msgid.link/6be084229008dcfa7a4e2758befccfd2217a331e.1730294788.git.gnault@redhat.com Signed-off-by: Jakub Kicinski --- diff --git a/drivers/net/vrf.c b/drivers/net/vrf.c index 4087f72f0d2be..67d25f4f94eff 100644 --- a/drivers/net/vrf.c +++ b/drivers/net/vrf.c @@ -521,7 +521,7 @@ static netdev_tx_t vrf_process_v4_outbound(struct sk_buff *skb, /* needed to match OIF rule */ fl4.flowi4_l3mdev = vrf_dev->ifindex; fl4.flowi4_iif = LOOPBACK_IFINDEX; - fl4.flowi4_tos = ip4h->tos & INET_DSCP_MASK; + fl4.flowi4_tos = inet_dscp_to_dsfield(ip4h_dscp(ip4h)); fl4.flowi4_flags = FLOWI_FLAG_ANYSRC; fl4.flowi4_proto = ip4h->protocol; fl4.daddr = ip4h->daddr;