I confirm this commit, fixes wg for me. Thanks to all!
---------------------------- revision 1.11 date: 2020/07/13 08:29:34; author: tb; state: Exp; lines: +2 -1; commitid: Kt4hgscFLJKqzC1v; Unbreak wg(4). Previous may have fixed the build without pf(4), but broke wireguard in normal kernels: the condition NPF > 0 is false if pf.h is not in scope. On Mon, Jul 13, 2020 at 4:48 AM Theo Buehler <t...@theobuehler.org> wrote: > > login: panic: kernel diagnostic assertion "m->m_pkthdr.pf.statekey == > NULL" > > failed: file "/usr/src/sys/net/pf.c", line 7455 > > Ran into this as well. Should be fixed in the next snap. > https://marc.info/?l=openbsd-tech&m=159462210226639&w=2 > > Index: if_wg.c > =================================================================== > RCS file: /var/cvs/src/sys/net/if_wg.c,v > retrieving revision 1.10 > retrieving revision 1.11 > diff -u -p -r1.10 -r1.11 > --- if_wg.c 12 Jul 2020 18:54:23 -0000 1.10 > +++ if_wg.c 13 Jul 2020 08:29:34 -0000 1.11 > @@ -1,4 +1,4 @@ > -/* $OpenBSD: if_wg.c,v 1.10 2020/07/12 18:54:23 kn Exp $ */ > +/* $OpenBSD: if_wg.c,v 1.11 2020/07/13 08:29:34 tb Exp $ */ > Index: if_wg.c > =================================================================== > RCS file: /var/cvs/src/sys/net/if_wg.c,v > retrieving revision 1.10 > retrieving revision 1.11 > diff -u -p -r1.10 -r1.11 > --- if_wg.c 12 Jul 2020 18:54:23 -0000 1.10 > +++ if_wg.c 13 Jul 2020 08:29:34 -0000 1.11 > @@ -1,4 +1,4 @@Index: if_wg.c > =================================================================== > RCS file: /var/cvs/src/sys/net/if_wg.c,v > retrieving revision 1.10 > retrieving revision 1.11 > diff -u -p -r1.10 -r1.11 > --- if_wg.c 12 Jul 2020 18:54:23 -0000 1.10 > +++ if_wg.c 13 Jul 2020 08:29:34 -0000 1.11 > @@ -1,4 +1,4 @@ > -/* $OpenBSD: if_wg.c,v 1.10 2020/07/12 18:54:23 kn Exp $ */ > +/* $OpenBSD: if_wg.c,v 1.11 2020/07/13 08:29:34 tb Exp $ */ > > /* > * Copyright (C) 2015-2020 Jason A. Donenfeld <ja...@zx2c4.com>. All > Rights Reserved. > @@ -18,6 +18,7 @@ > */ > > #include "bpfilter.h" > +#include "pf.h" > > #include <sys/types.h> > #include <sys/systm.h> > -/* $OpenBSD: if_wg.c,v 1.10 2020/07/12 18:54:23 kn Exp $ */ > +/* $OpenBSD: if_wg.c,v 1.11 2020/07/13 08:29:34 tb Exp $ */ > > /* > * Copyright (C) 2015-2020 Jason A. Donenfeld <ja...@zx2c4.com>. All > Rights Reserved. > @@ -18,6 +18,7 @@ > */ > > #include "bpfilter.h" > +#include "pf.h" > > #include <sys/types.h> > #include <sys/systm.h>Index: if_wg.c > =================================================================== > RCS file: /var/cvs/src/sys/net/if_wg.c,v > retrieving revision 1.10 > retrieving revision 1.11 > diff -u -p -r1.10 -r1.11 > --- if_wg.c 12 Jul 2020 18:54:23 -0000 1.10 > +++ if_wg.c 13 Jul 2020 08:29:34 -0000 1.11 > @@ -1,4 +1,4 @@ > -/* $OpenBSD: if_wg.c,v 1.10 2020/07/12 18:54:23 kn Exp $ */ > +/* $OpenBSD: if_wg.c,v 1.11 2020/07/13 08:29:34 tb Exp $ */ > > /* > * Copyright (C) 2015-2020 Jason A. Donenfeld <ja...@zx2c4.com>. All > Rights Reserved. > @@ -18,6 +18,7 @@ > */ > > #include "bpfilter.h" > +#include "pf.h" > > #include <sys/types.h> > #include <sys/systm.h> > /* > * Copyright (C) 2015-2020 Jason A. Donenfeld <ja...@zx2c4.com>. All > Rights Reserved. > @@ -18,6 +18,7 @@ > */Index: if_wg.c > =================================================================== > RCS file: /var/cvs/src/sys/net/if_wg.c,v > retrieving revision 1.10 > retrieving revision 1.11 > diff -u -p -r1.10 -r1.11 > --- if_wg.c 12 Jul 2020 18:54:23 -0000 1.10 > +++ if_wg.c 13 Jul 2020 08:29:34 -0000 1.11 > @@ -1,4 +1,4 @@ > -/* $OpenBSD: if_wg.c,v 1.10 2020/07/12 18:54:23 kn Exp $ */ > +/* $OpenBSD: if_wg.c,v 1.11 2020/07/13 08:29:34 tb Exp $ */ > > /* > * Copyright (C) 2015-2020 Jason A. Donenfeld <ja...@zx2c4.com>. All > Rights Reserved. > @@ -18,6 +18,7 @@ > */ > > #include "bpfilter.h" > +#include "pf.h" > > #include <sys/types.h> > #include <sys/systm.h> > > #include "bpfilter.h" > +#include "pf.h" > > #include <sys/types.h> > #include <sys/systm.h> >
