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

Commit b476d3f1 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

parents 353c7815 bbe09bbc

net/wireless/mlme.c

+4 −2
Original line number Diff line number Diff line
@@ -707,11 +707,13 @@ void cfg80211_dfs_channels_update_work(struct work_struct *work) 
			if (c->dfs_state != NL80211_DFS_UNAVAILABLE)

				continue;



			timeout = c->dfs_state_entered +

				  IEEE80211_DFS_MIN_NOP_TIME_MS;

			timeout = c->dfs_state_entered + msecs_to_jiffies(

					IEEE80211_DFS_MIN_NOP_TIME_MS);



			if (time_after_eq(jiffies, timeout)) {

				c->dfs_state = NL80211_DFS_USABLE;

				c->dfs_state_entered = jiffies;



				cfg80211_chandef_create(&chandef, c,

							NL80211_CHAN_NO_HT);

net/wireless/scan.c

+2 −2
Original line number Diff line number Diff line
@@ -254,10 +254,10 @@ void __cfg80211_sched_scan_results(struct work_struct *wk) 
	rdev = container_of(wk, struct cfg80211_registered_device,

			    sched_scan_results_wk);



	request = rdev->sched_scan_req;



	rtnl_lock();



	request = rdev->sched_scan_req;



	/* we don't have sched_scan_req anymore if the scan is stopping */

	if (request) {

		if (request->flags & NL80211_SCAN_FLAG_FLUSH) {