diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2012-08-01 15:53:45 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2012-08-20 13:57:49 +0200 |
| commit | 3049000b97bbfc90aa9ba413eadc4007e5bce2e0 (patch) | |
| tree | 884719b4994b9727881381c6de02bad2ef2b87b7 /net/mac80211/mlme.c | |
| parent | 57eebdf3c28fe7134597acad529fc40f99b76601 (diff) | |
| download | blackbird-op-linux-3049000b97bbfc90aa9ba413eadc4007e5bce2e0.tar.gz blackbird-op-linux-3049000b97bbfc90aa9ba413eadc4007e5bce2e0.zip | |
mac80211: fix CSA handling timer
The time until the channel switch is in TU,
not in milliseconds, so use TU_TO_EXP_TIME()
to correctly program the timer.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/mlme.c')
| -rw-r--r-- | net/mac80211/mlme.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index ae524c9081ee..9e61fe127a33 100644 --- a/net/mac80211/mlme.c +++ b/net/mac80211/mlme.c @@ -813,9 +813,8 @@ void ieee80211_sta_process_chanswitch(struct ieee80211_sub_if_data *sdata, ieee80211_queue_work(&sdata->local->hw, &ifmgd->chswitch_work); else mod_timer(&ifmgd->chswitch_timer, - jiffies + - msecs_to_jiffies(sw_elem->count * - cbss->beacon_interval)); + TU_TO_EXP_TIME(sw_elem->count * + cbss->beacon_interval)); } static void ieee80211_handle_pwr_constr(struct ieee80211_sub_if_data *sdata, |
