diff options
| author | Luis R. Rodriguez <lrodriguez@atheros.com> | 2008-11-12 14:21:57 -0800 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2008-11-25 16:41:22 -0500 |
| commit | 8375af3ba213154041cfbc655f452913f23bfbd5 (patch) | |
| tree | 4e459a54b9590b00f0b28995fb28ea823f2ce5ee /net/wireless/reg.c | |
| parent | 5203cdb6ad430d3313444ddc6486da70af1a60db (diff) | |
| download | talos-op-linux-8375af3ba213154041cfbc655f452913f23bfbd5.tar.gz talos-op-linux-8375af3ba213154041cfbc655f452913f23bfbd5.zip | |
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/reg.c')
| -rw-r--r-- | net/wireless/reg.c | 21 |
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) 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)) { |
