* [PATCH 3.4] mac80211: fix association beacon wait timeout
@ 2012-03-28 19:02 Johannes Berg
2012-03-28 19:49 ` Oliver Hartkopp
0 siblings, 1 reply; 2+ messages in thread
From: Johannes Berg @ 2012-03-28 19:02 UTC (permalink / raw)
To: John Linville; +Cc: Oliver Hartkopp, linux-wireless
From: Johannes Berg <johannes.berg@intel.com>
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>
---
net/mac80211/mlme.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
--- a/net/mac80211/mlme.c 2012-03-28 20:55:35.000000000 +0200
+++ b/net/mac80211/mlme.c 2012-03-28 20:56:14.000000000 +0200
@@ -3387,8 +3387,7 @@ int ieee80211_mgd_assoc(struct ieee80211
*/
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;
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH 3.4] mac80211: fix association beacon wait timeout
2012-03-28 19:02 [PATCH 3.4] mac80211: fix association beacon wait timeout Johannes Berg
@ 2012-03-28 19:49 ` Oliver Hartkopp
0 siblings, 0 replies; 2+ messages in thread
From: Oliver Hartkopp @ 2012-03-28 19:49 UTC (permalink / raw)
To: Johannes Berg, John Linville; +Cc: linux-wireless
On 28.03.2012 21:02, Johannes Berg wrote:
> From: Johannes Berg <johannes.berg@intel.com>
>
> 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>
three times :-)
Thanks Johannes!
> ---
> net/mac80211/mlme.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> --- a/net/mac80211/mlme.c 2012-03-28 20:55:35.000000000 +0200
> +++ b/net/mac80211/mlme.c 2012-03-28 20:56:14.000000000 +0200
> @@ -3387,8 +3387,7 @@ int ieee80211_mgd_assoc(struct ieee80211
> */
> 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;
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-03-28 19:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-03-28 19:02 [PATCH 3.4] mac80211: fix association beacon wait timeout Johannes Berg
2012-03-28 19:49 ` Oliver Hartkopp
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.