From: "Luis R. Rodriguez" <lrodriguez@atheros.com>
To: linville@tuxdriver.com, johannes@sipsolutions.net
Cc: linux-wireless@vger.kernel.org,
"Luis R. Rodriguez" <lrodriguez@atheros.com>
Subject: [PATCH 2/4] mac80211: move early error branch check on ieee80211_set_freq()
Date: Mon, 9 Mar 2009 22:04:57 -0400 [thread overview]
Message-ID: <1236650699-30538-3-git-send-email-lrodriguez@atheros.com> (raw)
In-Reply-To: <1236650699-30538-1-git-send-email-lrodriguez@atheros.com>
This has no functional change, we just move the bad case error check
early as we will soon add some more and this will make this easier to
read.
Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com>
---
net/mac80211/util.c | 27 ++++++++++++++-------------
1 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/net/mac80211/util.c b/net/mac80211/util.c
index e0431a1..32610a0 100644
--- a/net/mac80211/util.c
+++ b/net/mac80211/util.c
@@ -793,19 +793,20 @@ int ieee80211_set_freq(struct ieee80211_sub_if_data *sdata, int freqMHz)
chan = ieee80211_get_channel(local->hw.wiphy, freqMHz);
- if (chan && !(chan->flags & IEEE80211_CHAN_DISABLED)) {
- if (sdata->vif.type == NL80211_IFTYPE_ADHOC &&
- chan->flags & IEEE80211_CHAN_NO_IBSS)
- return ret;
- local->oper_channel = chan;
- local->oper_channel_type = NL80211_CHAN_NO_HT;
-
- if (local->sw_scanning || local->hw_scanning)
- ret = 0;
- else
- ret = ieee80211_hw_config(
- local, IEEE80211_CONF_CHANGE_CHANNEL);
- }
+ if (!chan || (chan->flags & IEEE80211_CHAN_DISABLED))
+ return ret;
+
+ if (sdata->vif.type == NL80211_IFTYPE_ADHOC &&
+ chan->flags & IEEE80211_CHAN_NO_IBSS)
+ return ret;
+ local->oper_channel = chan;
+ local->oper_channel_type = NL80211_CHAN_NO_HT;
+
+ if (local->sw_scanning || local->hw_scanning)
+ ret = 0;
+ else
+ ret = ieee80211_hw_config(
+ local, IEEE80211_CONF_CHANGE_CHANNEL);
return ret;
}
--
1.6.0.6
next prev parent reply other threads:[~2009-03-10 2:05 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-03-10 2:04 [PATCH 0/4] wireless: use channel bandwidth Luis R. Rodriguez
2009-03-10 2:04 ` [PATCH 1/4] cfg80211: check allowed channel max bandwidth before setting HT40 Luis R. Rodriguez
2009-03-10 2:04 ` Luis R. Rodriguez [this message]
2009-03-10 2:04 ` [PATCH 3/4] mac80211: disallow HT40 if max channel bandwidth is less than 40 MHz Luis R. Rodriguez
2009-03-10 7:15 ` Johannes Berg
2009-03-10 8:43 ` Luis R. Rodriguez
2009-03-10 8:46 ` Johannes Berg
2009-03-10 8:51 ` Luis R. Rodriguez
2009-03-10 2:04 ` [PATCH 4/4] cfg80211: send channel max bandwidth to userspace Luis R. Rodriguez
2009-03-10 7:16 ` [PATCH 0/4] wireless: use channel bandwidth Johannes Berg
2009-03-10 8:43 ` Luis R. Rodriguez
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=1236650699-30538-3-git-send-email-lrodriguez@atheros.com \
--to=lrodriguez@atheros.com \
--cc=johannes@sipsolutions.net \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.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