From nobody Sat May 27 13:26:29 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QT2cj2fgRz4CkG9; Sat, 27 May 2023 13:26:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QT2cj1wzZz3D7h; Sat, 27 May 2023 13:26:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685193989; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IPWdWC/2FmDfIfSRjlGiFS7Pm1PpO/vkTo3BDFIABW8=; b=qjtfGPl0lwe8mJOMI5wMnzEtYxSLH+kf2RVMeGA2MjCU6DCKcWPq86jT7VfXd4DCsIwMh7 +1WXGxWBP+TyUela/enejI69ab7xE9ZYJ1tPgS+0z/RmIddZcuvN2LaYYfRo1QjG9ML7/F lVt8eNQJheYeZueoabAFZ8qgmJqry/20cHQr/OQrIRKfAIsqUYghjOJiq2gKMZ2DuAY++x ZJ/ctT6l+QKfHN53M3qSy1T1FYMLfqhrFl1dSKYY1HHUCsVhr0eKut5LJ+X1vbZYQKBYxZ 3deV6Cj+x3yr21h7kK3AWggjakTlo7HULNPbUW5PxOT97jqHEuDT0cXw5aLKdQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685193989; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IPWdWC/2FmDfIfSRjlGiFS7Pm1PpO/vkTo3BDFIABW8=; b=NquIovsso5yML4xC2e8hAV+2txSCLeyaA5fOsyaXkkcl5DlsgYdFQx7fkOCw2eewFGfETr Aexrl6mHIoC4uHapCJNg95jSWvSnCQ++raJGpgO1RJ2wJNQvivbGsU8uLan3oaSZ5paCEs 7ORporziwM2wE4983yNZ1col5B1RWK6+8gqZw6vs3QiPQlHapNrPv0Oa9/rWM1UPzQ/4oM fNRxJDOVWErs23vqNEStzIyOgbYFnH7qvphYe4/iEBvFcxiyV9R8Dypc0RG3TqtmkX6+wI VV5EaSDI6+5FnfdXNvkIA2pZAxxefuvmC3hpbl0KZ+z2NfhjCwtuuGylnLuhpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685193989; a=rsa-sha256; cv=none; b=Xi7j0rV0V49RrOyqaItlJX+6w5VqwSyKoXHE4xqNPuuHQNP06CJxW+lgj5DgCYhH7XZwxY so6Ec7rXJy0pFGuv1K6ygeqr0HgF9yY9qJ5DDFtxJbbnKvaYyFGtEWEERjfZmw9kwIbre/ DCr9Y3ihKowV2qSAK8sJPS+r/Vq80G9q5Nadgms+ilUossKkywHD8i9XlDVAbb9kxpVb99 i0DWTxOcjBTIt7ZfYVUfYWrV95kd3q7jNEGgif5yRu8M7Q2xXj0yU9eA0pozrszdrUb52y d4aOj2QLTKYSJGtSbQBDsWTHouymr7w9fBYohu/qKiz/rRIC6ifgoavwIr0Hrw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QT2cj10Cfzqn7; Sat, 27 May 2023 13:26:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 34RDQT0i020076; Sat, 27 May 2023 13:26:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34RDQTYe020075; Sat, 27 May 2023 13:26:29 GMT (envelope-from git) Date: Sat, 27 May 2023 13:26:29 GMT Message-Id: <202305271326.34RDQTYe020075@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: c90901245e9c - main - netlink: update rta_multipath conditions in arp/ndp after 656a39c1a062 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c90901245e9c1816f2a2c2d1e2242b0772f4bd31 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=c90901245e9c1816f2a2c2d1e2242b0772f4bd31 commit c90901245e9c1816f2a2c2d1e2242b0772f4bd31 Author: Alexander V. Chernikov AuthorDate: 2023-05-27 13:25:16 +0000 Commit: Alexander V. Chernikov 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 */