UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ath6kl: Make sure wiphy is registered before calling regulatory_hint() 

As regulatory events are processed even before the wiphy is registered,
calling regulatory_hint() at early stage should be fixed.

Signed-off-by: Vasanthakumar Thiagarajan <vthiagar@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
This commit is contained in:
Vasanthakumar Thiagarajan 2012-02-25 14:43:17 +05:30 committed by Kalle Valo
parent b796f0934a
commit e5348a1e33
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/wireless/ath/ath6kl/cfg80211.c
View File

@ -3097,12 +3097,16 @@ int ath6kl_cfg80211_init(struct ath6kl *ar)
return ret; return ret;
} }
ar->wiphy_registered = true;
return 0; return 0;
} }
void ath6kl_cfg80211_cleanup(struct ath6kl *ar) void ath6kl_cfg80211_cleanup(struct ath6kl *ar)
{ {
wiphy_unregister(ar->wiphy); wiphy_unregister(ar->wiphy);
ar->wiphy_registered = false;
} }
struct ath6kl *ath6kl_cfg80211_create(void) struct ath6kl *ath6kl_cfg80211_create(void)

2
drivers/net/wireless/ath/ath6kl/core.h
View File

@ -666,6 +666,8 @@ struct ath6kl {
bool p2p; bool p2p;
bool wiphy_registered;
#ifdef CONFIG_ATH6KL_DEBUG #ifdef CONFIG_ATH6KL_DEBUG
struct { struct {
struct sk_buff_head fwlog_queue; struct sk_buff_head fwlog_queue;

2
drivers/net/wireless/ath/ath6kl/wmi.c
View File

@ -914,7 +914,7 @@ static void ath6kl_wmi_regdomain_event(struct wmi *wmi, u8 *datap, int len)
regpair->regDmnEnum); regpair->regDmnEnum);
} }
if (country) { if (country && wmi->parent_dev->wiphy_registered) {
alpha2[0] = country->isoName[0]; alpha2[0] = country->isoName[0];
alpha2[1] = country->isoName[1]; alpha2[1] = country->isoName[1];