git: 13b1d6f0c934 - main - if_ovpn: avoid netisr_queue name conflicts

The branch main has been updated by kp:

URL: https://cgit.FreeBSD.org/src/commit/?id=13b1d6f0c934e61736c2520df391e003b9fecd6a

commit 13b1d6f0c934e61736c2520df391e003b9fecd6a
Author:     Kristof Provost <kp@FreeBSD.org>
AuthorDate: 2022-10-24 18:45:39 +0000
Commit:     Kristof Provost <kp@FreeBSD.org>
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);