Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f9768a5 authored by Johannes Berg's avatar Johannes Berg Committed by John W. Linville
Browse files

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: default avatarOliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Tested-by: default avatarOliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 41833af7

net/mac80211/mlme.c

+1 −2
Original line number Diff line number Diff line
@@ -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;