aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuis R. Rodriguez <lrodriguez@atheros.com>2008-11-12 17:21:57 -0500
committerJohn W. Linville <linville@tuxdriver.com>2008-11-25 16:41:22 -0500
commit8375af3ba213154041cfbc655f452913f23bfbd5 (patch)
tree4e459a54b9590b00f0b28995fb28ea823f2ce5ee
parent5203cdb6ad430d3313444ddc6486da70af1a60db (diff)
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>
-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 e44f0052687c..290ececd4f11 100644
--- a/net/wireless/reg.c
+++ b/net/wireless/reg.c
@@ -829,21 +829,12 @@ static int __set_regdom(const struct ieee80211_regdomain *rd)
829 reset_regdomains(); 829 reset_regdomains();
830 830
831 /* Country IE parsing coming soon */ 831 /* Country IE parsing coming soon */
832 switch (last_request->initiator) { 832
833 case REGDOM_SET_BY_CORE: 833 if (!is_valid_rd(rd)) {
834 case REGDOM_SET_BY_DRIVER: 834 printk(KERN_ERR "cfg80211: Invalid "
835 case REGDOM_SET_BY_USER: 835 "regulatory domain detected:\n");
836 if (!is_valid_rd(rd)) { 836 print_regdomain_info(rd);
837 printk(KERN_ERR "cfg80211: Invalid " 837 return -EINVAL;
838 "regulatory domain detected:\n");
839 print_regdomain_info(rd);
840 return -EINVAL;
841 }
842 break;
843 case REGDOM_SET_BY_COUNTRY_IE: /* Not yet */
844 WARN_ON(1);
845 default:
846 return -EOPNOTSUPP;
847 } 838 }
848 839
849 if (unlikely(last_request->intersect)) { 840 if (unlikely(last_request->intersect)) {