mirror of
https://github.com/Mange/rtl8192eu-linux-driver
synced 2024-11-01 03:05:34 +00:00
parent
6a758d54cf
commit
8fa56156a8
@ -29,6 +29,6 @@ enum country_code_type_t {
|
||||
};
|
||||
|
||||
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__ */
|
||||
|
@ -10000,6 +10000,8 @@ struct wiphy *rtw_wiphy_alloc(_adapter *padapter, struct device *dev)
|
||||
#endif
|
||||
|
||||
rtw_cfg80211_preinit_wiphy(padapter, wiphy);
|
||||
/* init regulary domain */
|
||||
rtw_regd_init(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);
|
||||
#endif
|
||||
|
||||
rtw_regd_init(wiphy);
|
||||
|
||||
return wiphy_register(wiphy);
|
||||
}
|
||||
|
||||
|
@ -400,25 +400,10 @@ static struct country_code_to_enum_rd *_rtw_regd_find_country(u16 countrycode)
|
||||
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);
|
||||
|
||||
return 0;
|
||||
}
|
||||
#endif /* CONFIG_IOCTL_CFG80211 */
|
||||
|
Loading…
Reference in New Issue
Block a user