diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2012-03-28 21:02:46 +0200 |
|---|---|---|
| committer | Varun Wadekar <vwadekar@nvidia.com> | 2012-04-18 19:58:50 +0530 |
| commit | 2018de2e2f860d4c2a780e524157ae4c1238524c (patch) | |
| tree | 62effd6e84fd6f383d0af47d5753b9bd771b4f01 /net/mac80211 | |
| parent | 7e7705af0bc4837c69f2571421236cb2614bf66a (diff) | |
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 <socketcan@hartkopp.net>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Tested-by: Oliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/mlme.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c index 576fb25456dd..f76da5b3f5c5 100644 --- 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; |