summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-07-27 22:18:47 -0700
committerDavid S. Miller <davem@davemloft.net>2011-07-27 22:18:47 -0700
commitb49179c071b89423e1f6c50f6fa3d48d8158bc35 (patch)
treeb6aca473839c2c9d7b72bafffa91e6dd6471f9a3 /net
parent17dd759c67f21e34f2156abcf415e1f60605a188 (diff)
parente5036c2575b244851637a81efc4104c076c4fa21 (diff)
downloadlinux-3.10-b49179c071b89423e1f6c50f6fa3d48d8158bc35.tar.gz
linux-3.10-b49179c071b89423e1f6c50f6fa3d48d8158bc35.tar.bz2
linux-3.10-b49179c071b89423e1f6c50f6fa3d48d8158bc35.zip
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
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 1ad0f39fe09..02751dbc5a9 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)