diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-09 18:26:43 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-09 18:26:43 -0400 |
commit | 71ba22fa739029bb158144813b9e82c00326497c (patch) | |
tree | cca33deab3b79b38e15e6b3f7d7f9dfbf7ab32a2 /drivers/net/wireless/zd1211rw/zd_chip.c | |
parent | 27a278aa4309df244a2619f47031acce00ca1b7c (diff) | |
parent | f2ec8030085a27c4ba8e95a10a96f248efb34177 (diff) |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (75 commits)
Ethernet driver for EISA only SNI RM200/RM400 machines
Extract chip specific code out of lasi_82596.c
ehea: Whitespace cleanup
pasemi_mac: Fix TX interrupt threshold
spidernet: Replace literal with const
r8169: perform RX config change after mac filtering
r8169: mac address change support
r8169: display some extra debug information during startup
r8169: add endianess annotations to [RT]xDesc
r8169: align the IP header when there is no DMA constraint
r8169: add bit description for the TxPoll register
r8169: cleanup
r8169: remove the media option
r8169: small 8101 comment
r8169: confusion between hardware and IP header alignment
r8169: merge with version 8.001.00 of Realtek's r8168 driver
r8169: merge with version 6.001.00 of Realtek's r8169 driver
r8169: prettify mac_version
r8169: populate the hw_start handler for the 8110
r8169: populate the hw_start handler for the 8168
...
Diffstat (limited to 'drivers/net/wireless/zd1211rw/zd_chip.c')
-rw-r--r-- | drivers/net/wireless/zd1211rw/zd_chip.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/wireless/zd1211rw/zd_chip.c b/drivers/net/wireless/zd1211rw/zd_chip.c index 95b4a2a26707..5b624bfc01a6 100644 --- a/drivers/net/wireless/zd1211rw/zd_chip.c +++ b/drivers/net/wireless/zd1211rw/zd_chip.c | |||
@@ -1253,6 +1253,9 @@ static int update_channel_integration_and_calibration(struct zd_chip *chip, | |||
1253 | { | 1253 | { |
1254 | int r; | 1254 | int r; |
1255 | 1255 | ||
1256 | if (!zd_rf_should_update_pwr_int(&chip->rf)) | ||
1257 | return 0; | ||
1258 | |||
1256 | r = update_pwr_int(chip, channel); | 1259 | r = update_pwr_int(chip, channel); |
1257 | if (r) | 1260 | if (r) |
1258 | return r; | 1261 | return r; |
@@ -1283,7 +1286,7 @@ static int patch_cck_gain(struct zd_chip *chip) | |||
1283 | int r; | 1286 | int r; |
1284 | u32 value; | 1287 | u32 value; |
1285 | 1288 | ||
1286 | if (!chip->patch_cck_gain) | 1289 | if (!chip->patch_cck_gain || !zd_rf_should_patch_cck_gain(&chip->rf)) |
1287 | return 0; | 1290 | return 0; |
1288 | 1291 | ||
1289 | ZD_ASSERT(mutex_is_locked(&chip->mutex)); | 1292 | ZD_ASSERT(mutex_is_locked(&chip->mutex)); |