openbsd/src
1
0
Fork 0
mirror of https://github.com/openbsd/src.git synced 2026-04-28 08:07:03 +00:00
Code Issues Projects Releases Wiki Activity

sigh, committed the wrong version of the pf_test in code. unbreak build.

Browse Source
This commit is contained in:
dlg
2025-11-26 02:13:54 +00:00
parent 3a5ac944e1
commit 4013668b64
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
sys/net/if_veb.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: if_veb.c,v 1.57 2025/11/26 01:43:56 dlg Exp $ */
/* $OpenBSD: if_veb.c,v 1.58 2025/11/26 02:13:54 dlg Exp $ */
/*
* Copyright (c) 2021 David Gwynne <dlg@openbsd.org>
@@ -1251,7 +1251,7 @@ veb_port_input(struct ifnet *ifp0, struct mbuf *m, uint64_t dst, void *brport,
goto drop;
#if NPF > 0
if (ISSET(ifp->if_flags, IFF_LINK1) && p->p_pvid == ctx->vs &&
if (ISSET(ifp->if_flags, IFF_LINK1) && p->p_pvid == ctx.vs &&
(m = veb_pf(ifp0, PF_IN, m, ctx.ns)) == NULL)
return (NULL);
#endif
@@ -3354,6 +3354,7 @@ static int
vport_if_enqueue(struct ifnet *ifp, struct mbuf *m, struct netstack *ns)
{
uint16_t csum;
int rv = 0;
/*
* switching an l2 packet toward a vport means pushing it
@@ -3373,9 +3374,22 @@ vport_if_enqueue(struct ifnet *ifp, struct mbuf *m, struct netstack *ns)
SET(csum, M_ICMP_CSUM_IN_OK);
m->m_pkthdr.csum_flags = csum;
if_vinput(ifp, m, ns);
if (ns != NULL) {
/* this is already running in a softnet context */
if_vinput(ifp, m, ns);
} else {
/* move the packet to a softnet context for processing */
struct ifiqueue *ifiq;
unsigned int flow = 0;
return (0);
if (ISSET(m->m_pkthdr.csum_flags, M_FLOWID))
flow = m->m_pkthdr.ph_flowid;
ifiq = ifp->if_iqs[flow % ifp->if_niqs];
rv = ifiq_enqueue_qlim(ifiq, m, 8192);
}
return (rv);
}
static int