From owner-svn-src-head@freebsd.org Sat Oct 3 14:37:54 2020 Return-Path: Delivered-To: svn-src-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id D8ABF430320; Sat, 3 Oct 2020 14:37:54 +0000 (UTC) (envelope-from melifaro@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4C3Twy5QJcz4Qlq; Sat, 3 Oct 2020 14:37:54 +0000 (UTC) (envelope-from melifaro@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9D4E714E08; Sat, 3 Oct 2020 14:37:54 +0000 (UTC) (envelope-from melifaro@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 093EbsDX076579; Sat, 3 Oct 2020 14:37:54 GMT (envelope-from melifaro@FreeBSD.org) Received: (from melifaro@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 093EbsMM076578; Sat, 3 Oct 2020 14:37:54 GMT (envelope-from melifaro@FreeBSD.org) Message-Id: <202010031437.093EbsMM076578@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: melifaro set sender to melifaro@FreeBSD.org using -f From: "Alexander V. Chernikov" Date: Sat, 3 Oct 2020 14:37:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r366398 - in head/sys/net: . route X-SVN-Group: head X-SVN-Commit-Author: melifaro X-SVN-Commit-Paths: in head/sys/net: . route X-SVN-Commit-Revision: 366398 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 03 Oct 2020 14:37:54 -0000 Author: melifaro Date: Sat Oct 3 14:37:54 2020 New Revision: 366398 URL: https://svnweb.freebsd.org/changeset/base/366398 Log: Remove ROUTE_MPATH-related warnings introduced in r366390. Reported by: mjg Modified: head/sys/net/route/route_ctl.c head/sys/net/rtsock.c Modified: head/sys/net/route/route_ctl.c ============================================================================== --- head/sys/net/route/route_ctl.c Sat Oct 3 14:01:20 2020 (r366397) +++ head/sys/net/route/route_ctl.c Sat Oct 3 14:37:54 2020 (r366398) @@ -91,7 +91,9 @@ static void rib_notify(struct rib_head *rnh, enum rib_ struct rib_cmd_info *rc); static void destroy_subscription_epoch(epoch_context_t ctx); +#ifdef ROUTE_MPATH static bool rib_can_multipath(struct rib_head *rh); +#endif /* Per-vnet multipath routing configuration */ SYSCTL_DECL(_net_route); Modified: head/sys/net/rtsock.c ============================================================================== --- head/sys/net/rtsock.c Sat Oct 3 14:01:20 2020 (r366397) +++ head/sys/net/rtsock.c Sat Oct 3 14:37:54 2020 (r366398) @@ -847,6 +847,7 @@ update_rtm_from_rc(struct rt_addrinfo *info, struct rt return (0); } +#ifdef ROUTE_MPATH static void save_del_notification(struct rib_cmd_info *rc, void *_cbdata) { @@ -864,6 +865,7 @@ save_add_notification(struct rib_cmd_info *rc, void *_ if (rc->rc_cmd == RTM_ADD) *rc_new = *rc; } +#endif /*ARGSUSED*/ static int