diff options
| author | Johannes Berg | 2012-03-28 21:02:46 +0200 |
|---|---|---|
| committer | John W. Linville | 2012-04-09 21:54:46 +0200 |
| commit | 3f9768a5d262d01d317b2a03933db3d5082fcb68 (patch) | |
| tree | 7fbb83cd52b96d62bfd2d686103d43e10b658eaf /net/mac80211 | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/blueto... (diff) | |
| download | kernel-qcow2-linux-3f9768a5d262d01d317b2a03933db3d5082fcb68.tar.gz kernel-qcow2-linux-3f9768a5d262d01d317b2a03933db3d5082fcb68.tar.xz kernel-qcow2-linux-3f9768a5d262d01d317b2a03933db3d5082fcb68.zip | |
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; |