Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=86d95c214357df0e27dc6af493b62a1073e9d6b2
Commit:     86d95c214357df0e27dc6af493b62a1073e9d6b2
Parent:     fb038c279694638cb3cd24d496062ae38700f542
Author:     Daniel Drake <[EMAIL PROTECTED]>
AuthorDate: Sun Jul 1 18:21:49 2007 +0100
Committer:  John W. Linville <[EMAIL PROTECTED]>
CommitDate: Tue Jul 10 14:14:55 2007 -0400

    [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: Daniel Drake <[EMAIL PROTECTED]>
    Signed-off-by: John W. Linville <[EMAIL PROTECTED]>
---
 drivers/net/wireless/zd1211rw/zd_mac.c |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/drivers/net/wireless/zd1211rw/zd_mac.c 
b/drivers/net/wireless/zd1211rw/zd_mac.c
index 6753d24..522de3f 100644
--- 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;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to