fix hang on 5.14

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
+3 -3
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);
}
+1 -2
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) {