diff options
| author |   Michal Kazior <michal.kazior@tieto.com> | 2013-10-17 11:21:11 -0700 |
|---|---|---|
| committer |   Johannes Berg <johannes.berg@intel.com> | 2013-10-21 14:50:27 +0200 |
| commit | c532a58b0fb4b2b3309e6b87bafb44f36808aa6f (patch) | |
| tree | 7df77d9c526595b7bb13b5aebf0fe9f6a37a1b47 /net/wireless/mlme.c | |
| parent | cfg80211: fix scheduled scan pointer access (diff) | |
| download | linux-dev-c532a58b0fb4b2b3309e6b87bafb44f36808aa6f.tar.xz linux-dev-c532a58b0fb4b2b3309e6b87bafb44f36808aa6f.zip | |
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>
Diffstat (limited to 'net/wireless/mlme.c')
| -rw-r--r-- | net/wireless/mlme.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/wireless/mlme.c b/net/wireless/mlme.c index 8d49c1ce3dea..edfe6de00e7b 100644 --- a/net/wireless/mlme.c +++ b/net/wireless/mlme.c @@ -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; |