From: Guillaume Nault Date: Fri, 8 Nov 2024 16:47:12 +0000 (+0100) Subject: bpf: ipv4: Prepare __bpf_redirect_neigh_v4() to future .flowi4_tos conversion. X-Git-Tag: v6.13-rc1~135^2~46^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bfe086be5c4c644602e26840683dfdd893f22d04;p=thirdparty%2Flinux.git bpf: ipv4: Prepare __bpf_redirect_neigh_v4() 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: Ido Schimmel Link: https://patch.msgid.link/35eacc8955003e434afb1365d404193cc98a9579.1731064982.git.gnault@redhat.com Signed-off-by: Jakub Kicinski --- diff --git a/net/core/filter.c b/net/core/filter.c index bc33692acabcc..4c396305cd4d5 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -2355,7 +2355,7 @@ static int __bpf_redirect_neigh_v4(struct sk_buff *skb, struct net_device *dev, struct flowi4 fl4 = { .flowi4_flags = FLOWI_FLAG_ANYSRC, .flowi4_mark = skb->mark, - .flowi4_tos = ip4h->tos & INET_DSCP_MASK, + .flowi4_tos = inet_dscp_to_dsfield(ip4h_dscp(ip4h)), .flowi4_oif = dev->ifindex, .flowi4_proto = ip4h->protocol, .daddr = ip4h->daddr,