random-mirrors/amazingfate-rtl8723ds
1
0
Fork 0
mirror of https://github.com/amazingfate/rtl8723ds.git synced 2025-10-13 12:26:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix hang on 5.14

Browse Source 
Signed-off-by: Icenowy Zheng <icenowy@sipeed.com>
This commit is contained in:
Icenowy Zheng 2021-07-24 18:40:13 +08:00
parent 4bc94be2c6
commit 9afd800400
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -72,7 +72,7 @@ CONFIG_APPEND_VENDOR_IE_ENABLE = n
CONFIG_RTW_NAPI = y
CONFIG_RTW_GRO = y
########################## Debug ###########################
CONFIG_RTW_DEBUG = y
CONFIG_RTW_DEBUG = n
# default log level is _DRV_INFO_ = 2,
# please refer to "How_to_set_driver_debug_log_level.doc" to set the available level.
CONFIG_RTW_LOG_LEVEL = 2

2
include/rtw_wifi_regd.h
View File

@ -26,7 +26,7 @@ enum country_code_type_t {
COUNTRY_CODE_MAX
};
int rtw_regd_init(_adapter *padapter);
int rtw_regd_init(struct wiphy *wiphy);
void rtw_reg_notify_by_driver(_adapter *adapter);
#endif /* __RTW_WIFI_REGD_H__ */

6
os_dep/linux/ioctl_cfg80211.c
View File

@ -6630,9 +6630,6 @@ void rtw_cfg80211_init_wiphy(_adapter *padapter)
rtw_cfg80211_init_ht_capab(padapter, &bands->ht_cap, IEEE80211_BAND_5GHZ, rf_type);
}
#endif
/* init regulary domain */
rtw_regd_init(padapter);
/* copy mac_addr to wiphy */
_rtw_memcpy(wiphy->perm_addr, adapter_mac_addr(padapter), ETH_ALEN);
@ -6934,6 +6931,9 @@ int rtw_wiphy_register(struct wiphy *wiphy)
rtw_cfgvendor_attach(wiphy);
#endif
/* init regulary domain */
rtw_regd_init(wiphy);
return wiphy_register(wiphy);
}

3
os_dep/linux/wifi_regd.c
View File

@ -519,9 +519,8 @@ static struct country_code_to_enum_rd *_rtw_regd_find_country(u16 countrycode)
return NULL;
}
int rtw_regd_init(_adapter *padapter)
int rtw_regd_init(struct wiphy *wiphy)
{
struct wiphy *wiphy = padapter->rtw_wdev->wiphy;
#if 0
if (rtw_regd == NULL) {