Commit 9be61558 authored by Andrei Otcheretianski's avatar Andrei Otcheretianski Committed by Johannes Berg
Browse files

wifi: cfg80211: Schedule regulatory check on BSS STA channel change 



Due to different relaxation policies it may be needed to re-check
channels after a BSS station interface is disconnected or performed a
channel switch.

Signed-off-by: default avatarAndrei Otcheretianski <andrei.otcheretianski@intel.com>
Reviewed-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Signed-off-by: default avatarMiri Korenblit <miriam.rachel.korenblit@intel.com>
Link: https://msgid.link/20231220133549.1f2f8475bcf1.I1879d259d8d756159c8060f61f4bce172e6d323e@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 41a313d8

include/net/cfg80211.h

+10 −0
Original line number Diff line number Diff line
@@ -9391,6 +9391,16 @@ bool cfg80211_valid_disable_subchannel_bitmap(u16 *bitmap, 
 */

void cfg80211_links_removed(struct net_device *dev, u16 link_mask);



/**

 * cfg80211_schedule_channels_check - schedule regulatory check if needed

 * @wdev: the wireless device to check

 *

 * In case the device supports NO_IR or DFS relaxations, schedule regulatory

 * channels check, as previous concurrent operation conditions may not

 * hold anymore.

 */

void cfg80211_schedule_channels_check(struct wireless_dev *wdev);



#ifdef CONFIG_CFG80211_DEBUGFS

/**

 * wiphy_locked_debugfs_read - do a locked read in debugfs

net/wireless/nl80211.c

+15 −0
Original line number Diff line number Diff line
@@ -19474,6 +19474,7 @@ void cfg80211_ch_switch_notify(struct net_device *dev, 
		break;

	}









	cfg80211_schedule_channels_check(wdev);









	cfg80211_sched_dfs_chan_update(rdev);

















	nl80211_ch_switch_notify(rdev, dev, link_id, chandef, GFP_KERNEL,








@@ -20231,6 +20232,20 @@ void cfg80211_update_owe_info_event(struct net_device *netdev,







}









EXPORT_SYMBOL(cfg80211_update_owe_info_event);

















void cfg80211_schedule_channels_check(struct wireless_dev *wdev)









{









	struct wiphy *wiphy = wdev->wiphy;

















	/* Schedule channels check if NO_IR or DFS relaxations are supported */









	if (wdev->iftype == NL80211_IFTYPE_STATION &&









	    (wiphy_ext_feature_isset(wiphy,









				     NL80211_EXT_FEATURE_DFS_CONCURRENT) ||









	    (IS_ENABLED(CONFIG_CFG80211_REG_RELAX_NO_IR) &&









	     wiphy->regulatory_flags & REGULATORY_ENABLE_RELAX_NO_IR)))









		reg_check_channels();









}









EXPORT_SYMBOL(cfg80211_schedule_channels_check);

















/* initialisation/exit functions */

















int __init nl80211_init(void)

























net/wireless/reg.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -2480,7 +2480,7 @@ static void reg_check_chans_work(struct work_struct *work)







	rtnl_unlock();









}



















static void reg_check_channels(void)









void reg_check_channels(void)









{









	/*









	 * Give usermode a chance to do something nicer (move to another
































net/wireless/reg.h



+5
−0






























Original line number
Diff line number
Diff line







@@ -181,6 +181,11 @@ bool reg_dfs_domain_same(struct wiphy *wiphy1, struct wiphy *wiphy2);







 */









int reg_reload_regdb(void);



















/**









 * reg_check_channels - schedule regulatory enforcement









 */









void reg_check_channels(void);



















extern const u8 shipped_regdb_certs[];









extern unsigned int shipped_regdb_certs_len;









extern const u8 extra_regdb_certs[];
































net/wireless/sme.c



+2
−0






























Original line number
Diff line number
Diff line







@@ -1394,6 +1394,8 @@ void __cfg80211_disconnected(struct net_device *dev, const u8 *ie,







#endif



















	schedule_work(&cfg80211_disconnect_work);



















	cfg80211_schedule_channels_check(wdev);









}



















void cfg80211_disconnected(struct net_device *dev, u16 reason,