From: Johannes Berg <johannes@sipsolutions.net>
To: Stanislaw Gruszka <sgruszka@redhat.com>
Cc: linux-wireless@vger.kernel.org
Subject: Re: [PATCH 1/3] mac80211: remove uneeded scan_chan variable
Date: Tue, 08 Nov 2011 14:14:02 +0100 [thread overview]
Message-ID: <1320758042.4304.30.camel@jlt3.sipsolutions.net> (raw)
In-Reply-To: <1320313247-23167-1-git-send-email-sgruszka@redhat.com>
On Thu, 2011-11-03 at 10:40 +0100, Stanislaw Gruszka wrote:
> Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
Reviewed-by: Johannes Berg <johannes@sipsolutions.net>
> ---
> net/mac80211/main.c | 14 ++++++--------
> 1 files changed, 6 insertions(+), 8 deletions(-)
>
> diff --git a/net/mac80211/main.c b/net/mac80211/main.c
> index d4ee6d2..7710b10 100644
> --- a/net/mac80211/main.c
> +++ b/net/mac80211/main.c
> @@ -100,7 +100,7 @@ static void ieee80211_reconfig_filter(struct work_struct *work)
> */
> bool ieee80211_cfg_on_oper_channel(struct ieee80211_local *local)
> {
> - struct ieee80211_channel *chan, *scan_chan;
> + struct ieee80211_channel *chan;
> enum nl80211_channel_type channel_type;
>
> /* This logic needs to match logic in ieee80211_hw_config */
> @@ -114,7 +114,7 @@ bool ieee80211_cfg_on_oper_channel(struct ieee80211_local *local)
> else
> channel_type = NL80211_CHAN_NO_HT;
> } else if (local->tmp_channel) {
> - chan = scan_chan = local->tmp_channel;
> + chan = local->tmp_channel;
> channel_type = local->tmp_channel_type;
> } else {
> chan = local->oper_channel;
> @@ -135,7 +135,7 @@ bool ieee80211_cfg_on_oper_channel(struct ieee80211_local *local)
>
> int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
> {
> - struct ieee80211_channel *chan, *scan_chan;
> + struct ieee80211_channel *chan;
> int ret = 0;
> int power;
> enum nl80211_channel_type channel_type;
> @@ -143,14 +143,12 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
>
> might_sleep();
>
> - scan_chan = local->scan_channel;
> -
> /* If this off-channel logic ever changes, ieee80211_on_oper_channel
> * may need to change as well.
> */
> offchannel_flag = local->hw.conf.flags & IEEE80211_CONF_OFFCHANNEL;
> - if (scan_chan) {
> - chan = scan_chan;
> + if (local->scan_channel) {
> + chan = local->scan_channel;
> /* If scanning on oper channel, use whatever channel-type
> * is currently in use.
> */
> @@ -159,7 +157,7 @@ int ieee80211_hw_config(struct ieee80211_local *local, u32 changed)
> else
> channel_type = NL80211_CHAN_NO_HT;
> } else if (local->tmp_channel) {
> - chan = scan_chan = local->tmp_channel;
> + chan = local->tmp_channel;
> channel_type = local->tmp_channel_type;
> } else {
> chan = local->oper_channel;
prev parent reply other threads:[~2011-11-08 13:14 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-03 9:40 [PATCH 1/3] mac80211: remove uneeded scan_chan variable Stanislaw Gruszka
2011-11-03 9:40 ` [PATCH 2/3] mac80211: remove useless brackets in ieee80211_cfg_on_oper_channel Stanislaw Gruszka
2011-11-08 13:14 ` Johannes Berg
2011-11-03 9:40 ` [PATCH 3/3] mac80211: simplify ieee80211_work_work Stanislaw Gruszka
2011-11-08 13:14 ` Johannes Berg
2011-11-08 13:14 ` Johannes Berg [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1320758042.4304.30.camel@jlt3.sipsolutions.net \
--to=johannes@sipsolutions.net \
--cc=linux-wireless@vger.kernel.org \
--cc=sgruszka@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox