mac80211: fix association beacon wait timeout
authorJohannes Berg <johannes.berg@intel.com>
Wed, 28 Mar 2012 19:02:46 +0000 (21:02 +0200)
committerJohn W. Linville <linville@tuxdriver.com>
Mon, 9 Apr 2012 19:54:46 +0000 (15:54 -0400)
commit3f9768a5d262d01d317b2a03933db3d5082fcb68
tree7fbb83cd52b96d62bfd2d686103d43e10b658eaf
parent41833af713457fe92f432a7354bc690587652879
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>
net/mac80211/mlme.c