From c5f157edddc6f22f85c51dfd1340ff7474f145af Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Mon, 30 Sep 2024 09:07:04 +0200
Subject: [PATCH] Add OpenVPN DCO 6.11 support

---
 ovpn-dco/Makefile                         |  2 +-
 ovpn-dco/patches/900-fix-linux-6.6.patch  | 15 +++++++++++++++
 ovpn-dco/patches/901-fix-linux-6.11.patch |  9 +++++++++
 3 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 ovpn-dco/patches/900-fix-linux-6.6.patch
 create mode 100644 ovpn-dco/patches/901-fix-linux-6.11.patch

diff --git a/ovpn-dco/Makefile b/ovpn-dco/Makefile
index 1a62cf7c2..d41d0b8e3 100644
--- a/ovpn-dco/Makefile
+++ b/ovpn-dco/Makefile
@@ -27,7 +27,7 @@ include $(INCLUDE_DIR)/package.mk
 define KernelPackage/ovpn-dco-v2
   SUBMENU:=Network Support
   TITLE:=OpenVPN data channel offload
-  DEPENDS:=+kmod-crypto-aead +kmod-udptunnel4 +IPV6:kmod-udptunnel6 @!LINUX_6_10 @!LINUX_6_11
+  DEPENDS:=+kmod-crypto-aead +kmod-udptunnel4 +IPV6:kmod-udptunnel6
   FILES:=$(PKG_BUILD_DIR)/drivers/net/ovpn-dco/ovpn-dco-v2.ko
   AUTOLOAD:=$(call AutoLoad,30,ovpn-dco-v2)
 endef
diff --git a/ovpn-dco/patches/900-fix-linux-6.6.patch b/ovpn-dco/patches/900-fix-linux-6.6.patch
new file mode 100644
index 000000000..8d5457da1
--- /dev/null
+++ b/ovpn-dco/patches/900-fix-linux-6.6.patch
@@ -0,0 +1,15 @@
+diff --git a/drivers/net/ovpn-dco/ovpn.c b/drivers/net/ovpn-dco/ovpn.c
+index 66c0191..6cc426a 100644
+--- a/drivers/net/ovpn-dco/ovpn.c
++++ b/drivers/net/ovpn-dco/ovpn.c
+@@ -21,6 +21,10 @@
+ #include "tcp.h"
+ #include "udp.h"
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,4,10)
++#include <net/gso.h>
++#endif
++
+ #include <linux/workqueue.h>
+ #include <uapi/linux/if_ether.h>
+ 
diff --git a/ovpn-dco/patches/901-fix-linux-6.11.patch b/ovpn-dco/patches/901-fix-linux-6.11.patch
new file mode 100644
index 000000000..b3456527a
--- /dev/null
+++ b/ovpn-dco/patches/901-fix-linux-6.11.patch
@@ -0,0 +1,9 @@
+--- a/drivers/net/ovpn-dco/main.c
++++ b/drivers/net/ovpn-dco/main.c
+@@ -268,4 +268,6 @@ MODULE_AUTHOR(DRV_COPYRIGHT);
+ MODULE_LICENSE("GPL");
+ MODULE_VERSION(DRV_VERSION);
+ MODULE_ALIAS_RTNL_LINK(DRV_NAME);
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 11, 0)
+ MODULE_ALIAS_GENL_FAMILY(OVPN_NL_NAME);
++#endif