summaryrefslogtreecommitdiffstats
path: root/sys/net/if_mpe.c
diff options
context:
space:
mode:
authorclaudio <claudio@openbsd.org>2019-06-26 08:13:13 +0000
committerclaudio <claudio@openbsd.org>2019-06-26 08:13:13 +0000
commitafacbf8498e9a6aa5c450d98e3fe72cb153250b1 (patch)
treeb5f4fea9829cc41beb6e64df7d6ecaebbf40af79 /sys/net/if_mpe.c
parentadd support for bypassing iommu translation (diff)
downloadwireguard-openbsd-afacbf8498e9a6aa5c450d98e3fe72cb153250b1.tar.xz
wireguard-openbsd-afacbf8498e9a6aa5c450d98e3fe72cb153250b1.zip
The MPLS edge devices get the packets from the MPLS stack which never
passed though pf_test(). So there is no need to try to call pf_pkt_addr_changed() instead just check that the PF statekey is NULL. Initial problem of not including pf.h found by jsg@ OK jsg@ sashan@
Diffstat (limited to 'sys/net/if_mpe.c')
-rw-r--r--sys/net/if_mpe.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/net/if_mpe.c b/sys/net/if_mpe.c
index b037e053038..0cb2242672c 100644
--- a/sys/net/if_mpe.c
+++ b/sys/net/if_mpe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_mpe.c,v 1.93 2019/04/19 07:39:37 dlg Exp $ */
+/* $OpenBSD: if_mpe.c,v 1.94 2019/06/26 08:13:13 claudio Exp $ */
/*
* Copyright (c) 2008 Pierre-Yves Ritschard <pyr@spootnik.org>
@@ -540,9 +540,8 @@ mpe_input(struct ifnet *ifp, struct mbuf *m)
m->m_pkthdr.ph_ifidx = ifp->if_index;
m->m_pkthdr.ph_rtableid = ifp->if_rdomain;
-#if NPF > 0
- pf_pkt_addr_changed(m);
-#endif
+ /* packet has not been processed by PF yet. */
+ KASSERT(m->m_pkthdr.pf.statekey == NULL);
#if NBPFILTER > 0
if (ifp->if_bpf) {