From 1cc35d2d242620aba4ad5237f49212eda654bf55d51e0381262b857a1d3ffee9 Mon Sep 17 00:00:00 2001 From: Antonio Larrosa Date: Thu, 18 May 2023 10:31:56 +0000 Subject: [PATCH 1/2] Accepting request 1087775 from home:alarrosa:branches:hardware - Update to version 5.13.6+git20230511.765d4e4 * TP-Link - T4UHP_US VID/PID problem * Update supported-device-IDs * Update usb_intf.c * Add support for 2357:0122 (TP-LINK Archer T4UHP) * fix this driver collide with 88x2bu due ID 7392:b822. That card has a 8822B chip not 8821. * kernel 6.3 support * major updates to various components * makefile Secure Boot support * remove some dated docs * upgrade installation and removal scripts * support kernel 6.1 - Drop patch already included in this version: * fix_api_changes_kernel_6.1.patch OBS-URL: https://build.opensuse.org/request/show/1087775 OBS-URL: https://build.opensuse.org/package/show/hardware/rtl8812au?expand=0&rev=48 --- fix_api_changes_kernel_6.1.patch | 111 ------------------- rtl8812au-5.13.6+git20230511.765d4e4.obscpio | 3 + rtl8812au.changes | 19 ++++ rtl8812au.obsinfo | 6 +- rtl8812au.spec | 8 +- 5 files changed, 29 insertions(+), 118 deletions(-) delete mode 100644 fix_api_changes_kernel_6.1.patch create mode 100644 rtl8812au-5.13.6+git20230511.765d4e4.obscpio diff --git a/fix_api_changes_kernel_6.1.patch b/fix_api_changes_kernel_6.1.patch deleted file mode 100644 index dd5cf8d..0000000 --- a/fix_api_changes_kernel_6.1.patch +++ /dev/null @@ -1,111 +0,0 @@ -From: Larry Finger -Subject: Fix Tumbleweed build for kernel 6.1+ - -Kernel 6.1 brought several changes to the kernel API with respect to wireless -operations. This patch fixes the base code to support such changes. - -Index: rtl8812au-5.13.6+git20220905.a8450b0/os_dep/linux/os_intfs.c -=================================================================== ---- rtl8812au-5.13.6+git20220905.a8450b0.orig/os_dep/linux/os_intfs.c -+++ rtl8812au-5.13.6+git20220905.a8450b0/os_dep/linux/os_intfs.c -@@ -2154,7 +2154,11 @@ int rtw_os_ndev_register(_adapter *adapt - u8 rtnl_lock_needed = rtw_rtnl_lock_needed(dvobj); - - #ifdef CONFIG_RTW_NAPI -+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 1,0) - netif_napi_add(ndev, &adapter->napi, rtw_recv_napi_poll, RTL_NAPI_WEIGHT); -+#else -+ netif_napi_add(ndev, &adapter->napi, rtw_recv_napi_poll); -+#endif - #endif /* CONFIG_RTW_NAPI */ - - #if defined(CONFIG_IOCTL_CFG80211) -Index: rtl8812au-5.13.6+git20220905.a8450b0/os_dep/osdep_service.c -=================================================================== ---- rtl8812au-5.13.6+git20220905.a8450b0.orig/os_dep/osdep_service.c -+++ rtl8812au-5.13.6+git20220905.a8450b0/os_dep/osdep_service.c -@@ -2915,7 +2915,11 @@ inline u32 rtw_random32(void) - { - #ifdef PLATFORM_LINUX - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 8, 0)) -+#if LINUX_VERSION_CODE >- KERNEL_VERSION(6, 1, 0) -+ return get_random_u32(); -+#else - return prandom_u32(); -+#endif - #elif (LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 18)) - u32 random_int; - get_random_bytes(&random_int , 4); -Index: rtl8812au-5.13.6+git20220905.a8450b0/os_dep/linux/ioctl_cfg80211.c -=================================================================== ---- rtl8812au-5.13.6+git20220905.a8450b0.orig/os_dep/linux/ioctl_cfg80211.c -+++ rtl8812au-5.13.6+git20220905.a8450b0/os_dep/linux/ioctl_cfg80211.c -@@ -464,7 +464,11 @@ u8 rtw_cfg80211_ch_switch_notify(_adapte - * called by others with block-tx. - */ - -- cfg80211_ch_switch_started_notify(adapter->pnetdev, &chdef, 0, false); -+ cfg80211_ch_switch_started_notify(adapter->pnetdev, &chdef, -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) -+ 0, -+#endif -+ 0, false); - #else - cfg80211_ch_switch_started_notify(adapter->pnetdev, &chdef, 0); - #endif -@@ -1911,6 +1915,9 @@ exit: - } - - static int cfg80211_rtw_add_key(struct wiphy *wiphy, struct net_device *ndev -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) -+ , int link_id -+#endif - , u8 key_index - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE) - , bool pairwise -@@ -2073,6 +2080,9 @@ addkey_end: - } - - static int cfg80211_rtw_get_key(struct wiphy *wiphy, struct net_device *ndev -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) -+ , int link_id -+#endif - , u8 keyid - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE) - , bool pairwise -@@ -2262,6 +2272,9 @@ exit: - - static int cfg80211_rtw_del_key(struct wiphy *wiphy, struct net_device *ndev, - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) || defined(COMPAT_KERNEL_RELEASE) -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) -+ int link_id, -+#endif - u8 key_index, bool pairwise, const u8 *mac_addr) - #else /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 37)) */ - u8 key_index, const u8 *mac_addr) -@@ -2281,7 +2294,11 @@ static int cfg80211_rtw_del_key(struct w - } - - static int cfg80211_rtw_set_default_key(struct wiphy *wiphy, -- struct net_device *ndev, u8 key_index -+ struct net_device *ndev, -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) -+ int link_id, -+#endif -+ u8 key_index - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38)) || defined(COMPAT_KERNEL_RELEASE) - , bool unicast, bool multicast - #endif -@@ -2329,7 +2346,11 @@ static int cfg80211_rtw_set_default_key( - - #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 30)) - int cfg80211_rtw_set_default_mgmt_key(struct wiphy *wiphy, -- struct net_device *ndev, u8 key_index) -+ struct net_device *ndev, -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 1, 0) -+ int link_id, -+#endif -+ u8 key_index) - { - #define SET_DEF_KEY_PARAM_FMT " key_index=%d" - #define SET_DEF_KEY_PARAM_ARG , key_index diff --git a/rtl8812au-5.13.6+git20230511.765d4e4.obscpio b/rtl8812au-5.13.6+git20230511.765d4e4.obscpio new file mode 100644 index 0000000..0023b9a --- /dev/null +++ b/rtl8812au-5.13.6+git20230511.765d4e4.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e247debc4b7a0b162a4fff0220fddc5b0ac5fa97d7017ee342a170ab09238a73 +size 15257101 diff --git a/rtl8812au.changes b/rtl8812au.changes index 8ac5242..0343fbb 100644 --- a/rtl8812au.changes +++ b/rtl8812au.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Thu May 18 10:03:31 UTC 2023 - Antonio Larrosa + +- Update to version 5.13.6+git20230511.765d4e4 + * TP-Link - T4UHP_US VID/PID problem + * Update supported-device-IDs + * Update usb_intf.c + * Add support for 2357:0122 (TP-LINK Archer T4UHP) + * fix this driver collide with 88x2bu due ID 7392:b822. That + card has a 8822B chip not 8821. + * kernel 6.3 support + * major updates to various components + * makefile Secure Boot support + * remove some dated docs + * upgrade installation and removal scripts + * support kernel 6.1 +- Drop patch already included in this version: + * fix_api_changes_kernel_6.1.patch + ------------------------------------------------------------------- Mon Jan 23 02:25:03 UTC 2023 - Larry Finger diff --git a/rtl8812au.obsinfo b/rtl8812au.obsinfo index 8c37a6a..2f18341 100644 --- a/rtl8812au.obsinfo +++ b/rtl8812au.obsinfo @@ -1,4 +1,4 @@ name: rtl8812au -version: 5.13.6+git20220905.a8450b0 -mtime: 1662404732 -commit: a8450b030a187b71d6be147d004715e6858e0ef9 +version: 5.13.6+git20230511.765d4e4 +mtime: 1683815841 +commit: 765d4e4bd5970f4c1c79e63bbe301667e5e029c9 diff --git a/rtl8812au.spec b/rtl8812au.spec index 513ff57..0381b51 100644 --- a/rtl8812au.spec +++ b/rtl8812au.spec @@ -19,7 +19,7 @@ %{?!kernel_module_directory:%define kernel_module_directory /lib/modules} Name: rtl8812au -Version: 5.13.6+git20220905.a8450b0 +Version: 5.13.6+git20230511.765d4e4 Release: 0 Summary: Kernel driver for Realtek 802.11ac 8812au wifi cards License: GPL-2.0-only @@ -33,8 +33,6 @@ 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_api_changes_kernel_6.1.patch -Patch2: fix_api_changes_kernel_6.1.patch BuildRequires: %{kernel_module_package_buildreqs} BuildRequires: bc BuildRequires: binutils @@ -75,7 +73,6 @@ https://github.com/maurossi/rtl8812au/ . %if 0%{?sle_version} == 150300 %patch1 -p1 %endif -%patch2 -p1 set -- * mkdir source @@ -96,6 +93,9 @@ export ARCH=powerpc %ifarch riscv64 export ARCH=riscv %endif +%ifarch i586 +export ARCH=i386 +%endif for flavor in %{flavors_to_build} ; do cp -a source obj/$flavor From 2c3b76bf03ba075d9f8da2e51d5eba309c4ccb3a612356f99f0bbe33d0e0a913 Mon Sep 17 00:00:00 2001 From: Antonio Larrosa Date: Thu, 18 May 2023 10:39:34 +0000 Subject: [PATCH 2/2] Accepting request 1087777 from home:alarrosa:branches:hardware Remove unused source file OBS-URL: https://build.opensuse.org/request/show/1087777 OBS-URL: https://build.opensuse.org/package/show/hardware/rtl8812au?expand=0&rev=49 --- rtl8812au-5.13.6+git20220905.a8450b0.obscpio | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 rtl8812au-5.13.6+git20220905.a8450b0.obscpio diff --git a/rtl8812au-5.13.6+git20220905.a8450b0.obscpio b/rtl8812au-5.13.6+git20220905.a8450b0.obscpio deleted file mode 100644 index b212aad..0000000 --- a/rtl8812au-5.13.6+git20220905.a8450b0.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e8b0faec25c99db3017336d80547834a4e455f2ec7340b31293f91be477026ae -size 15273997