From 4d7c9442c6761888f18e42a488662d49369f86d3 Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Wed, 1 Aug 2012 15:53:45 +0200 Subject: [PATCH] --- yaml --- r: 327657 b: refs/heads/master c: 3049000b97bbfc90aa9ba413eadc4007e5bce2e0 h: refs/heads/master i: 327655: 1227b7dcdae0ffc0ab5bd52735181cc18a07dce4 v: v3 --- [refs] | 2 +- trunk/net/mac80211/mlme.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9e6875e1be88..7c61dea8e012 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 57eebdf3c28fe7134597acad529fc40f99b76601 +refs/heads/master: 3049000b97bbfc90aa9ba413eadc4007e5bce2e0 diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c index ae524c9081ee..9e61fe127a33 100644 --- a/trunk/net/mac80211/mlme.c +++ b/trunk/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,