mac80211: fix CSA handling timer

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=3049000b97bbfc90aa9ba413eadc4007e5bce2e0
Commit:     3049000b97bbfc90aa9ba413eadc4007e5bce2e0
Parent:     57eebdf3c28fe7134597acad529fc40f99b76601
Author:     Johannes Berg <johannes.berg at intel.com>
AuthorDate: Wed Aug 1 15:53:45 2012 +0200
Committer:  Johannes Berg <johannes.berg at intel.com>
CommitDate: Mon Aug 20 13:57:49 2012 +0200

    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 at intel.com>
---
 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 ae524c9..9e61fe1 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,