diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2012-03-28 21:02:46 +0200 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-04-09 21:54:46 +0200 |
| commit | 3f9768a5d262d01d317b2a03933db3d5082fcb68 (patch) | |
| tree | 7fbb83cd52b96d62bfd2d686103d43e10b658eaf /arch | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/blueto... (diff) | |
| download | linux-3f9768a5d262d01d317b2a03933db3d5082fcb68.tar.xz 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 'arch')
0 files changed, 0 insertions, 0 deletions