OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

This commit is contained in:
John W. Linville 2012-07-19 12:35:00 -04:00
parent 0cd06647b7 99102bd380
commit 3e497e0215
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
net/mac80211/cfg.c
View File

@ -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;

4
net/wireless/reg.c
View File

@ -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