[PATCH] zd1211rw: Allow channels 1-13 in Japan

Eric Goff found that he could not use his ZD1211 device which is
programmed for the Japan regulatory domain. It turns out that ZyDAS
deviate from the spec here: they do not use the newer Japan region code
(0x41) but their drivers do operate as if the newer Japan legal
frequency range is in effect.

Signed-off-by: Daniel Drake <dsd@gentoo.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/zd1211rw/zd_ieee80211.c b/drivers/net/wireless/zd1211rw/zd_ieee80211.c
index 1b215a099745deb4b9e1b4471b5b4c34d053f18a..189160efd2ae45e3265f97baafd40c472224556a 100644 (file)
--- a/drivers/net/wireless/zd1211rw/zd_ieee80211.c
+++ b/drivers/net/wireless/zd1211rw/zd_ieee80211.c
@@ -37,7 +37,12 @@ static const struct channel_range channel_ranges[] = {
        [ZD_REGDOMAIN_JAPAN]     = { 1, 14},
        [ZD_REGDOMAIN_SPAIN]     = { 1, 14},
        [ZD_REGDOMAIN_FRANCE]    = { 1, 14},
-       [ZD_REGDOMAIN_JAPAN_ADD] = {14, 15},
+
+       /* Japan originally only had channel 14 available (see CHNL_ID 0x40 in
+        * 802.11). However, in 2001 the range was extended to include channels
+        * 1-13. The ZyDAS devices still use the old region code but are
+        * designed to allow the extra channel access in Japan. */
+       [ZD_REGDOMAIN_JAPAN_ADD] = { 1, 15},
 };
 
 const struct channel_range *zd_channel_range(u8 regdomain)