From nobody Fri Jul 05 15:14:23 2024 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 4WFxrH2D1tz5Pg85; Fri, 05 Jul 2024 15:14:23 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WFxrH1hG5z4GY6; Fri, 5 Jul 2024 15:14:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720192463; 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=XZyekaBCeuTNwFS7fJsgA5xgLYAzHGSrGBPOCoLMjyg=; b=XmmjaIudgmUlk+Bm1BzgmKbe65FPc25lZahKRpQbFHT4vca//ZuCK5lBfvsAGebf2j6fOB B31NlxTTjZMtx9bADm3xJPEhqL/Dl1bchhR5C/zZUL27rYjx/rzmiLFCJSqlhn3/OyBuO4 5Ycl3zArux+6mopsnblb8kFBurQwVNdUrlcMwEpZJDCTJijw+TGBOYCnMG6tWETm52CU5Q Plh09v1M4fI+SZsSD2mSSyWoGdGxZt3Bm6oNOc6OnHzNJcNf/16HGvBN6oDoKrkbE5sguN 3+el4cPrgCrU4YNlpZw/UcVrBkFdtMSyTJ+tUc/iLOYS+cezA38j36hsUnsSVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720192463; a=rsa-sha256; cv=none; b=PyfThwSXp724x4+/65C/y2b6/KYH4i8kAXS/xMaRoB66ZFJNUF5jf+GWioYu9HTYHyVNQt uMEj4TAmQ5293DKlcd692MO8S88+671t+k4N2IBkoLIw2db9vhj/k3+PoYmq5SjzYN3/Vj 22gzR0LektU1YWVgo7EL6N69mlkSUyQZDkmDFnl7LCjYdrgXkJ3N3t0AkOQfT4XlWSdu4/ xED74Zu4fZINfBbgawhNEIKxmsALeda/ts4AcYNvAlD48cUzGdFZBqcxknTAAyJcvFZ+u3 U0plum4+Uuvf0cjH1tRLAzpVNBXnAval6ak66nQbrOMXMfUUhtcixwhJt0xRag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720192463; 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=XZyekaBCeuTNwFS7fJsgA5xgLYAzHGSrGBPOCoLMjyg=; b=SILcREYE+dyP0HQ0NhjvzUyHRG93ubILZ25YIVdCuO8iyLjLr/I5M6Dqij3mmSIYSmCemv j8PhsvtLsfOH9lI8acRJRPsQxa95A9S9Fl+CCHnXOJhOXRUU0SuKVs4EmgDI+kY4nHHhZu rsP4ymQTUK5DQ1jPf9VDpebyBGJGJeTuj+NP9ZgOdtpWKryyReimj0OxZ258nu8uvKFk7I 0iGxrAdHUwuxlerXo0nHTOM+sjp6nzJqFnwD/nB/hDdKWjoVY3C/0RJzP82iet/xa6YoeP o3kZCCTHD7O+K5K2BdupM0zxx43tpPTIfaTSQrMCW8E2Wid+yFoUHz3jbuDzQw== 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 4WFxrH1GpFz123F; Fri, 5 Jul 2024 15:14:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 465FENOc098905; Fri, 5 Jul 2024 15:14:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 465FENsc098902; Fri, 5 Jul 2024 15:14:23 GMT (envelope-from git) Date: Fri, 5 Jul 2024 15:14:23 GMT Message-Id: <202407051514.465FENsc098902@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: bd3696bdb24a - stable/14 - ip_mroute: Use NET_EPOCH_WAIT() macro 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: bd3696bdb24ac349acb413a850208aff1ed3da81 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=bd3696bdb24ac349acb413a850208aff1ed3da81 commit bd3696bdb24ac349acb413a850208aff1ed3da81 Author: Zhenlei Huang AuthorDate: 2024-06-24 09:57:14 +0000 Commit: Zhenlei Huang CommitDate: 2024-07-05 15:11:51 +0000 ip_mroute: Use NET_EPOCH_WAIT() macro This makes it easier to grep the usage. Reviewed by: kp MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D45715 (cherry picked from commit 08a98731ddf4459bcee25074bdbc21d6fa5ce4ca) --- sys/netinet/ip_mroute.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c index cda5f160e8fb..f438ec5b45ea 100644 --- a/sys/netinet/ip_mroute.c +++ b/sys/netinet/ip_mroute.c @@ -766,7 +766,7 @@ X_ip_mrouter_done(void) * Wait for all epoch sections to complete to ensure * V_ip_mrouter = NULL is visible to others. */ - epoch_wait_preempt(net_epoch_preempt); + NET_EPOCH_WAIT(); /* Stop and drain task queue */ taskqueue_block(V_task_queue);