Re: [RFC 1/2] mac80211: fix remain_off_channel regression

[Ben Greear <greearb@candelatech.com>]

On 07/25/2011 08:29 AM, Eliad Peller wrote:
> i'm not familiar enough with the off_channel flow,
> but this one looks completely broken - we should
> remain_off_channel if the work was started, and
> the work's channel and channel_type are the same
> as local->tmp_channel and local->tmp_channel_type.
>
> however, if wk->chan_type and local->tmp_channel_type
> coexist (e.g. have the same channel type), we won't
> remain_off_channel.
>
> this behavior was introduced by commit da2fd1f
> ("mac80211: Allow work items to use existing
> channel type.")

This patch looks correct to me.

Thanks,
Ben

>
> Signed-off-by: Eliad Peller<eliad@wizery.com>
> ---
>   net/mac80211/work.c |    4 ++--
>   1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/net/mac80211/work.c b/net/mac80211/work.c
> index a94b312..3291958 100644
> --- a/net/mac80211/work.c
> +++ b/net/mac80211/work.c
> @@ -1068,8 +1068,8 @@ static void ieee80211_work_work(struct work_struct *work)
>   			continue;
>   		if (wk->chan != local->tmp_channel)
>   			continue;
> -		if (ieee80211_work_ct_coexists(wk->chan_type,
> -					       local->tmp_channel_type))
> +		if (!ieee80211_work_ct_coexists(wk->chan_type,
> +						local->tmp_channel_type))
>   			continue;
>   		remain_off_channel = true;
>   	}


-- 
Ben Greear <greearb@candelatech.com>
Candela Technologies Inc  http://www.candelatech.com