diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-11-08 18:03:10 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-11-08 18:03:10 +0400 |
| commit | c1f3bb6bd317994beb3af7bbec4bf54ed0035509 (patch) | |
| tree | 878833c714ddcb35f1574f2b11e1f69d1130d206 /net/wireless/mlme.c | |
| parent | dcd607718385d02ce3741de225927a57f528f93b (diff) | |
| parent | 3c57e865cfb2dcbb48fdfa08e7d4e3479e9b40f0 (diff) | |
| download | linux-c1f3bb6bd317994beb3af7bbec4bf54ed0035509.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'net/wireless/mlme.c')
| -rw-r--r-- | net/wireless/mlme.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/wireless/mlme.c b/net/wireless/mlme.c index 8d49c1ce3dea..6a6b1c8e907d 100644 --- a/net/wireless/mlme.c +++ b/net/wireless/mlme.c @@ -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); |