Skip to content

Commit

Permalink
Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/…
Browse files Browse the repository at this point in the history
…git/jberg/mac80211-next
  • Loading branch information
John W. Linville committed Jul 19, 2012
2 parents 0cd0664 + 99102bd commit 3e497e0
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
1 change: 1 addition & 0 deletions net/mac80211/cfg.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 3 additions & 1 deletion net/wireless/reg.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 3e497e0

Please sign in to comment.