d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

if_ovpn: avoid netisr_queue name conflicts

Browse Source 
Rename the netisr_queue variable in if_ovpn.c to avoid naming conflicts.

Sponsored by:	Rubicon Communications, LLC ("Netgate")
This commit is contained in:
Kristof Provost 2022-10-24 20:45:39 +02:00
parent ef1851fb43
commit 13b1d6f0c9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/net/if_ovpn.c
View File

@ -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);