From d260e6b73df0ee5d57bdd512acf68c287c4c90de38ca67365e3b85ba1c1c4cb5 Mon Sep 17 00:00:00 2001
From: Antonio Larrosa <alarrosa@suse.com>
Date: Fri, 19 Apr 2024 12:37:09 +0000
Subject: [PATCH] Accepting request 1169177 from
 home:alarrosa:branches:openSUSE:Leap:15.6

- Add patch to fix build in Leap 15.6 whose 6.4 kernel includes
  backported features from 6.5:
  * fix-15.6.patch

OBS-URL: https://build.opensuse.org/request/show/1169177
OBS-URL: https://build.opensuse.org/package/show/hardware/rtl8812au?expand=0&rev=58
---
 fix-15.6.patch    | 13 +++++++++++++
 rtl8812au.changes |  7 +++++++
 rtl8812au.spec    |  6 ++++++
 3 files changed, 26 insertions(+)
 create mode 100644 fix-15.6.patch

diff --git a/fix-15.6.patch b/fix-15.6.patch
new file mode 100644
index 0000000..fa4145f
--- /dev/null
+++ b/fix-15.6.patch
@@ -0,0 +1,13 @@
+Index: 8812au-20210629/os_dep/linux/ioctl_cfg80211.c
+===================================================================
+--- 8812au-20210629.orig/os_dep/linux/ioctl_cfg80211.c
++++ 8812au-20210629/os_dep/linux/ioctl_cfg80211.c
+@@ -8458,7 +8458,7 @@ static int cfg80211_rtw_tdls_mgmt(struct
+ #else
+ 	u8 *peer,
+ #endif
+-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 5, 0))
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 4, 0))
+ 	int link_id,
+ #endif
+ 	u8 action_code,
diff --git a/rtl8812au.changes b/rtl8812au.changes
index 6142818..de3871f 100644
--- a/rtl8812au.changes
+++ b/rtl8812au.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Apr 19 12:34:20 UTC 2024 - Antonio Larrosa <alarrosa@suse.com>
+
+- Add patch to fix build in Leap 15.6 whose 6.4 kernel includes
+  backported features from 6.5:
+  * fix-15.6.patch
+
 -------------------------------------------------------------------
 Sun Mar 24 20:56:47 UTC 2024 - Konstantin Voinov <kv@kott.no-ip.biz>
 
diff --git a/rtl8812au.spec b/rtl8812au.spec
index 3d97140..6d5e8cc 100644
--- a/rtl8812au.spec
+++ b/rtl8812au.spec
@@ -33,6 +33,8 @@ Source2:        LICENSE
 Patch0:         fix-backported-ndo_select_queue.patch
 # PATCH-FIX-OPENSUSE fix-backported-update_mgmt_frame_registrations.patch
 Patch1:         fix-backported-update_mgmt_frame_registrations.patch
+# PATCH-FIX-OPENSUSE fix-15.6.patch
+Patch2:         fix-15.6.patch
 BuildRequires:  %{kernel_module_package_buildreqs}
 BuildRequires:  bc
 BuildRequires:  binutils
@@ -74,6 +76,10 @@ https://github.com/maurossi/rtl8812au/ .
 %patch -P 1 -p1
 %endif
 
+%if 0%{?sle_version} == 150600
+%patch -P 2 -p1
+%endif
+
 set -- *
 mkdir source
 mv "$@" source/