The branch main has been updated by melifaro:
URL:
https://cgit.FreeBSD.org/src/commit/?id=c90901245e9c1816f2a2c2d1e2242b0772f4bd31
commit c90901245e9c1816f2a2c2d1e2242b0772f4bd31
Author: Alexander V. Chernikov <melif...@freebsd.org>
AuthorDate: 2023-05-27 13:25:16 +0000
Commit: Alexander V. Chernikov <melif...@freebsd.org>
CommitDate: 2023-05-27 13:25:16 +0000
netlink: update rta_multipath conditions in arp/ndp after 656a39c1a062
---
usr.sbin/arp/arp_netlink.c | 2 +-
usr.sbin/ndp/ndp_netlink.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/usr.sbin/arp/arp_netlink.c b/usr.sbin/arp/arp_netlink.c
index be52ca7fa92a..4e5c8f3d9940 100644
--- a/usr.sbin/arp/arp_netlink.c
+++ b/usr.sbin/arp/arp_netlink.c
@@ -130,7 +130,7 @@ guess_ifindex(struct snl_state *ss, uint32_t fibnum, struct
in_addr addr)
if (!snl_parse_nlmsg(ss, hdr, &snl_rtm_route_parser, &r))
return (0);
- if (r.rta_multipath || (r.rta_rtflags & RTF_GATEWAY))
+ if (r.rta_multipath.num_nhops > 0 || (r.rta_rtflags & RTF_GATEWAY))
return (0);
/* Check if the interface is of supported type */
diff --git a/usr.sbin/ndp/ndp_netlink.c b/usr.sbin/ndp/ndp_netlink.c
index e15dc900f0c7..a34359a4343f 100644
--- a/usr.sbin/ndp/ndp_netlink.c
+++ b/usr.sbin/ndp/ndp_netlink.c
@@ -167,7 +167,7 @@ guess_ifindex(struct snl_state *ss, uint32_t fibnum, const
struct sockaddr_in6 *
if (!snl_parse_nlmsg(ss, hdr, &snl_rtm_route_parser, &r))
return (0);
- if (r.rta_multipath || (r.rta_rtflags & RTF_GATEWAY))
+ if (r.rta_multipath.num_nhops > 0 || (r.rta_rtflags & RTF_GATEWAY))
return (0);
/* Check if the interface is of supported type */
