From nobody Wed Jan 11 10:40:00 2023 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 4NsPMN5rwMz2r1Sr; Wed, 11 Jan 2023 10:40:00 +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 4NsPMN57BHz3PHY; Wed, 11 Jan 2023 10:40:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673433600; 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=XF1BUh4myt9g8nqVS72egj3PiRA/cg3Ij0Vos/meqzg=; b=Xjc26ZrXTpMYVttxsZAqP5F5r/eMe4OlTO0t13RIeljQodde3RElH7dDZPFpILd15q1/+E ZhpyqXJ0nNDMD+EAx6ysdGYtNnc48ZsmWmZ6Dtj4p9muHJkrlDlgWb4NSKlalgVTf703SJ 2iodoHA6YVF91Fv0IMIDbDLhhJp05UnZWij76Ks58onBP4HLrlGSReU6t//TJvDCT6ZojD o9RGX3rmkMVo06zKaDrquVywepJWHRs0ZSbEh/Vj1iM56bjNdyjh2oKah6sOy2qiODxP8V P5NQgris5dbX75DD1iQaU2rIwL5ohYB/jCiREn9fvX9SCsC5IkCJ335cL/wjqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673433600; 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=XF1BUh4myt9g8nqVS72egj3PiRA/cg3Ij0Vos/meqzg=; b=s/RUB/x7eC+H3dkmTVIWOxUVFSqs0jAFSBUbMrGe/Dqna9w0oVpBbqXvakyNDig6bsHiB+ W9zt1rxms2iK6r/hzNh4iikLHKeLqbQZZn8lOlC5YqVbSGIAk/nnjSdcBOlgLEw2CU2/Na 9H3JvKwiYnb6nCZrrYXMIQiWw5Om2q8kYLAodjiZ5hMOwg9fsXDSCsiz3SlrSQaczXVV4S TzADxLh4SYATnpMSiuj+l1eVDoOwF7u5h5TrJTIlWL2U2ZV+INIuhQTQQX5eY5+RgZ653k oV7ycXViIVajwO3kr8G1PIyXdLhF2+XuY5ayBwxGh1ByzGNX6UqEX5lBsktJAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673433600; a=rsa-sha256; cv=none; b=bG3N4xKxcMCeWCqrwhc5eSZ4WAn9IY5FKbQF0Dn9Pm4Z8gsjSSEsCH81rr96EvHsPBA0eV LPdsGqWTM460l9kN4y8GGNFO8s0kbXcy8I6Zm6qzI/4nUnBZ8bKVjvoGlgNNsUGg7enk1h 0+LDCh/N4zSDuNf2+ATiJ0ZIkfbDJ7m3N4mWdihlOVcRueV/PBmLGPJi/N6ZzdrLEqeqyK Wj9dXrehPYXLUKtT7OQlb+Xb1LxmSie8JDAxoFwGuYR7PoI9Bhx1o6ltPrtekMXeh4gsE4 +FAh7XpudGe+5O3q1E8biRPRIXHo+Y3i67BYHX93xpLemu7hbopcw76Xpa/gKg== 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 4NsPMN3rQPzl7c; Wed, 11 Jan 2023 10:40:00 +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 30BAe01D068688; Wed, 11 Jan 2023 10:40:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30BAe0hH068668; Wed, 11 Jan 2023 10:40:00 GMT (envelope-from git) Date: Wed, 11 Jan 2023 10:40:00 GMT Message-Id: <202301111040.30BAe0hH068668@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: cd4c0b01cbae - stable/13 - wg: Use NET_EPOCH_DRAIN_CALLBACKS 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: 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: cd4c0b01cbaeb6bfe99f786133ed291a855d7835 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=cd4c0b01cbaeb6bfe99f786133ed291a855d7835 commit cd4c0b01cbaeb6bfe99f786133ed291a855d7835 Author: Zhenlei Huang AuthorDate: 2022-12-28 15:28:15 +0000 Commit: Zhenlei Huang CommitDate: 2023-01-11 10:35:59 +0000 wg: Use NET_EPOCH_DRAIN_CALLBACKS macro Reviewed by: jhb, kp Approved by: kp (mentor) Differential Revision: https://reviews.freebsd.org/D37734 (cherry picked from commit f948cb717f50f3f53e0f76d9eb2bd36bc278cb3b) --- 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 a9acc749bdff..ef4df5c0021e 100644 --- a/sys/dev/wg/if_wg.c +++ b/sys/dev/wg/if_wg.c @@ -2845,7 +2845,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);