Github/rtl8192eu-linux-driver
1
0
Fork 0
mirror of https://github.com/Mange/rtl8192eu-linux-driver synced 2024-11-22 13:35:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #227 from Mange/kernel_5.11

Browse Source 
Fix wireless regulatory API misuse
This commit is contained in:
Carlos Garcés 2021-04-03 16:52:22 +02:00 committed by GitHub
commit 6a9f1c3ab1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/rtw_wifi_regd.h
View File

@ -29,6 +29,6 @@ enum country_code_type_t {
}; };
void rtw_regd_apply_flags(struct wiphy *wiphy); void rtw_regd_apply_flags(struct wiphy *wiphy);
int rtw_regd_init(struct wiphy *wiphy); void rtw_regd_init(struct wiphy *wiphy);
#endif /* __RTW_WIFI_REGD_H__ */ #endif /* __RTW_WIFI_REGD_H__ */

4
os_dep/linux/ioctl_cfg80211.c
View File

@ -10000,6 +10000,8 @@ struct wiphy *rtw_wiphy_alloc(_adapter *padapter, struct device *dev)
#endif #endif
rtw_cfg80211_preinit_wiphy(padapter, wiphy); rtw_cfg80211_preinit_wiphy(padapter, wiphy);
/* init regulary domain */
rtw_regd_init(wiphy);
RTW_INFO(FUNC_WIPHY_FMT"\n", FUNC_WIPHY_ARG(wiphy)); RTW_INFO(FUNC_WIPHY_FMT"\n", FUNC_WIPHY_ARG(wiphy));
@ -10034,8 +10036,6 @@ int rtw_wiphy_register(struct wiphy *wiphy)
rtw_cfgvendor_attach(wiphy); rtw_cfgvendor_attach(wiphy);
#endif #endif
rtw_regd_init(wiphy);
return wiphy_register(wiphy); return wiphy_register(wiphy);
} }

17
os_dep/linux/wifi_regd.c
View File

@ -400,25 +400,10 @@ static struct country_code_to_enum_rd *_rtw_regd_find_country(u16 countrycode)
return NULL; return NULL;
} }
int rtw_regd_init(struct wiphy *wiphy) void rtw_regd_init(struct wiphy *wiphy)
{ {
#if 0
if (rtw_regd == NULL) {
rtw_regd = (struct rtw_regulatory *)
rtw_malloc(sizeof(struct rtw_regulatory));
rtw_regd->alpha2[0] = '9';
rtw_regd->alpha2[1] = '9';
rtw_regd->country_code = COUNTRY_CODE_USER;
}
RTW_INFO("%s: Country alpha2 being used: %c%c\n",
__func__, rtw_regd->alpha2[0], rtw_regd->alpha2[1]);
#endif
_rtw_regd_init_wiphy(NULL, wiphy); _rtw_regd_init_wiphy(NULL, wiphy);
return 0;
} }
#endif /* CONFIG_IOCTL_CFG80211 */ #endif /* CONFIG_IOCTL_CFG80211 */