[WIFI/8852BE] support linux v6.0-rc4

vrolife · Sep 7, 2022 · 77b3d88 · 77b3d88
1 parent ad87f89
commit 77b3d88
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -99,6 +99,10 @@ sudo /bin/sh install.sh disable-PSR               ## disable PSR
 
 ## 变更
 
+- 2022-09-07
+
+  1. rtl8852be for Linux 6.0-rc4
+
 - 2022-09-01
 
   1. 在`Linux 5.19`和 Ubuntu 的`linux-oem-5.17 5.17.0-1014`中，通过ACPI补丁驱动麦克风。[链接](https://github.com/vrolife/modern_laptop/blob/main/fixes/acpi/README.md)

diff --git a/drivers/rtl8852be/os_dep/linux/ioctl_cfg80211.c b/drivers/rtl8852be/os_dep/linux/ioctl_cfg80211.c
@@ -1190,7 +1190,11 @@ void rtw_cfg80211_indicate_connect(_adapter *padapter)
 		#endif
 
 		#if defined(CPTCFG_VERSION) || LINUX_VERSION_CODE >= KERNEL_VERSION(4, 12, 0)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 0, 0)
 		roam_info.bssid = cur_network->network.MacAddress;
+#else
+		roam_info.links[0].bssid = cur_network->network.MacAddress;
+#endif
 		roam_info.req_ie = pmlmepriv->assoc_req + sizeof(struct rtw_ieee80211_hdr_3addr) + 2;
 		roam_info.req_ie_len = pmlmepriv->assoc_req_len - sizeof(struct rtw_ieee80211_hdr_3addr) - 2;
 		roam_info.resp_ie = pmlmepriv->assoc_rsp + sizeof(struct rtw_ieee80211_hdr_3addr) + 6;