From nobody Wed Dec 28 15:31:36 2022 X-Original-To: dev-commits-src-main@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 4NhwVJ4T7pz2cBdd; Wed, 28 Dec 2022 15:31:36 +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 4NhwVJ3p4cz3kj0; Wed, 28 Dec 2022 15:31:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672241496; 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=ZN+dUgSHn2m3hS+SLdBGHC3ATDevVa/1du2ExSOuaQg=; b=rYh2EWhDWHRkb8HJoih44bUPwKfh17A2ZPJ+HiAXWQHqq1yDFln/Bp9rYv4/HY9nlpcraL 0hBU+ptUa35lzo0QkV8rVqcfY9xs16ZTwl38QdiyYbg3gGseRJKs9YluI4zXTblYUQQ2Ae MnOdztDjNQ6t9ui7RsXCw1PFSR2jq/FKk7Z57RMXtT1XHrWcFrlt87CZX1sPCiTtb/Imup DoD3fxN21qGiPKexSurOJ6E3WfUKzUGeb5dEYvDbb/+F2YdCNidUebI+CNgLBgG0GMCRQZ ikMkw29FPo1vVMTJ8KLAXXZMdewigrUEIrxwUA3E77+covWwFL0feeJUrHr8cg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672241496; 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=ZN+dUgSHn2m3hS+SLdBGHC3ATDevVa/1du2ExSOuaQg=; b=K0+ycAqp5DJ1pSVo89XVwo+cbrHZQND1JJL35iac8lf1tszFDyGrdebk90AmvYfhvtwMjF AgImRfzHGcyPwFHiHwt3ysK2hR6AYUQma83EmJVR9MNq78tQIn1q10+7gwiYQKu5CDoREO uer5bL/Vf5cVVbcxqf7z2jOzsiYoXBt4ocF6i2XfboVIjnyys1jQ3MI4NkuW+AM1g2ysgO MMTek4yJc/EED+XZDJXQ6QxnwLbHOwX1qYocHzdUaSXkmjKlg0xaIQg/hIGBdaQzn+NV/e sm//RY12RV7pCrU8ZvCwOSncQxeNqdEAQMn13Dkk54L7RSgV3/25xneZaGZFZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672241496; a=rsa-sha256; cv=none; b=VJmyFd5k/xRJXC3n6cPmwF3QkYRAH5rGtgbJWTyRqTdFJIuR44wCVfU/xjgHhE65560WEx 5vwX7HDkm47Y6B5SajhRkA/5AkxNDM1iMiuXFabHn07b5SXtWGKDsJvKEzwxfAdfcNjtQV nMwHD2fLgsiNIkML1+sYFh91T+RjKCNBBEiKdYFbzhH63WmUqp4McBsIWi65dXzdb6C5cl AaK1EZwto7l8zHs0tzKeG1HkcX6l+//me/fLkiap8qpC7MMP8qKRxiBqpDcP/X+o8YOX3C Ymy9Se9fu7N0guxheF6DS4PhcSSpL6peLGgY6ooNIKJ8oL//pVm3cTZQ+k84ug== 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 4NhwVJ2rwMzvDq; Wed, 28 Dec 2022 15:31:36 +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 2BSFVaqE018105; Wed, 28 Dec 2022 15:31:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BSFVabY018104; Wed, 28 Dec 2022 15:31:36 GMT (envelope-from git) Date: Wed, 28 Dec 2022 15:31:36 GMT Message-Id: <202212281531.2BSFVabY018104@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Zhenlei Huang Subject: git: f948cb717f50 - main - wg: Use NET_EPOCH_DRAIN_CALLBACKS macro List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: f948cb717f50f3f53e0f76d9eb2bd36bc278cb3b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=f948cb717f50f3f53e0f76d9eb2bd36bc278cb3b commit f948cb717f50f3f53e0f76d9eb2bd36bc278cb3b Author: Zhenlei Huang AuthorDate: 2022-12-28 15:28:15 +0000 Commit: Zhenlei Huang CommitDate: 2022-12-28 15:28:15 +0000 wg: Use NET_EPOCH_DRAIN_CALLBACKS macro Reviewed by: jhb, kp Approved by: kp (mentor) Differential Revision: https://reviews.freebsd.org/D37734 --- sys/dev/wg/if_wg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/wg/if_wg.c b/sys/dev/wg/if_wg.c index dba4c88601cd..ac85386794c7 100644 --- a/sys/dev/wg/if_wg.c +++ b/sys/dev/wg/if_wg.c @@ -2842,7 +2842,7 @@ wg_clone_destroy(struct ifnet *ifp) taskqgroup_drain_all(qgroup_wg_tqg); sx_xlock(&sc->sc_lock); wg_peer_destroy_all(sc); - epoch_drain_callbacks(net_epoch_preempt); + NET_EPOCH_DRAIN_CALLBACKS(); sx_xunlock(&sc->sc_lock); sx_destroy(&sc->sc_lock); taskqgroup_detach(qgroup_wg_tqg, &sc->sc_handshake);