From nobody Mon Jan 23 22:12:03 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 4P148N0JXXz2t0Wp; Mon, 23 Jan 2023 22:12:04 +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 4P148M70WXz3LM8; Mon, 23 Jan 2023 22:12:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674511924; 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=7qHSCBzxielGDLzcaiRuVvi0wXpqKWo7mN/9DO3Cuc8=; b=p2HewP8FDOs/k6OIq33O3d2Yoyw8N1LSdfV0MCk0s9wj1nxqZs6TNZxPCPzOyZhmo7vCbG pEVhbsdOA+IncNOpjnu6urVddSuwgoyGB/dYin7LFDHFHD4r/1crgT48cHJnDN82kSMl/l 8ZfXQ3gG6rPcOWyZw06L4mkNo3++q5m8xvhKPitVSVOgSDPmdOYHYBNj/B4p4JymnrKDju 5wlpD2IpKVohffneVo31Am+D4PbECvfUV8TM/bFSKYmoa1DTI8LvnNvu20RPNP1ul93ZKJ hV/F7RqVZ30rMeI3s/LfeE1vxECjeYVlq7bkvP04aT78jZ4pmnJGOiotoiMQ8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674511924; 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=7qHSCBzxielGDLzcaiRuVvi0wXpqKWo7mN/9DO3Cuc8=; b=kLbtYd+9GNCBeOK4xxm8LcuJXlpyVMIKRCTxiviBAaT2ZSEvSGqKBu297eNUQaSGQlwkM4 HuiVIijaYTtWuyMJoxPhfZQSXGIWw+w/rUVoPEPWL8FNXh915GsE6b+UT9nNoqXuffhEN2 1JOaa6xuJzFEOjXtvQx8o+ScaU6o3+TVoH/PZyHBnWEB96ChdRiiZFcIOSSkWEX6/JJCLU VFP6sJO4f8ys9jbv5ds7Z1eICQxqabx9r9sjqvYjKYlW4T1UDtMJ1xs39RyfDYRvp801Ao trutFEv8chf5Jo6Qw9mOsMm2sQ3s18096a46U7XzKW7hHfheoHbXNNo3DF/wfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674511924; a=rsa-sha256; cv=none; b=QmI36gXoBvDm/1v+VvetuVDJGdBoGXtvxc+Yg7BjLI1vA1FSubGWeraSK835e2FvsGU4Z3 TifeaLogAY1yW5PCBhzEEstXtXTEUH2LuUxFt/gXRNoyd1VuPa3QHrvBEItNFaTgq9fjfM CpOhBBwRTb9Ih4B7llKbGaC02t2k9vlBELK3o/n+o86RpQtxKWVk7kTZbwIeD+T2LmSWSl m2wGbBjnvBikS9S6mSgf1gGztuSQdP3ZiFFYJbekBxT4OH6M/ovKPNy4adoRsYyJ5rVmua L9spU+SvBOoJtTzUVo/ny6kBYb3RXFVjV/YRbX8lo66pT39LZhGoTU8PRsR1+Q== 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 4P148M5zLrzlnj; Mon, 23 Jan 2023 22:12:03 +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 30NMC31K012927; Mon, 23 Jan 2023 22:12:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30NMC3Eu012926; Mon, 23 Jan 2023 22:12:03 GMT (envelope-from git) Date: Mon, 23 Jan 2023 22:12:03 GMT Message-Id: <202301232212.30NMC3Eu012926@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: a9ed45a93769 - stable/13 - netlink: fix non-multipath build 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: a9ed45a937697f7e2b331c39c9237e9c63a7c799 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=a9ed45a937697f7e2b331c39c9237e9c63a7c799 commit a9ed45a937697f7e2b331c39c9237e9c63a7c799 Author: Alexander V. Chernikov AuthorDate: 2022-12-02 22:20:42 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-01-23 22:04:03 +0000 netlink: fix non-multipath build (cherry picked from commit 6ab87ec483e9578823cbc30458f49ab07f51acf8) --- 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];