[PATCH] zd1211rw: Reject AL2230S devices
authorDaniel Drake <dsd@gentoo.org>
Sun, 11 Mar 2007 19:54:11 +0000 (19:54 +0000)
committerJohn W. Linville <linville@tuxdriver.com>
Tue, 10 Apr 2007 15:03:29 +0000 (11:03 -0400)
zd1211rw currently detects AL2230S-based devices as AL2230, and hence
programs the RF incorrectly. Transmit silently fails on this
misconfiguration.

After this patch, AL2230S devices are rejected with an error message, to
avoid any confusion with an apparent driver bug.

Signed-off-by: Daniel Drake <dsd@gentoo.org>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/zd1211rw/zd_chip.c
drivers/net/wireless/zd1211rw/zd_chip.h
drivers/net/wireless/zd1211rw/zd_rf_al2230.c

index 9c64f894b71b180fecb9f9742b29fdaac0d46162..9d299bd1885008be44cda5b5fea3c1df369893bf 100644 (file)
@@ -337,6 +337,7 @@ static int read_pod(struct zd_chip *chip, u8 *rf_type)
        chip->patch_cr157 = (value >> 13) & 0x1;
        chip->patch_6m_band_edge = (value >> 21) & 0x1;
        chip->new_phy_layout = (value >> 31) & 0x1;
+       chip->al2230s_bit = (value >> 7) & 0x1;
        chip->link_led = ((value >> 4) & 1) ? LED1 : LED2;
        chip->supports_tx_led = 1;
        if (value & (1 << 24)) { /* LED scenario */
index b07569e391ee2e4d16ccbd7f2434fa1a2e6dd491..ae39c225bc9ef67db6b24f659ac89fe2370ad1df 100644 (file)
@@ -711,7 +711,7 @@ struct zd_chip {
        u16 link_led;
        unsigned int pa_type:4,
                patch_cck_gain:1, patch_cr157:1, patch_6m_band_edge:1,
-               new_phy_layout:1,
+               new_phy_layout:1, al2230s_bit:1,
                is_zd1211b:1, supports_tx_led:1;
 };
 
index 25323a13a3dbe97e2967ab253e8c1f01900135b3..5235a7827ac5effcd14ab26438bcc712987a3fa7 100644 (file)
@@ -358,6 +358,12 @@ int zd_rf_init_al2230(struct zd_rf *rf)
 {
        struct zd_chip *chip = zd_rf_to_chip(rf);
 
+       if (chip->al2230s_bit) {
+               dev_err(zd_chip_dev(chip), "AL2230S devices are not yet "
+                       "supported by this driver.\n");
+               return -ENODEV;
+       }
+
        rf->switch_radio_off = al2230_switch_radio_off;
        if (chip->is_zd1211b) {
                rf->init_hw = zd1211b_al2230_init_hw;