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

Commit c532a58b authored by Michal Kazior's avatar Michal Kazior Committed by Johannes Berg
Browse files

cfg80211: fix DFS channel recovery timeout 



The timeout was not properly converted from msecs
to jiffies. As a result channel transition to
NL80211_DFS_USABLE was delayed depending on
CONFIG_HZ configuration, e.g. HZ=100 would delay
the NOP from 30 minutes to 300 minutes.

Signed-off-by: default avatarMichal Kazior <michal.kazior@tieto.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 79845c66

net/wireless/mlme.c

+2 −2
Original line number Diff line number Diff line
@@ -707,8 +707,8 @@ 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;