From nobody Fri Jan 13 21:25:08 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 4NtvZs19Kyz2ql27; Fri, 13 Jan 2023 21:25:09 +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 4NtvZs0H0yz41bX; Fri, 13 Jan 2023 21:25:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673645109; 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=y2vg5n1gkuvTz5tb6YMEIOOPfkoZzuTH3BH8uxTuOtI=; b=lMUIBlyrQv1Y5J6edZ8krl8zQ2KZKEwxosBzqTVaspcNC/6vlgU3RG67h/Ppz1mg0/oW8z /2QBOk7dFaUgfGunEqEzXcii1sNlM8A88xqGBbYFLdUIaNyzTB5skgqSv+V0qZtm8DLJWM rVYcVPrbNKefT9ZqELvHpfFhhOHy/ScPibGGavb1XJSTVzfJ4tr1l8FaMwe/wSFcOCewzn 3cK5s3vYc+ov99UROzM3wYG6ds52W97YHmvTvnExFZ5Yw3I+NPiE2sXq7cnX/JeRwSFEb8 oMSGXKCVYxTT4Iv4XPT5hde7b0IHG2LAj2ZrlincdntTt+YFvuB5AHQQeQzcaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673645109; 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=y2vg5n1gkuvTz5tb6YMEIOOPfkoZzuTH3BH8uxTuOtI=; b=hZXx2hfOOym0EWUWK1Tari3L/ZZ2tMv133ho3woyhwKk5vO7tP/GeWImEKxHUzdNYyRf9u 9iDBhg5coQsvJCzPFlJrto91dACrmc3D8UVYOLNd/NOhczmI9GIaVsNnR/PIJNzmDsiGB8 HREK3ykMfLt6jB8lKfhUrwS/Rw4PEmQS5XG8yJoaMlJUhelWCO1CoXk6oMfiUR9Hun2+/m ppQD/pitZg9PucgPhKCIpupXXBsgMSvabWVaue5TWEeZiECINwb/8sbfIFIiNdioLd8fGF +/AcNnw68+xsQrjCM4e4+9HLThmWyBNlVh9OSIxKp/qgX14EYZ4LAVmOSKgwcQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673645109; a=rsa-sha256; cv=none; b=U6WHAnaKNIVI85FSZXofIzuukxwoRZ1gOUb0S/rjJdRZMTzdF7NK9Dh0YiMHGp75Ccxwxa vREGSsdzawrpUi0I9qy/datoZuBieMrWK7d6LPMYJywLn0Hpb0CdfUmBNEQNJp/3DUoHd3 4E6PsxH/pjPTHsg56ckPRuvlF4+BFENur7gc3qTCKa1q7pO/ipuLCj4ze41hM6xBIaS7W5 39nZcNftF0ayQfsMHSx9dpTSMrhtC6VsvgZuJX4UONcdyDdaZ1qTzu76og0mkSjTFOs9Ma hADbWS7b2GhhhfSCEdDNZ7JOFAFLlqdvysHrCBzcXj6w3D0JrAbJJJI/mKAo+g== 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 4NtvZr6SdPzNDF; Fri, 13 Jan 2023 21:25:08 +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 30DLP823041443; Fri, 13 Jan 2023 21:25:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30DLP8am041442; Fri, 13 Jan 2023 21:25:08 GMT (envelope-from git) Date: Fri, 13 Jan 2023 21:25:08 GMT Message-Id: <202301132125.30DLP8am041442@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: 2c07a773415b - stable/13 - routing: fix build warning without ROUTE_MPATH 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/stable/13 X-Git-Reftype: branch X-Git-Commit: 2c07a773415bf9a812adf8743afaadab7f84b59c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=2c07a773415bf9a812adf8743afaadab7f84b59c commit 2c07a773415bf9a812adf8743afaadab7f84b59c Author: Alexander V. Chernikov AuthorDate: 2022-08-11 09:46:28 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-01-13 21:18:27 +0000 routing: fix build warning without ROUTE_MPATH Reported by: Gary Jennejohn MFC after: 1 month (cherry picked from commit 258828d03b9f8414043c112fab97e9e9730560dc) --- sys/net/route/route_ctl.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/net/route/route_ctl.c b/sys/net/route/route_ctl.c index 34b00a0b82ce..1b7bcde7594f 100644 --- a/sys/net/route/route_ctl.c +++ b/sys/net/route/route_ctl.c @@ -82,9 +82,11 @@ static int change_route_byinfo(struct rib_head *rnh, struct rtentry *rt, static int add_route_flags(struct rib_head *rnh, struct rtentry *rt, struct route_nhop_data *rnd_add, int op_flags, struct rib_cmd_info *rc); +#ifdef ROUTE_MPATH static int add_route_flags_mpath(struct rib_head *rnh, struct rtentry *rt, struct route_nhop_data *rnd_add, struct route_nhop_data *rnd_orig, int op_flags, struct rib_cmd_info *rc); +#endif static int add_route(struct rib_head *rnh, struct rtentry *rt, struct route_nhop_data *rnd, struct rib_cmd_info *rc); @@ -783,6 +785,7 @@ out: return (error); } +#ifdef ROUTE_MPATH static int add_route_flags_mpath(struct rib_head *rnh, struct rtentry *rt, struct route_nhop_data *rnd_add, struct route_nhop_data *rnd_orig, @@ -826,6 +829,7 @@ add_route_flags_mpath(struct rib_head *rnh, struct rtentry *rt, return (0); } +#endif /* * Removes route defined by @info from the kernel table specified by @fibnum and