]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ipv4: icmp: Pass full DS field to ip_route_input()
authorIdo Schimmel <idosch@nvidia.com>
Wed, 21 Aug 2024 12:52:49 +0000 (15:52 +0300)
committerJakub Kicinski <kuba@kernel.org>
Thu, 22 Aug 2024 23:59:58 +0000 (16:59 -0700)
Align the ICMP code to other callers of ip_route_input() and pass the
full DS field. In the future this will allow us to perform a route
lookup according to the full DSCP value.

No functional changes intended since the upper DSCP bits are masked when
comparing against the TOS selectors in FIB rules and routes.

Signed-off-by: Ido Schimmel <idosch@nvidia.com>
Reviewed-by: Guillaume Nault <gnault@redhat.com>
Acked-by: Florian Westphal <fw@strlen.de>
Reviewed-by: David Ahern <dsahern@kernel.org>
Link: https://patch.msgid.link/20240821125251.1571445-11-idosch@nvidia.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
net/ipv4/icmp.c

index ab6d0d98dbc34cb7fb831a1e9afe3b4045ad0ecf..b8f56d03fcbb62970a828e20dd9f05fcede2d552 100644 (file)
@@ -545,7 +545,7 @@ static struct rtable *icmp_route_lookup(struct net *net,
                orefdst = skb_in->_skb_refdst; /* save old refdst */
                skb_dst_set(skb_in, NULL);
                err = ip_route_input(skb_in, fl4_dec.daddr, fl4_dec.saddr,
-                                    RT_TOS(tos), rt2->dst.dev);
+                                    tos, rt2->dst.dev);
 
                dst_release(&rt2->dst);
                rt2 = skb_rtable(skb_in);