Skip to content
Snippets Groups Projects
Verified Commit 8ec662e6 authored by Josef Schlehofer's avatar Josef Schlehofer
Browse files

patches/openwrt: wireguard: update to version 1.0.20220627

This bump fixes breakage introduced by recent kernel update.

Fixes: 4e7b8f0e ("patches/openwrt:
kernel: update to version 4.14.285")
parent 9c4f49a5
Branches
Tags
No related merge requests found
From 357531577376c79f17a3d69d1fb3e1511b040847 Mon Sep 17 00:00:00 2001
From: Josef Schlehofer <pepe.schlehofer@gmail.com>
Date: Thu, 30 Jun 2022 14:57:52 +0200
Subject: [PATCH] wireguard: bump to 1.0.20220627
Signed-off-by: Josef Schlehofer <pepe.schlehofer@gmail.com>
---
package/network/services/wireguard/Makefile | 6 +++---
...-kernel-compile-skb_mark_not_on_list.patch | 21 -------------------
2 files changed, 3 insertions(+), 24 deletions(-)
delete mode 100644 package/network/services/wireguard/patches/001-kernel-compile-skb_mark_not_on_list.patch
diff --git a/package/network/services/wireguard/Makefile b/package/network/services/wireguard/Makefile
index fc546e3e8c..adbe29ea2d 100644
--- a/package/network/services/wireguard/Makefile
+++ b/package/network/services/wireguard/Makefile
@@ -11,12 +11,12 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=wireguard
-PKG_VERSION:=1.0.20200611
-PKG_RELEASE:=2
+PKG_VERSION:=1.0.20220627
+PKG_RELEASE:=1
PKG_SOURCE:=wireguard-linux-compat-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://git.zx2c4.com/wireguard-linux-compat/snapshot/
-PKG_HASH:=9b0478c3b1f3a7b488916e632e2fcbb1383bb1a2ef294489858ce2ba1da3246d
+PKG_HASH:=362d412693c8fe82de00283435818d5c5def7f15e2433a07a9fe99d0518f63c0
PKG_LICENSE:=GPL-2.0
PKG_LICENSE_FILES:=COPYING
diff --git a/package/network/services/wireguard/patches/001-kernel-compile-skb_mark_not_on_list.patch b/package/network/services/wireguard/patches/001-kernel-compile-skb_mark_not_on_list.patch
deleted file mode 100644
index ad051b7c03..0000000000
--- a/package/network/services/wireguard/patches/001-kernel-compile-skb_mark_not_on_list.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 1bb90881971c226d45c0abd1ac16ce3d6b77fc5f Mon Sep 17 00:00:00 2001
-From: "Jason A. Donenfeld" <Jason@zx2c4.com>
-Date: Sun, 24 Jan 2021 14:09:09 +0100
-Subject: compat: skb_mark_not_on_list was backported to 4.14
-
-Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
----
- src/compat/compat.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/src/compat/compat.h
-+++ b/src/compat/compat.h
-@@ -826,7 +826,7 @@ static __always_inline void old_rcu_barr
- #define COMPAT_CANNOT_DEPRECIATE_BH_RCU
- #endif
-
--#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 10) && !defined(ISRHEL8) && !defined(ISOPENSUSE15)
-+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 19, 10) && LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0) && !defined(ISRHEL8)) || LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 217)
- static inline void skb_mark_not_on_list(struct sk_buff *skb)
- {
- skb->next = NULL;
--
2.34.1
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment