aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/zd1211rw/zd_chip.c
diff options
context:
space:
mode:
authorDaniel Drake <dsd@gentoo.org>2007-05-24 01:07:15 +0100
committerJeff Garzik <jeff@garzik.org>2007-07-08 22:16:37 -0400
commitaaf83d4fc4a596929306c894d341e17fbdfba758 (patch)
treecf54c8bcc0d8be6b895e754f6cff6f9681b759ee /drivers/net/wireless/zd1211rw/zd_chip.c
parent4481d6093e62e168ab06e9bbb4e67a9bebb8c7f7 (diff)
downloadkernel_samsung_smdk4412-aaf83d4fc4a596929306c894d341e17fbdfba758.zip
kernel_samsung_smdk4412-aaf83d4fc4a596929306c894d341e17fbdfba758.tar.gz
kernel_samsung_smdk4412-aaf83d4fc4a596929306c894d341e17fbdfba758.tar.bz2
[PATCH] zd1211rw: Make CCK gain patching conditional on RF type
The vendor driver code suggests that CR47 patching happens on every channel change for every RF (depending on bit 8 in POD). Due to a bug in their driver (upper bits of RF_Mode get zeroed out, then are examined for 1s when setting some other flags), this isn't actually what happens, and their generic CCK patching routine never takes effect. Some of their RF configurations do include explicit (duplicated) code for CR47 patching though. This patch makes zd1211rw match that behaviour. Signed-off-by: Daniel Drake <dsd@gentoo.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/zd1211rw/zd_chip.c')
-rw-r--r--drivers/net/wireless/zd1211rw/zd_chip.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/zd1211rw/zd_chip.c b/drivers/net/wireless/zd1211rw/zd_chip.c
index 4a2ceb9..5b624bf 100644
--- a/drivers/net/wireless/zd1211rw/zd_chip.c
+++ b/drivers/net/wireless/zd1211rw/zd_chip.c
@@ -1286,7 +1286,7 @@ static int patch_cck_gain(struct zd_chip *chip)
int r;
u32 value;
- if (!chip->patch_cck_gain)
+ if (!chip->patch_cck_gain || !zd_rf_should_patch_cck_gain(&chip->rf))
return 0;
ZD_ASSERT(mutex_is_locked(&chip->mutex));