summaryrefslogtreecommitdiffstats
path: root/net/wireless/mlme.c
diff options
context:
space:
mode:
authorMichal Kazior2013-10-17 20:21:12 +0200
committerJohannes Berg2013-10-21 14:50:27 +0200
commitbbe09bbcf4454e826e3fb08e87d81f32c0030658 (patch)
tree77697feec769b28349458e523ab1861e5238d066 /net/wireless/mlme.c
parentcfg80211: fix DFS channel recovery timeout (diff)
downloadkernel-qcow2-linux-bbe09bbcf4454e826e3fb08e87d81f32c0030658.tar.gz
kernel-qcow2-linux-bbe09bbcf4454e826e3fb08e87d81f32c0030658.tar.xz
kernel-qcow2-linux-bbe09bbcf4454e826e3fb08e87d81f32c0030658.zip
cfg80211: update dfs_state_entered upon dfs_state change
The timestamp wasn't updated after transitioning to the NL80211_DFS_USABLE state after NOP time. 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.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/wireless/mlme.c b/net/wireless/mlme.c
index edfe6de00e7b..6a6b1c8e907d 100644
--- a/net/wireless/mlme.c
+++ b/net/wireless/mlme.c
@@ -712,6 +712,8 @@ void cfg80211_dfs_channels_update_work(struct work_struct *work)
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);