On 28.03.2012 21:02, Johannes Berg wrote:
> From: Johannes Berg <johannes.berg@xxxxxxxxx>
>
> 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@xxxxxxxxxxxx>
> Signed-off-by: Johannes Berg <johannes.berg@xxxxxxxxx>
Tested-by: Oliver Hartkopp <socketcan@xxxxxxxxxxxx>
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;
>
>
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
