From: Qingfang Deng <redacted>
Date: Tue, 4 Aug 2026 10:56:32 +0000 (+0800)
Subject: ovpn-dco: fix build on 6.18.40
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=37cd414b63fe019952b5f1c057ad3018f50a5bd1;p=openwrt-packages.git

ovpn-dco: fix build on 6.18.40

6.18.40 commit 073d95725269 changed the prototype of proto::recvmsg.
Update the ifdef.

Signed-off-by: Qingfang Deng <redacted>
---

diff --git a/kernel/ovpn-dco/Makefile b/kernel/ovpn-dco/Makefile
index 851cb6750..f11ab23e0 100644
--- a/kernel/ovpn-dco/Makefile
+++ b/kernel/ovpn-dco/Makefile
@@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=ovpn-backports
 PKG_VERSION:=7.1.0.2026070800
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:= \
diff --git a/kernel/ovpn-dco/patches/0002-fix-build-on-6.18.40.patch b/kernel/ovpn-dco/patches/0002-fix-build-on-6.18.40.patch
new file mode 100644
index 000000000..3e844026c
--- /dev/null
+++ b/kernel/ovpn-dco/patches/0002-fix-build-on-6.18.40.patch
@@ -0,0 +1,23 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: Qingfang Deng <dqfext@gmail.com>
+Date: Sun, 2 Aug 2026 19:17:55 +0800
+Subject: [PATCH] fix build on 6.18.40
+
+6.18.40 commit 073d95725269 changed the prototype of proto::recvmsg.
+Update the ifdef.
+---
+ drivers/net/ovpn/tcp.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/drivers/net/ovpn/tcp.c
++++ b/drivers/net/ovpn/tcp.c
+@@ -167,6 +167,9 @@ err_nopeer:
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(5, 19, 0)
+ static int ovpn_tcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,
+ 			    int noblock, int flags, int *addr_len)
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(6, 18, 40) && LINUX_VERSION_CODE < KERNEL_VERSION(6, 19, 0)
++static int ovpn_tcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,
++			    int flags)
+ #elif LINUX_VERSION_CODE < KERNEL_VERSION(7, 1, 0)
+ static int ovpn_tcp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len,
+ 			    int flags, int *addr_len)