]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
vrf: Unmask upper DSCP bits in vrf_process_v4_outbound()
authorIdo Schimmel <idosch@nvidia.com>
Thu, 29 Aug 2024 06:54:58 +0000 (09:54 +0300)
committerDavid S. Miller <davem@davemloft.net>
Sat, 31 Aug 2024 16:44:51 +0000 (17:44 +0100)
Unmask the upper DSCP bits when calling ip_route_output_flow() so that
in the future it could perform the FIB lookup according to the full DSCP
value.

Signed-off-by: Ido Schimmel <idosch@nvidia.com>
Reviewed-by: Guillaume Nault <gnault@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/vrf.c

index 040f0bb36c0ea4c441a4ab8e1ce6897ce163b61b..a900908eb24a6f3608852ad8687b5946d02469bf 100644 (file)
@@ -37,6 +37,7 @@
 #include <net/sch_generic.h>
 #include <net/netns/generic.h>
 #include <net/netfilter/nf_conntrack.h>
+#include <net/inet_dscp.h>
 
 #define DRV_NAME       "vrf"
 #define DRV_VERSION    "1.1"
@@ -520,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 = RT_TOS(ip4h->tos);
+       fl4.flowi4_tos = ip4h->tos & INET_DSCP_MASK;
        fl4.flowi4_flags = FLOWI_FLAG_ANYSRC;
        fl4.flowi4_proto = ip4h->protocol;
        fl4.daddr = ip4h->daddr;