Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3e497e02 authored by John W. Linville's avatar John W. Linville
Browse files

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

parents 0cd06647 99102bd3

net/mac80211/cfg.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -917,6 +917,7 @@ static int ieee80211_stop_ap(struct wiphy *wiphy, struct net_device *dev) 




	kfree_rcu(old, rcu_head);

	kfree_rcu(old, rcu_head);





	sta_info_flush(sdata->local, sdata);

	ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BEACON_ENABLED);

	ieee80211_bss_info_change_notify(sdata, BSS_CHANGED_BEACON_ENABLED);





	return 0;

	return 0;

net/wireless/reg.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -929,11 +929,13 @@ static bool reg_request_cell_base(struct regulatory_request *request) 




bool reg_last_request_cell_base(void)

bool reg_last_request_cell_base(void)

{

{

	bool val;

	assert_cfg80211_lock();

	assert_cfg80211_lock();





	mutex_lock(&reg_mutex);

	mutex_lock(&reg_mutex);

	return reg_request_cell_base(last_request);

	val = reg_request_cell_base(last_request);

	mutex_unlock(&reg_mutex);

	mutex_unlock(&reg_mutex);

	return val;

}

}





#ifdef CONFIG_CFG80211_CERTIFICATION_ONUS

#ifdef CONFIG_CFG80211_CERTIFICATION_ONUS