Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package rtl8812au for openSUSE:Factory checked in at 2023-01-23 18:32:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rtl8812au (Old) and /work/SRC/openSUSE:Factory/.rtl8812au.new.32243 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rtl8812au" Mon Jan 23 18:32:15 2023 rev:18 rq:1060345 version:5.13.6+git20220905.a8450b0 Changes: -------- --- /work/SRC/openSUSE:Factory/rtl8812au/rtl8812au.changes 2022-09-27 20:14:23.381887621 +0200 +++ /work/SRC/openSUSE:Factory/.rtl8812au.new.32243/rtl8812au.changes 2023-01-23 18:32:30.760288169 +0100 @@ -1,0 +2,8 @@ +Mon Jan 23 02:25:03 UTC 2023 - Larry Finger <[email protected]> + +- Add patch to build with Tumbleweed kernels 6.1.x: + * fix_api_changes_kernel_6.1.patch +- The "kernel-source" package is removed from the BuildRequires + list. The much smaller "kernel-default-devel" is sufficient. + +------------------------------------------------------------------- New: ---- fix_api_changes_kernel_6.1.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rtl8812au.spec ++++++ --- /var/tmp/diff_new_pack.1nA7Jm/_old 2023-01-23 18:32:31.636294231 +0100 +++ /var/tmp/diff_new_pack.1nA7Jm/_new 2023-01-23 18:32:31.644294286 +0100 @@ -1,7 +1,7 @@ # # spec file for package rtl8812au # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -33,12 +33,14 @@ 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 BuildRequires: fdupes +BuildRequires: kernel-default-devel BuildRequires: kernel-devel -BuildRequires: kernel-source BuildRequires: module-init-tools %kernel_module_package -p %{name}-preamble @@ -73,6 +75,7 @@ %if 0%{?sle_version} == 150300 %patch1 -p1 %endif +%patch2 -p1 set -- * mkdir source ++++++ fix_api_changes_kernel_6.1.patch ++++++ From: Larry Finger <[email protected]> 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
