summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2011-07-26 17:05:55 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-07-26 17:05:55 -0400
commite5036c2575b244851637a81efc4104c076c4fa21 (patch)
tree5d8d5dd0a768b77bda3299ea565c7444c26ed6f1 /net
parent41bf37117b47fc5ce2aae91f6a108e7e42e0b046 (diff)
parent5bc91db8933bce07c3af86da2bd956414aa5a725 (diff)
downloadlinux-e5036c2575b244851637a81efc4104c076c4fa21.tar.gz
linux-e5036c2575b244851637a81efc4104c076c4fa21.tar.bz2
linux-e5036c2575b244851637a81efc4104c076c4fa21.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
Diffstat (limited to 'net')
-rw-r--r--net/wireless/reg.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index 1ad0f39fe091..02751dbc5a97 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -903,7 +903,7 @@ static bool ignore_reg_update(struct wiphy *wiphy,
initiator != NL80211_REGDOM_SET_BY_COUNTRY_IE &&
!is_world_regdom(last_request->alpha2)) {
REG_DBG_PRINT("Ignoring regulatory request %s "
- "since the driver requires its own regulaotry "
+ "since the driver requires its own regulatory "
"domain to be set first",
reg_initiator_name(initiator));
return true;
@@ -1125,12 +1125,13 @@ void wiphy_update_regulatory(struct wiphy *wiphy,
enum ieee80211_band band;
if (ignore_reg_update(wiphy, initiator))
- goto out;
+ return;
+
for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
if (wiphy->bands[band])
handle_band(wiphy, band, initiator);
}
-out:
+
reg_process_beacons(wiphy);
reg_process_ht_flags(wiphy);
if (wiphy->reg_notifier)