From: Thomas Backlund <tmb@mageia.org>
To: Roman Mamedov <rm@romanrm.net>, "Jason A. Donenfeld" <Jason@zx2c4.com>
Cc: WireGuard mailing list <wireguard@lists.zx2c4.com>
Subject: Re: [ANNOUNCE] wireguard-linux-compat v1.0.20200330 released
Date: Wed, 1 Apr 2020 17:25:57 +0300 [thread overview]
Message-ID: <7535207e-40f4-564b-a2be-05d4fc4e123c@mageia.org> (raw)
In-Reply-To: <20200401174811.5cf6895c@natsu>
[-- Attachment #1: Type: text/plain, Size: 1720 bytes --]
Den 01-04-2020 kl. 15:48, skrev Roman Mamedov:
> On Mon, 30 Mar 2020 18:19:17 -0600
> "Jason A. Donenfeld" <Jason@zx2c4.com> wrote:
>
>> -----BEGIN PGP SIGNED MESSAGE-----
>> Hash: SHA256
>>
>> Hello,
>>
>> A new version, v1.0.20200330, of the backported WireGuard kernel module for
>> 3.10 <= Linux <= 5.5.y has been tagged in the git repository.
> My kernel build for 5.4.29 has failed just now:
>
> In file included from <command-line>:
> ././net/wireguard/compat/compat.h:1029:20: error: redefinition of ‘skb_reset_redirect’
> static inline void skb_reset_redirect(struct sk_buff *skb)
> ^~~~~~~~~~~~~~~~~~
> In file included from ././net/wireguard/compat/compat.h:878,
> from <command-line>:
> ./include/linux/skbuff.h:4538:20: note: previous definition of ‘skb_reset_redirect’ was here
> static inline void skb_reset_redirect(struct sk_buff *skb)
> ^~~~~~~~~~~~~~~~~~
> In file included from <command-line>:
> ././net/wireguard/compat/compat.h: In function ‘skb_reset_redirect’:
> ././net/wireguard/compat/compat.h:1032:2: error: implicit declaration of function ‘skb_reset_tc’; did you mean ‘skb_reserve’? [-Werror=implicit-function-declaration]
> skb_reset_tc(skb);
> ^~~~~~~~~~~~
> skb_reserve
> cc1: some warnings being treated as errors
> scripts/Makefile.build:265: recipe for target 'net/wireguard/main.o' failed
> make[3]: *** [net/wireguard/main.o] Error 1
> scripts/Makefile.build:500: recipe for target 'net/wireguard' failed
> make[2]: *** [net/wireguard] Error 2
>
This is because the skb_reset_redirect() change from 5.6 got backported
in 5.5.14 and 5.4.29, so you need the attached patch
--
Thomas
[-- Attachment #2: net-wireguard-fix-check-for-skb_reset_redirect-backport.patch --]
[-- Type: text/x-patch, Size: 677 bytes --]
Fix skb_reset_redirect() backport version check.
Upstream commit 2c64605b590edadb3fb46d1ec6badb49e940b479 got backported in
stable 5.5.14 and 5.4.29, so we need to adjust the version check.
Signed-off-by: Thomas Backlund <tmb@mageia.org>
--- a/net/wireguard/compat/compat.h
+++ b/net/wireguard/compat/compat.h
@@ -1024,7 +1024,7 @@ out:
#define COMPAT_CANNOT_USE_MAX_MTU
#endif
-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 6, 0)
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 14) && LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0)) || LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 29)
#include <linux/skbuff.h>
static inline void skb_reset_redirect(struct sk_buff *skb)
{
prev parent reply other threads:[~2020-04-04 22:42 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-31 0:19 Jason A. Donenfeld
2020-04-01 12:48 ` Roman Mamedov
2020-04-01 14:25 ` Thomas Backlund [this message]
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=7535207e-40f4-564b-a2be-05d4fc4e123c@mageia.org \
--to=tmb@mageia.org \
--cc=Jason@zx2c4.com \
--cc=rm@romanrm.net \
--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).