fedora core 6 1.2949 + vserver 2.2.0

[linux-2.6.git] / drivers / net / wireless / zd1211rw / zd_ieee80211.c

diff --git a/drivers/net/wireless/zd1211rw/zd_ieee80211.c b/drivers/net/wireless/zd1211rw/zd_ieee80211.c
index 66905f7..189160e 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)
@@ -133,9 +138,6 @@ int zd_find_channel(u8 *channel, const struct iw_freq *freq)
        int i, r;
        u32 mhz;
 
-       if (!(freq->flags & IW_FREQ_FIXED))
-               return 0;
-
        if (freq->m < 1000) {
                if (freq->m  > NUM_CHANNELS || freq->m == 0)
                        return -EINVAL;