Development discussion of WireGuard
 help / color / mirror / Atom feed
From: Joseph Mingrone <jrm@FreeBSD.org>
To: wireguard@lists.zx2c4.com
Cc: decke@freebsd.org, mad@madpilot.net, Joseph Mingrone <jrm@FreeBSD.org>
Subject: [PATCH] compat: Update version to handle sbcreatecontrol() changes
Date: Tue, 14 Jun 2022 16:15:26 -0300	[thread overview]
Message-ID: <20220614191526.70200-1-jrm@FreeBSD.org> (raw)

The sockbuf changes to merge two versions of sbcreatecontrol() into one
occurred in b46667c63eb7 in the FreeBSD src repository.  The value of
__FreeBSD_version at the time of that commit was 1400059, so check
for systems with a version stamp less than 1400059.

Ideally __FreeBSD_version would have been bumped in b46667c63eb7,
however it was set to 1400059 53 commits prior in 3a9a9c0ca44e and not
bumped to 1400060 until 374 commits later in 85d7875d4291.  Thus, this
is not a perfect solution because CURRENT systems built from 53 possible
commits that require the adjustment will still fail to build the
wireguard kernel module.  This is better than checking for systems with
__FreeBSD_version < 1400057.  In that case, there are 767 different
commits a CURRENT system may be built from where the module will fail to
build.

Sponsored by:	The FreeBSD Foundation
---
 src/compat.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/compat.h b/src/compat.h
index 8567524..d55c628 100644
--- a/src/compat.h
+++ b/src/compat.h
@@ -24,7 +24,7 @@
 #define COMPAT_NEED_BLAKE2S
 #endif
 
-#if __FreeBSD_version < 1400057
+#if __FreeBSD_version < 1400059
 #include <sys/sockbuf.h>
 #define sbcreatecontrol(a, b, c, d, e) sbcreatecontrol(a, b, c, d)
 #endif
-- 
2.36.1


             reply	other threads:[~2022-06-14 19:15 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-14 19:15 Joseph Mingrone [this message]
2022-06-14 19:59 ` 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=20220614191526.70200-1-jrm@FreeBSD.org \
    --to=jrm@freebsd.org \
    --cc=decke@freebsd.org \
    --cc=mad@madpilot.net \
    --cc=wireguard@lists.zx2c4.com \
    --subject='Re: [PATCH] compat: Update version to handle sbcreatecontrol() changes' \
    /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

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).