| commit | 3f9768a5d262d01d317b2a03933db3d5082fcb68 | [log] [tgz] |
|---|---|---|
| author | Johannes Berg <johannes.berg@intel.com> | Wed Mar 28 21:02:46 2012 +0200 |
| committer | John W. Linville <linville@tuxdriver.com> | Mon Apr 09 15:54:46 2012 -0400 |
| tree | 7fbb83cd52b96d62bfd2d686103d43e10b658eaf | |
| parent | 41833af713457fe92f432a7354bc690587652879 [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>