mac80211: fix association beacon wait timeout

The TU_TO_EXP_TIME() macro already includes the
"jiffies +" piece of the calculation, so don't
add jiffies again.

Reported-by: Oliver Hartkopp <[email protected]>
Signed-off-by: Johannes Berg <[email protected]>
Tested-by: Oliver Hartkopp <[email protected]>
Signed-off-by: John W. Linville <[email protected]>

diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
index 576fb25456dd7479a0ed51c50efad9c6a238c3d1..f76da5b3f5c5864f0b649187fca47517d244ce77 100644 (file)
--- a/net/mac80211/mlme.c
+++ b/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;