mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-06-14 05:49:57 +00:00
Code Issues Projects Releases Wiki Activity

wireguard: fix build issue with updated 5.4 kernel

Browse Source 
error: static declaration of 'icmp_ndo_send' follows non-static declaration
 |   959 | static inline void icmp_ndo_send(struct sk_buff *skb_in, int type, int code, __be32 info)
 |       |                    ^~~~~~~~~~~~~

Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Armin Kuster
2021-04-04 03:09:16 +00:00
parent 76174f4654
commit 430ef96fe6
2 changed files with 34 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta-networking/recipes-kernel/wireguard/files/0001-compat-icmp_ndo_send-functions-were-backported-exten.patch
+32
View File
@@ -0,0 +1,32 @@
From 122f06bfd8fc7b06a0899fa9adc4ce8e06900d98 Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Sun, 7 Mar 2021 08:14:33 -0700
Subject: [PATCH] compat: icmp_ndo_send functions were backported extensively
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Upstream-Status: Backport
Fixes build with 5.4.103 update.
/include/linux/icmpv6.h:56:6: note: previous declaration of 'icmpv6_ndo_send' was here
| 56 | void icmpv6_ndo_send(struct sk_buff *skb_in, u8 type, u8 code, __u32 info);
Signed-of-by: Armin Kuster <akuster808@gmail.com>
---
src/compat/compat.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: src/compat/compat.h
===================================================================
--- src.orig/compat/compat.h
+++ src/compat/compat.h
@@ -946,7 +946,7 @@ static inline int skb_ensure_writable(st
}
#endif
-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 6, 0)
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(5, 6, 0) && LINUX_VERSION_CODE >= KERNEL_VERSION(5, 5, 0)) || (LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 102) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 20, 0)) || (LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 178) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)) || (LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 223) && LINUX_VERSION_CODE > KERNEL_VERSION(4, 10, 0)) || LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 259) || defined(ISRHEL8) || defined(ISUBUNTU1804)
#if IS_ENABLED(CONFIG_NF_NAT)
#include <linux/ip.h>
#include <linux/icmpv6.h>
meta-networking/recipes-kernel/wireguard/wireguard-module_1.0.20200401.bb
+2 -1
View File
@@ -3,7 +3,8 @@ require wireguard.inc
SRCREV = "43f57dac7b8305024f83addc533c9eede6509129"
SRC_URI = "git://git.zx2c4.com/wireguard-linux-compat \
file://0001-compat-SYM_FUNC_-START-END-were-backported-to-5.4.patch"
file://0001-compat-SYM_FUNC_-START-END-were-backported-to-5.4.patch \
file://0001-compat-icmp_ndo_send-functions-were-backported-exten.patch "
inherit module kernel-module-split