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

[linux-2.6-omap-h63xx.git] / drivers / net / wireless / zd1211rw / zd_mac.c

diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c b/drivers/net/wireless/zd1211rw/zd_mac.c
index 6753d240c16825f9c0b0c4801f2874e8b57c462f..522de3f0dfaff27f86c126c779b1c98de437439e 100644 (file)
--- a/drivers/net/wireless/zd1211rw/zd_mac.c
+++ b/drivers/net/wireless/zd1211rw/zd_mac.c
@@ -113,11 +113,14 @@ int zd_mac_init_hw(struct zd_mac *mac, u8 device_type)
        if (r)
                goto disable_int;
        if (!zd_regdomain_supported(default_regdomain)) {
-               dev_dbg_f(zd_mac_dev(mac),
-                         "Regulatory Domain %#04x is not supported.\n",
-                         default_regdomain);
-               r = -EINVAL;
-               goto disable_int;
+               /* The vendor driver overrides the regulatory domain and
+                * allowed channel registers and unconditionally restricts
+                * available channels to 1-11 everywhere. Match their
+                * questionable behaviour only for regdomains which we don't
+                * 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);
        mac->regdomain = mac->default_regdomain = default_regdomain;