summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/mac80211/cfg.c1
-rw-r--r--net/wireless/reg.c4
2 files changed, 4 insertions, 1 deletions
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index efbbdc8..d41974a 100644
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -917,6 +917,7 @@ static int ieee80211_stop_ap(struct wiphy *wiphy, struct net_device *dev)
kfree_rcu(old, rcu_head);
+ sta_info_flush(sdata->local, sdata);
ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BEACON_ENABLED);
return 0;
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index dbb01df..2303ee7 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -929,11 +929,13 @@ static bool reg_request_cell_base(struct regulatory_request *request)
bool reg_last_request_cell_base(void)
{
+ bool val;
assert_cfg80211_lock();
mutex_lock(&reg_mutex);
- return reg_request_cell_base(last_request);
+ val = reg_request_cell_base(last_request);
mutex_unlock(&reg_mutex);
+ return val;
}
#ifdef CONFIG_CFG80211_CERTIFICATION_ONUS
OpenPOWER on IntegriCloud