Commit 86d95c21 authored by Daniel Drake's avatar Daniel Drake Committed by John W. Linville

[PATCH] zd1211rw: Allow channels 1-11 for unrecognised regulatory domains

Zen Kato's device has a regulatory domain value of 0x49, which is not an
IEEE 802.11 code and is not even identified in the vendor driver.

Recent versions of the vendor driver don't even look at the regdomain
value any more, and just allow channels 1-11 everywhere. This patch
brings us more in line with that behaviour, by allowing channels 1-11
for regdomains which we don't know about.
Signed-off-by: default avatarDaniel Drake <dsd@gentoo.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent fb038c27
...@@ -113,11 +113,14 @@ int zd_mac_init_hw(struct zd_mac *mac, u8 device_type) ...@@ -113,11 +113,14 @@ int zd_mac_init_hw(struct zd_mac *mac, u8 device_type)
if (r) if (r)
goto disable_int; goto disable_int;
if (!zd_regdomain_supported(default_regdomain)) { if (!zd_regdomain_supported(default_regdomain)) {
dev_dbg_f(zd_mac_dev(mac), /* The vendor driver overrides the regulatory domain and
"Regulatory Domain %#04x is not supported.\n", * allowed channel registers and unconditionally restricts
default_regdomain); * available channels to 1-11 everywhere. Match their
r = -EINVAL; * questionable behaviour only for regdomains which we don't
goto disable_int; * recognise. */
dev_warn(zd_mac_dev(mac), "Unrecognised regulatory domain: "
"%#04x. Defaulting to FCC.\n", default_regdomain);
default_regdomain = ZD_REGDOMAIN_FCC;
} }
spin_lock_irq(&mac->lock); spin_lock_irq(&mac->lock);
mac->regdomain = mac->default_regdomain = default_regdomain; mac->regdomain = mac->default_regdomain = default_regdomain;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment