From nobody Thu Feb 9 16:49:05 2023 X-Original-To: dev-commits-src-branches@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 4PCN9s4mRwz3pqKr; Thu, 9 Feb 2023 16:49:05 +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 4PCN9s4F37z4PPC; Thu, 9 Feb 2023 16:49:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675961345; 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=68nUGRu1UQGtv7MXOGRFH4gXhZ5woushJkqgZxMZ+H0=; b=DGYUNnxBzC5r5yjnbp8FN9bQps0dq/XwJSufnb7jxAoMFRJ2jJ2VkL0xZwY35HBJ9v8LCt cbTQuODTykZjDxH1QkuA0U8xmIVJf0cCNH8GI3xs85zSf8y3Kndkqfe7a3V1Uy1C7ApYKF hEx+tCU1N68G5riN8ewzgKiFy8S0ZQSASmZfZJDRasLqX8gm4/z5Mjtc9bovjkrqUhAAHL WoLv/3VM+MzNYO58P9Z9FoagehpiTT4iCNh3VdSdYr3WcpcvNfsTtA5GotIjPIyMSvleun 8N+tU9tOFRr0GMmJRn2bGzuZkdTlqlAJcN0DQOnOCP5tT1td73hlqcWk+lQknw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675961345; 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=68nUGRu1UQGtv7MXOGRFH4gXhZ5woushJkqgZxMZ+H0=; b=CKf0s3ustTdaZ47/7ZMSW3hJlta01CCqaJZkJ4dlO+I5IMg/FohAiNThPR0YlkaiQQNdwN 7wr2vgDk9GRSqdexhEQlA4+1kSayHk3oPfQO9yCq276YsrDNxKhjwfKELNLvhav4bQ/TYm eKfRLxCOcP5L6UX3gNsl6GQZuehUpthr6Wzi5nKdDByl7UOvoNse8N6kA/nygfPRCB26D2 X61EQX0WgmWK1xaSYGW2aW3AWOBPDVuwncYhDjpbrP0ivL29mut2I/VW+Ql/6icIni2wem eKHyvs24UG7jm3xVcqpyGvbjGQy3IB2sRejFaxv/hJdVJIu9hIPcP+jcrjIV4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675961345; a=rsa-sha256; cv=none; b=dYayiiRg0v5xGfvbPwJG46QGg8WzRrBBey0SyQrP3RjzUptCLIrC/mV82ottp0QlPaVDa+ ynK7ZmWi4ksIdmO6DCJQgi24GZqUQKGMdODlOZV0tTr3bbkmRkqhtDDkCsl+0QS/08TcxM 3zGBUFo2fn5j18XEmCzS+DLOeMa/a+z2DADrXZHmKPdYOU71JMB9RxqA8p21MtPfBZaWy+ pYfuYJeY+CNyIqRNoOxGm6OjBe6vtSW1qy8pjv/6s6sgBCtBgliuwnZ0hXBwxnuI6Pb6oN PL0+eYVcwqmhrcVcU3ybivXr6CUwY8HmNtYOY6ZcfjnVsaYMR7lWL8Lc5OoNyQ== 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 4PCN9s3L0Nzkbc; Thu, 9 Feb 2023 16:49:05 +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 319Gn5u8053128; Thu, 9 Feb 2023 16:49:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 319Gn5g6053127; Thu, 9 Feb 2023 16:49:05 GMT (envelope-from git) Date: Thu, 9 Feb 2023 16:49:05 GMT Message-Id: <202302091649.319Gn5g6053127@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: d4be9d601d35 - stable/13 - netlink: export nextop group kernel index when dumping multipath route. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: d4be9d601d356e0790334d1ae039cab5ecaf0a2c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=d4be9d601d356e0790334d1ae039cab5ecaf0a2c commit d4be9d601d356e0790334d1ae039cab5ecaf0a2c Author: Alexander V. Chernikov AuthorDate: 2023-01-28 15:37:58 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-02-09 16:44:53 +0000 netlink: export nextop group kernel index when dumping multipath route. MFC after: 2 weeks (cherry picked from commit 95b47ba6299401b487f29a05ac859629ee7d4f0b) --- sys/netlink/route/rt.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/netlink/route/rt.c b/sys/netlink/route/rt.c index 07735cd9d5bc..9173f5cc58ea 100644 --- a/sys/netlink/route/rt.c +++ b/sys/netlink/route/rt.c @@ -175,6 +175,7 @@ dump_rc_nhg(struct nl_writer *nw, const struct nhgrp_object *nhg, struct rtmsg * if (uidx != 0) nlattr_add_u32(nw, NL_RTA_NH_ID, uidx); + nlattr_add_u32(nw, NL_RTA_KNH_ID, nhgrp_get_idx(nhg)); nlattr_add_u32(nw, NL_RTA_RTFLAGS, base_rtflags); int off = nlattr_add_nested(nw, NL_RTA_MULTIPATH);