From: Evilham <contact@evilham.com>
To: wireguard@lists.zx2c4.com
Subject: [PATCH] Fix build on FreeBSD 13 after removal from base
Date: Thu, 18 Mar 2021 22:02:19 +0100 [thread overview]
Message-ID: <75ddd07a-8d31-4938-8480-540f1996c9ad@yggdrasil.evilham.com> (raw)
\o Hello,
noticed that after if_wg removal from stable/13 following patch is
needed for compiling the module.
I'm currently lacking a 14/CURRENT machine to assert that the
module compiles with these changes, but from checking the branch,
it looks like these definitions are there already, I wouldn't
think versions pre-13 should be affected by this.
Cheers and thank you for the efforts and... handling of things.
---
src/compat.h | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/compat.h b/src/compat.h
index 6126e26..bc29c01 100644
--- a/src/compat.h
+++ b/src/compat.h
@@ -7,6 +7,9 @@
*/
#include <sys/param.h>
+#if __FreeBSD_version < 1400000
+#include <sys/smp.h>
+#include <sys/gtaskqueue.h>
#if __FreeBSD_version < 1300000
#define VIMAGE
@@ -18,8 +21,6 @@
#include <sys/malloc.h>
#include <sys/proc.h>
#include <sys/lock.h>
-#include <sys/smp.h>
-#include <sys/gtaskqueue.h>
#include <sys/socketvar.h>
#include <sys/protosw.h>
#include <net/vnet.h>
@@ -39,6 +40,7 @@
#undef atomic_load_ptr
#define atomic_load_ptr(p) (*(volatile __typeof(*p) *)(p))
+#endif /* __FreeBSD_version < 1300000 */
struct taskqgroup_cpu {
LIST_HEAD(, grouptask) tgc_tasks;
@@ -67,7 +69,7 @@ static inline void taskqgroup_drain_all(struct
taskqgroup *tqg)
gtaskqueue_drain_all(q);
}
}
-#endif
+#endif /* __FreeBSD_version < 1400000 */
#if __FreeBSD_version < 1202000
static inline uint32_t arc4random_uniform(uint32_t bound)
--
2.30.1
next reply other threads:[~2021-03-19 14:06 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-18 21:02 Evilham [this message]
2021-03-19 17:06 ` Jason A. Donenfeld
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=75ddd07a-8d31-4938-8480-540f1996c9ad@yggdrasil.evilham.com \
--to=contact@evilham.com \
--cc=wireguard@lists.zx2c4.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).