Re: [PATCH 3.4] mac80211: fix association beacon wait timeout
From: Oliver Hartkopp <socketcan@hartkopp.net>
Date: 2012-03-28 19:49:21
On 28.03.2012 21:02, Johannes Berg wrote:
From: Johannes Berg <redacted> The TU_TO_EXP_TIME() macro already includes the "jiffies +" piece of the calculation, so don't add jiffies again. Reported-by: Oliver Hartkopp <socketcan@hartkopp.net> Signed-off-by: Johannes Berg <redacted>
Tested-by: Oliver Hartkopp <socketcan@hartkopp.net> three times :-) Thanks Johannes!
quoted hunk ↗ jump to hunk
--- net/mac80211/mlme.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)--- a/net/mac80211/mlme.c 2012-03-28 20:55:35.000000000 +0200 +++ b/net/mac80211/mlme.c 2012-03-28 20:56:14.000000000 +0200@@ -3387,8 +3387,7 @@ int ieee80211_mgd_assoc(struct ieee80211 */ 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;