From nobody Thu Aug 11 09:47:58 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 4M3MRz142Mz4YrPn; Thu, 11 Aug 2022 09:47:59 +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 4M3MRz0Xj7z3kHh; Thu, 11 Aug 2022 09:47:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660211279; 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=pF46iNaXQ/236MdjgR7ylvaJ6HjyPWlZLvs6A2ZrOo8=; b=mt0L2r97QsebXtTzqI7EGlGm1jlCYcuY76v/o4u62JRrB7CAlVAK9kihH1ZOKNx7jut2cx oXpskkFX9QDOTy+HKGPGZIFD6ABq6R4uY8Za7uQRcziLf4PurEpjWH5jRd57iriGzB6qqb vFTypdNg8Pz7y6ldnoQWXKlPHHgK/NOrBUBNq/p5WDzFf9v2uE323o6mKCaytvoFFi+DrW tX7S9MH4JTLFXR94UtIjRHLacTlMcGcbC2EOKmDP0k5N7FSnha7p2ud+YMrVZfSVprNf6X tkL/tOJrQx4nULoYiPOcoPqqYOjKZF0KtntseUrVn+gQ/dKN+clKkcFiyVQJGw== 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 4M3MRy6XqHzmyq; Thu, 11 Aug 2022 09:47:58 +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 27B9lwCe011416; Thu, 11 Aug 2022 09:47:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27B9lwqw011415; Thu, 11 Aug 2022 09:47:58 GMT (envelope-from git) Date: Thu, 11 Aug 2022 09:47:58 GMT Message-Id: <202208110947.27B9lwqw011415@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: 258828d03b9f - main - 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/main X-Git-Reftype: branch X-Git-Commit: 258828d03b9f8414043c112fab97e9e9730560dc Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660211279; 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=pF46iNaXQ/236MdjgR7ylvaJ6HjyPWlZLvs6A2ZrOo8=; b=HxBM1yhdafCsDBzGvT56KMir8kt+SdU7MBFwvWeTcTB8uRIswJKBKyVLQdBCTQN7xWRGZ3 Xo/bjoM4RzpZQMOkKlj/mSFcARaD4SCNcJBd85HaZeYiYDGsEwORJt2qh0tAe/T8MgtWgW fPWPvzxuWNuxK4R7KW0UtgBBHMuPaBxLYC3O5DnHO/L3WCQU4rkYEf1QIgMR40wqC4eCM1 9wi6CB/ZWFxq/k+pThdVqkw4EGF9uLPaqXdRg6zG7A/7e7kxnud3itBP0fW1vRNlD19ZZM z/COvRhg0bXGWSfJC0zm+OsXCkvCKbaIPFkdtcNd4oxZ/k4abTGrkEfTBYRmqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660211279; a=rsa-sha256; cv=none; b=XBfpiLUt3AOojl2ntVYBVs0wn23kQYvOiDje+mCE/w5uiq7zKVZcN9957q1wmJGg/NVE0n uZaWpnE4I0INN56DfFVcpDUxrRZnwnQ9nrJRs5aK/j/PWMWFXbLC1xQQeSrJXV3ebU0y+9 bvkpurHkcbJ9udoieWJO9owTN/pbQC6WDcEeFu+4kSZxSQp0AUf0moYItcDvMLS/vOiy8R Nssis8OpYgcWjMkfuuNP3BBK1DyJjYLOmxhAUkC99mu0LXl0NdFKiDghDTMlyZ0lAyx5M8 +lBeH+tSOs4L4kZ83jWxn2ON35hiAI8kYMXiGzS1sMKSWM6ZONypaNJFOZbV4Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=258828d03b9f8414043c112fab97e9e9730560dc commit 258828d03b9f8414043c112fab97e9e9730560dc Author: Alexander V. Chernikov AuthorDate: 2022-08-11 09:46:28 +0000 Commit: Alexander V. Chernikov CommitDate: 2022-08-11 09:47:26 +0000 routing: fix build warning without ROUTE_MPATH Reported by: Gary Jennejohn MFC after: 1 month --- 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