Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae6ead46 authored by Daniel Drake's avatar Daniel Drake Committed by John W. Linville
Browse files

[PATCH] zd1211rw: Reject AL2230S devices 



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: default avatarDaniel Drake <dsd@gentoo.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent a21bd69e

drivers/net/wireless/zd1211rw/zd_chip.c

+1 −0
Original line number Diff line number Diff line
@@ -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 */

drivers/net/wireless/zd1211rw/zd_chip.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

};

drivers/net/wireless/zd1211rw/zd_rf_al2230.c

+6 −0
Original line number Diff line number Diff line
@@ -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;