From nobody Fri Dec 02 22:21:07 2022 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 4NP6pq3rfjz4jVWF; Fri, 2 Dec 2022 22:21:07 +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 4NP6pq3Q83z4SRY; Fri, 2 Dec 2022 22:21:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670019667; 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=lYsBjWAY320Olfc42SgRq68sg2CxFs6IlCUC755DlGo=; b=J2AiUrJ70kQFOuIyCiMZjcX29x5/N/9y5Gugqx96nBIemDr/RBAj7M3T3m6KgtjLANFMve bf/I8Jp5pCPL92OVYkOyP25WcY81zHZ+bWNqqdC6lumaOKbFJrA0fZj9Cz7pIrS77NcRlB TVReyA4H7RNJiqoXBui7Xx6MylBqGjIKWrd0q/lux2drDTd5yQHWTxDFoMhX4onMv1MMhg 3wi1oqpj6hgLOUFtSW+Pi6tcJB/OltZDPWNTVSv6+1EQD/BcgQ0uXmQEykrnrpEsbVRFgk Q8XR/5fUvt+a+qzsR1A4vaW+P/9sNlWtdyotQn2U4MKWUamy8FPQVxvf+XWpFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670019667; 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=lYsBjWAY320Olfc42SgRq68sg2CxFs6IlCUC755DlGo=; b=l+K/RW9uex9EiyBUKPP4xazv8lFR//oR1KJ06fCvlhniHFQK3c5fFku2EpRPdrgHTup55o kQAwoZt/3iD6/6H+lKw7uoSZ04vkaMAKY0bUcgDDzMLtuHhpqdRI+KgwvC6AECTjaLchgh azUy3GCDaBu7RuarfWxPXflMSqG18bf2ANzr16bIVPO25IWJbY4XCqLMHei17aFuBGVLui +uxdOVdKO5pFeGEpC9cVXoPUS48vJtOd+DgGy+V49X6a6ZPw82Q5vhTGOftcHX12UEqrnj 4cOCGQoWpE8wni/KuuNjYM1nznRbnYUeQt2cLpD+Fo9OI1oBvUGXPEPTezfvHw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670019667; a=rsa-sha256; cv=none; b=hzzaK7SP9Q7IFTxpShR0LhAahLTptkBUXk2Vy1YRE6FyKg9Zx11HCaTxa/52to6+2smqqD 9YVoBvvqADvGXik/ADNiW1eGYRb63/knk/Cvlzm/gt5QiTMF0fmWz3mMyH9N+i5Zh/qz4E mZXlRC9GsnDTruWi861So2LX64IXS8Oy7lRXigBku4RLtwkQEDOCe5mfKU0B87HNwcGKxt OVQwSH8BKRRV7/7Wa6qFOrY0ha5GXZkPg0f7bFwas63evM2tS0Y/IvkieMCkogzoKFxiB7 oG7f6fcPxb7cFOyLu2E5i6A3PliTgtr3q2xIqzm9wDndC8Qhpj1RCrxodtHBbA== 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 4NP6pq2SpxzWX5; Fri, 2 Dec 2022 22:21:07 +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 2B2ML7Tr099851; Fri, 2 Dec 2022 22:21:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B2ML7aB099850; Fri, 2 Dec 2022 22:21:07 GMT (envelope-from git) Date: Fri, 2 Dec 2022 22:21:07 GMT Message-Id: <202212022221.2B2ML7aB099850@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: 6ab87ec483e9 - main - netlink: fix non-multipath build 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: 6ab87ec483e9578823cbc30458f49ab07f51acf8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=6ab87ec483e9578823cbc30458f49ab07f51acf8 commit 6ab87ec483e9578823cbc30458f49ab07f51acf8 Author: Alexander V. Chernikov AuthorDate: 2022-12-02 22:20:42 +0000 Commit: Alexander V. Chernikov CommitDate: 2022-12-02 22:21:00 +0000 netlink: fix non-multipath build --- sys/netlink/route/route.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netlink/route/route.c b/sys/netlink/route/route.c index 78949a643227..07735cd9d5bc 100644 --- a/sys/netlink/route/route.c +++ b/sys/netlink/route/route.c @@ -747,13 +747,13 @@ create_nexthop_from_attrs(struct nl_parsed_route *attrs, struct nl_pstate *npt, int *perror) { struct nhop_object *nh = NULL; + int error = 0; if (attrs->rta_multipath != NULL) { #ifdef ROUTE_MPATH /* Multipath w/o explicit nexthops */ int num_nhops = attrs->rta_multipath->num_nhops; struct weightened_nhop *wn = npt_alloc(npt, sizeof(*wn) * num_nhops); - int error = 0; for (int i = 0; i < num_nhops; i++) { struct rta_mpath_nh *mpnh = &attrs->rta_multipath->nhops[i];