From e1188cb7646a963746bc1c4cba812e2fcb68ffd4 Mon Sep 17 00:00:00 2001
From: Johannes Berg <johannes.berg@intel.com>
Date: Wed, 28 Mar 2012 21:02:46 +0200
Subject: [PATCH] --- yaml --- r: 299042 b: refs/heads/master c:
 3f9768a5d262d01d317b2a03933db3d5082fcb68 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/net/mac80211/mlme.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 9e24479b4d54..3d2611836def 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 41833af713457fe92f432a7354bc690587652879
+refs/heads/master: 3f9768a5d262d01d317b2a03933db3d5082fcb68
diff --git a/trunk/net/mac80211/mlme.c b/trunk/net/mac80211/mlme.c
index 576fb25456dd..f76da5b3f5c5 100644
--- a/trunk/net/mac80211/mlme.c
+++ b/trunk/net/mac80211/mlme.c
@@ -3387,8 +3387,7 @@ int ieee80211_mgd_assoc(struct ieee80211_sub_if_data *sdata,
 		 */
 		printk(KERN_DEBUG "%s: waiting for beacon from %pM\n",
 		       sdata->name, ifmgd->bssid);
-		assoc_data->timeout = jiffies +
-				TU_TO_EXP_TIME(req->bss->beacon_interval);
+		assoc_data->timeout = TU_TO_EXP_TIME(req->bss->beacon_interval);
 	} else {
 		assoc_data->have_beacon = true;
 		assoc_data->sent_assoc = false;