aboutsummaryrefslogtreecommitdiffstats
path: root/net/wireless/reg.c
diff options
context:
space:
mode:
authorLuis R. Rodriguez <lrodriguez@atheros.com>2009-07-30 17:38:06 -0700
committerJohn W. Linville <linville@tuxdriver.com>2009-08-04 16:44:18 -0400
commit9828b0170eef541c3fa583caa0134dadbb1d3ea6 (patch)
tree57be41f7595a145630c86dfb81a7e6aea4f8b242 /net/wireless/reg.c
parentmac80211: fix powersave (diff)
downloadlinux-dev-9828b0170eef541c3fa583caa0134dadbb1d3ea6.tar.xz
linux-dev-9828b0170eef541c3fa583caa0134dadbb1d3ea6.zip
cfg80211: use goto out on country IE reg hint failure
This has no functional changes. Acked-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/wireless/reg.c')
-rw-r--r--net/wireless/reg.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index fb40428a5946..2d1d183ae6f0 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -1774,10 +1774,8 @@ void regulatory_hint_11d(struct wiphy *wiphy,
mutex_lock(&cfg80211_mutex);
- if (unlikely(!last_request)) {
- mutex_unlock(&cfg80211_mutex);
- return;
- }
+ if (unlikely(!last_request))
+ goto out;
/* IE len must be evenly divisible by 2 */
if (country_ie_len & 0x01)