summaryrefslogtreecommitdiff
path: root/net/ipv4/icmp.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2024-12-09 12:50:45 +0000
committerMark Brown <broonie@kernel.org>2024-12-09 12:50:45 +0000
commit1331fb6640440f42a709eafd5c802f3496f746b8 (patch)
tree01fd6f6cf36155fe188aed05db07a030f509ac00 /net/ipv4/icmp.c
parenta308f9e47fc2377863f0f561ceedd45ccc7c7f9c (diff)
parentfac04efc5c793dccbd07e2d59af9f90b7fc0dca4 (diff)
regmap: Merge up v6.12-rc2
This has fixes for several boards which help my testing a lot.
Diffstat (limited to 'net/ipv4/icmp.c')
-rw-r--r--net/ipv4/icmp.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index 4f088fa1c2f2..963a89ae9c26 100644
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -517,6 +517,9 @@ static struct rtable *icmp_route_lookup(struct net *net, struct flowi4 *fl4,
if (!IS_ERR(dst)) {
if (rt != rt2)
return rt;
+ if (inet_addr_type_dev_table(net, route_lookup_dev,
+ fl4->daddr) == RTN_LOCAL)
+ return rt;
} else if (PTR_ERR(dst) == -EPERM) {
rt = NULL;
} else {