Re: [PATCH 3/3] mac80211: simplify ieee80211_work_work

[Johannes Berg <johannes@sipsolutions.net>]

On Thu, 2011-11-03 at 10:40 +0100, Stanislaw Gruszka wrote:
> Since local->tmp_channel is always NULL in one branch, some code paths
> will newer be taken in that branch, so remove them.

Reviewed-by: Johannes Berg <johannes@sipsolutions.net>

> Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
> ---
>  net/mac80211/work.c |   17 +++--------------
>  1 files changed, 3 insertions(+), 14 deletions(-)
> 
> diff --git a/net/mac80211/work.c b/net/mac80211/work.c
> index 6c53b6d..788b96e 100644
> --- a/net/mac80211/work.c
> +++ b/net/mac80211/work.c
> @@ -969,10 +969,9 @@ static void ieee80211_work_work(struct work_struct *work)
>  		}
>  
>  		if (!started && !local->tmp_channel) {
> -			bool on_oper_chan;
> -			bool tmp_chan_changed = false;
> -			bool on_oper_chan2;
> +			bool on_oper_chan, on_oper_chan2;
>  			enum nl80211_channel_type wk_ct;
> +
>  			on_oper_chan = ieee80211_cfg_on_oper_channel(local);
>  
>  			/* Work with existing channel type if possible. */
> @@ -981,11 +980,6 @@ static void ieee80211_work_work(struct work_struct *work)
>  				wk_ct = ieee80211_calc_ct(wk->chan_type,
>  						local->hw.conf.channel_type);
>  
> -			if (local->tmp_channel)
> -				if ((local->tmp_channel != wk->chan) ||
> -				    (local->tmp_channel_type != wk_ct))
> -					tmp_chan_changed = true;
> -
>  			local->tmp_channel = wk->chan;
>  			local->tmp_channel_type = wk_ct;
>  			/*
> @@ -1008,12 +1002,7 @@ static void ieee80211_work_work(struct work_struct *work)
>  								    true,
>  								    false);
>  				}
> -			} else if (tmp_chan_changed)
> -				/* Still off-channel, but on some other
> -				 * channel, so update hardware.
> -				 * PS should already be off-channel.
> -				 */
> -				ieee80211_hw_config(local, 0);
> +			}
>  
>  			started = true;
>  			wk->timeout = jiffies;