summaryrefslogtreecommitdiffstats
path: root/net/wireless
diff options
context:
space:
mode:
authorLuis R. Rodriguez <lrodriguez@atheros.com>2008-11-12 14:21:57 -0800
committerJohn W. Linville <linville@tuxdriver.com>2008-11-25 16:41:22 -0500
commit8375af3ba213154041cfbc655f452913f23bfbd5 (patch)
tree4e459a54b9590b00f0b28995fb28ea823f2ce5ee /net/wireless
parent5203cdb6ad430d3313444ddc6486da70af1a60db (diff)
downloadop-kernel-dev-8375af3ba213154041cfbc655f452913f23bfbd5.zip
op-kernel-dev-8375af3ba213154041cfbc655f452913f23bfbd5.tar.gz
cfg80211: remove switch from __set_regdom()
We have control over the REGDOM_SET_BY_* macros passed so remove the switch. This patch has no functional changes. Signed-off-by: Luis R. Rodriguez <lrodriguez@atheros.com> Acked-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'net/wireless')
-rw-r--r--net/wireless/reg.c21
1 files changed, 6 insertions, 15 deletions
diff --git a/net/wireless/reg.c b/net/wireless/reg.c
index e44f005..290ecec 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -829,21 +829,12 @@ static int __set_regdom(const struct ieee80211_regdomain *rd)
reset_regdomains();
/* Country IE parsing coming soon */
- switch (last_request->initiator) {
- case REGDOM_SET_BY_CORE:
- case REGDOM_SET_BY_DRIVER:
- case REGDOM_SET_BY_USER:
- if (!is_valid_rd(rd)) {
- printk(KERN_ERR "cfg80211: Invalid "
- "regulatory domain detected:\n");
- print_regdomain_info(rd);
- return -EINVAL;
- }
- break;
- case REGDOM_SET_BY_COUNTRY_IE: /* Not yet */
- WARN_ON(1);
- default:
- return -EOPNOTSUPP;
+
+ if (!is_valid_rd(rd)) {
+ printk(KERN_ERR "cfg80211: Invalid "
+ "regulatory domain detected:\n");
+ print_regdomain_info(rd);
+ return -EINVAL;
}
if (unlikely(last_request->intersect)) {
OpenPOWER on IntegriCloud