]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 7c81888) | patch
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)
commitf3a3cfada17f1d63a8b1de8c700d483fadcd84f0
tree7fbb83cd52b96d62bfd2d686103d43e10b658eaftree | snapshot
parent7c81888e0e35e5118a4fa15e3f64be010d71f35dcommit | 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>
net/mac80211/mlme.c diff | blob | history
Linux Kernel Source Tree.