From nobody Mon Oct 24 18:49:19 2022 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 4Mx3yR65xlz4gSK5; Mon, 24 Oct 2022 18:49:19 +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 4Mx3yR5jCmz3vNC; Mon, 24 Oct 2022 18:49:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666637359; 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=zrqmtQ+I5ylVArb4mBJrqmbQozHty5AcRmAYU80OGA0=; b=VFcNr00RQKpuXpGo7KaBYAmLviJRnPvADYRNkjmxDx56+JiY04HVtem76I26RqM8TDi1G+ fqo3YfJo9xhHRFSy5DdsRhfw1AxY0M11K2LKiEdY8sf1nu+XPbradGvYZAqJwkAp6dCZx9 0fgpdnG0NvH5MQ+msSY23Doi+2R4IqQvn4YZo0HmRM5iQwYCXyEruUGaHBu67l1aZozzWo 3U0LV1zgGFcVDpSzi+6foqy/JrSe+F60+0PXtWqVlesxIuimn418yghsNaE4NHghtABqf7 J6wkRfGf8faUpdD1IVOGCTuDjSDuioTUu8b4BIG2Lqm8oDVPzeHMooLEs2E0Ow== 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 4Mx3yR4n64zKnx; Mon, 24 Oct 2022 18:49:19 +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 29OInJo1026330; Mon, 24 Oct 2022 18:49:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29OInJQk026329; Mon, 24 Oct 2022 18:49:19 GMT (envelope-from git) Date: Mon, 24 Oct 2022 18:49:19 GMT Message-Id: <202210241849.29OInJQk026329@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kristof Provost Subject: git: 13b1d6f0c934 - main - if_ovpn: avoid netisr_queue name conflicts 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: kp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 13b1d6f0c934e61736c2520df391e003b9fecd6a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666637359; 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=zrqmtQ+I5ylVArb4mBJrqmbQozHty5AcRmAYU80OGA0=; b=xQB3aTOfx47iiSPncmOKY6eOjXyDPYAqRn3ydxq5E0TJuv8R+bDW+MwjH8HANksknB7SYE YeVyU+YJG0NpCk82kID4MBrTH/lkCtRTTVrEWRLnJhUIVscjs5TRdBCvLhkJV0fGpOUGbq pgkv7c6pGHgNqn62e00caxMi6G98qLs7rJ1cdXOgqGuE4YvG6U+uSWjJqW4bEaSHaAfofE ummHKWREr5jTwWjhfPX/m3+rDYvJ0/qOLjgLyX2RBHYozDH8Yso8240XEloM0AqpgTBLXt LJp5EqtuhyM14Zk1fOzvCxyZX/SlKodJkAzP1qtuoZnwkFwi74Zlp9lJvh2gKw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666637359; a=rsa-sha256; cv=none; b=IOZ6WT4x7lGsCjuPtr5atEl3HuzL86vVaiTkR7c1QaHJ1VL//sY0eyYvSVOA/tzlYZ/SO7 hKDgzL7XSHQPUVcvjEA1j7UIgrDliIU5SybQt7c3BVD4V8sHGJ+DuqY6DsHWLIkx40dFe5 cCA4zTSqfLtJ3wWy3tuduNrB2ESQKB0UVtVYf3xDn17xfi6W9+xctzcnorCT40HYrMDkqR OH1A7iC83HgKXhnhA+DkwZlPUIfkEDFQlPT72dOmnY9dp0VVtOll9L7AajwDmlFUGvb6sV wQp0kQhxDZKXieGJ8VWaGjBYGVoW/GfzCOVTnULjLYvLnNeJrizA2O5gX8uB6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=13b1d6f0c934e61736c2520df391e003b9fecd6a commit 13b1d6f0c934e61736c2520df391e003b9fecd6a Author: Kristof Provost AuthorDate: 2022-10-24 18:45:39 +0000 Commit: Kristof Provost CommitDate: 2022-10-24 18:45:39 +0000 if_ovpn: avoid netisr_queue name conflicts Rename the netisr_queue variable in if_ovpn.c to avoid naming conflicts. Sponsored by: Rubicon Communications, LLC ("Netgate") --- sys/net/if_ovpn.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/net/if_ovpn.c b/sys/net/if_ovpn.c index 76274fc87159..e3db105a94d2 100644 --- a/sys/net/if_ovpn.c +++ b/sys/net/if_ovpn.c @@ -241,10 +241,10 @@ SYSCTL_INT(_net_link_openvpn, OID_AUTO, async_crypto, CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(async_crypto), 0, "Use asynchronous mode to parallelize crypto jobs."); -VNET_DEFINE_STATIC(int, netisr_queue); -#define V_netisr_queue VNET(netisr_queue) +VNET_DEFINE_STATIC(int, async_netisr_queue); +#define V_async_netisr_queue VNET(async_netisr_queue) SYSCTL_INT(_net_link_openvpn, OID_AUTO, netisr_queue, - CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(netisr_queue), 0, + CTLFLAG_VNET | CTLFLAG_RW, &VNET_NAME(async_netisr_queue), 0, "Use netisr_queue() rather than netisr_dispatch()."); static struct ovpn_kpeer * @@ -1515,7 +1515,7 @@ ovpn_finish_rx(struct ovpn_softc *sc, struct mbuf *m, af = ovpn_get_af(m); if (af != 0) { BPF_MTAP2(sc->ifp, &af, sizeof(af), m); - if (V_netisr_queue) + if (V_async_netisr_queue) netisr_queue(af == AF_INET ? NETISR_IP : NETISR_IPV6, m); else netisr_dispatch(af == AF_INET ? NETISR_IP : NETISR_IPV6, m);