From owner-svn-src-all@freebsd.org Fri Feb 1 09:18:46 2019 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1079614C4F46; Fri, 1 Feb 2019 09:18:46 +0000 (UTC) (envelope-from hselasky@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) server-signature RSA-PSS (4096 bits) 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 A9237833B7; Fri, 1 Feb 2019 09:18:45 +0000 (UTC) (envelope-from hselasky@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 A04621CE1C; Fri, 1 Feb 2019 09:18:45 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x119IjQN017090; Fri, 1 Feb 2019 09:18:45 GMT (envelope-from hselasky@FreeBSD.org) Received: (from hselasky@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x119IjP1017088; Fri, 1 Feb 2019 09:18:45 GMT (envelope-from hselasky@FreeBSD.org) Message-Id: <201902010918.x119IjP1017088@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: hselasky set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky Date: Fri, 1 Feb 2019 09:18:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r343651 - stable/12/sys/netinet6 X-SVN-Group: stable-12 X-SVN-Commit-Author: hselasky X-SVN-Commit-Paths: stable/12/sys/netinet6 X-SVN-Commit-Revision: 343651 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: A9237833B7 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.94 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.95)[-0.945,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-0.999,0] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 01 Feb 2019 09:18:46 -0000 Author: hselasky Date: Fri Feb 1 09:18:44 2019 New Revision: 343651 URL: https://svnweb.freebsd.org/changeset/base/343651 Log: Build fix for missing NET_EPOCH_XXX() dependencies after r343650. This patch is to be reverted when the relevant changes are MFC'ed. This is a direct commit. Sponsored by: Mellanox Technologies Modified: stable/12/sys/netinet6/in6_mcast.c stable/12/sys/netinet6/in6_var.h stable/12/sys/netinet6/mld6.c Modified: stable/12/sys/netinet6/in6_mcast.c ============================================================================== --- stable/12/sys/netinet6/in6_mcast.c Fri Feb 1 09:08:19 2019 (r343650) +++ stable/12/sys/netinet6/in6_mcast.c Fri Feb 1 09:18:44 2019 (r343651) @@ -420,9 +420,9 @@ in6_getmulti(struct ifnet *ifp, const struct in6_addr IN6_MULTI_LOCK_ASSERT(); IN6_MULTI_LIST_LOCK(); IF_ADDR_WLOCK(ifp); - NET_EPOCH_ENTER(et); + NET_EPOCH_ENTER_ET(et); inm = in6m_lookup_locked(ifp, group); - NET_EPOCH_EXIT(et); + NET_EPOCH_EXIT_ET(et); if (inm != NULL) { /* Modified: stable/12/sys/netinet6/in6_var.h ============================================================================== --- stable/12/sys/netinet6/in6_var.h Fri Feb 1 09:08:19 2019 (r343650) +++ stable/12/sys/netinet6/in6_var.h Fri Feb 1 09:18:44 2019 (r343651) @@ -722,8 +722,6 @@ static __inline struct in6_multi * in6m_ifmultiaddr_get_inm(struct ifmultiaddr *ifma) { - NET_EPOCH_ASSERT(); - return ((ifma->ifma_addr->sa_family != AF_INET6 || (ifma->ifma_flags & IFMA_F_ENQUEUED) == 0) ? NULL : ifma->ifma_protospec); Modified: stable/12/sys/netinet6/mld6.c ============================================================================== --- stable/12/sys/netinet6/mld6.c Fri Feb 1 09:08:19 2019 (r343650) +++ stable/12/sys/netinet6/mld6.c Fri Feb 1 09:18:44 2019 (r343651) @@ -556,7 +556,7 @@ mld_ifdetach(struct ifnet *ifp, struct in6_multi_head * Extract list of in6_multi associated with the detaching ifp * which the PF_INET6 layer is about to release. */ - NET_EPOCH_ENTER(et); + NET_EPOCH_ENTER_ET(et); CK_STAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) { inm = in6m_ifmultiaddr_get_inm(ifma); if (inm == NULL) @@ -576,7 +576,7 @@ mld_ifdetach(struct ifnet *ifp, struct in6_multi_head } } } - NET_EPOCH_EXIT(et); + NET_EPOCH_EXIT_ET(et); IF_ADDR_WUNLOCK(ifp); MLD_UNLOCK(); } @@ -1411,7 +1411,7 @@ mld_fasttimo_vnet(struct in6_multi_head *inmh) } IF_ADDR_WLOCK(ifp); - NET_EPOCH_ENTER(et); + NET_EPOCH_ENTER_ET(et); CK_STAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) { inm = in6m_ifmultiaddr_get_inm(ifma); if (inm == NULL) @@ -1449,7 +1449,7 @@ mld_fasttimo_vnet(struct in6_multi_head *inmh) mld_dispatch_queue(&scq, 0); break; } - NET_EPOCH_EXIT(et); + NET_EPOCH_EXIT_ET(et); } out_locked: @@ -1685,7 +1685,7 @@ mld_v2_cancel_link_timers(struct mld_ifsoftc *mli) ifp = mli->mli_ifp; IF_ADDR_WLOCK(ifp); - NET_EPOCH_ENTER(et); + NET_EPOCH_ENTER_ET(et); CK_STAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) { inm = in6m_ifmultiaddr_get_inm(ifma); if (inm == NULL) @@ -1721,7 +1721,7 @@ mld_v2_cancel_link_timers(struct mld_ifsoftc *mli) break; } } - NET_EPOCH_EXIT(et); + NET_EPOCH_EXIT_ET(et); IF_ADDR_WUNLOCK(ifp); in6m_release_list_deferred(&inmh); }