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: Michal Kazior <michal.kazior@tieto.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
This commit is contained in:
Michal Kazior 2013-10-17 11:21:11 -07:00 committed by Johannes Berg
parent 79845c662e
commit c532a58b0f

View File

@ -707,8 +707,8 @@ void cfg80211_dfs_channels_update_work(struct work_struct *work)
if (c->dfs_state != NL80211_DFS_UNAVAILABLE) if (c->dfs_state != NL80211_DFS_UNAVAILABLE)
continue; continue;
timeout = c->dfs_state_entered + timeout = c->dfs_state_entered + msecs_to_jiffies(
IEEE80211_DFS_MIN_NOP_TIME_MS; IEEE80211_DFS_MIN_NOP_TIME_MS);
if (time_after_eq(jiffies, timeout)) { if (time_after_eq(jiffies, timeout)) {
c->dfs_state = NL80211_DFS_USABLE; c->dfs_state = NL80211_DFS_USABLE;