From: Ido Schimmel Date: Wed, 21 Aug 2024 12:52:49 +0000 (+0300) Subject: ipv4: icmp: Pass full DS field to ip_route_input() X-Git-Tag: v6.12-rc1~232^2~198^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1c6f50b37f711b831d78973dad0df1da99ad0014;p=thirdparty%2Fkernel%2Flinux.git ipv4: icmp: Pass full DS field to ip_route_input() 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 Reviewed-by: Guillaume Nault Acked-by: Florian Westphal Reviewed-by: David Ahern Link: https://patch.msgid.link/20240821125251.1571445-11-idosch@nvidia.com Signed-off-by: Jakub Kicinski --- diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c index ab6d0d98dbc34..b8f56d03fcbb6 100644 --- a/net/ipv4/icmp.c +++ b/net/ipv4/icmp.c @@ -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);