Re: [PATCH] mac80211: do not trigger beacon loss work if scanning

[Johannes Berg <johannes@sipsolutions.net>]

[-- Attachment #1: Type: text/plain, Size: 1361 bytes --]

On Thu, 2009-07-23 at 15:49 -0700, Luis R. Rodriguez wrote:
> We were issues probe requests to the associated AP on the wrong
> band by having our beacon timer loss trigger while we are scanning.
> When we would scan the timer could hit and force us to send a
> probe request to the AP but with a chance we'd be on the wrong band.
> 
> This leads to finding no usable bitrate but we should not get so
> far on the xmit path. We should not be trying to send these probe
> request frames so prevent the timer from stuffing beacon loss work
> on the mac80211 workqueue when scanning.
> 
> Tested-by: Fabio Rossi <rossi.f@inwind.it>
> Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
> ---
>  net/mac80211/mlme.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/net/mac80211/mlme.c b/net/mac80211/mlme.c
> index 523c0d9..e90992e 100644
> --- a/net/mac80211/mlme.c
> +++ b/net/mac80211/mlme.c
> @@ -2187,7 +2187,7 @@ static void ieee80211_sta_bcn_mon_timer(unsigned long data)
>  		(struct ieee80211_sub_if_data *) data;
>  	struct ieee80211_local *local = sdata->local;
>  
> -	if (local->quiescing)
> +	if (local->quiescing || local->sw_scanning || local->hw_scanning)

I'd rather have  that check in ieee80211_mgd_probe_ap itself, so it's
much closer to the source of the problem.

johannes

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 801 bytes --]