diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-06-11 14:36:48 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-06-11 14:36:48 -0400 |
| commit | ed6be3dcfee0bb891efd6ea908ca32bea711085b (patch) | |
| tree | 3ca66c68b384e48b00150218583c39b716377c27 /drivers/net/wireless/iwlwifi/iwl-trans-pcie.c | |
| parent | 16b0dc29c1af9df341428f4c49ada4f626258082 (diff) | |
| parent | 6aee4ca3d2217d3f76469e5ed576d62695f0912a (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-trans-pcie.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-trans-pcie.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c index ec6fb395b84d..79c6b91417f9 100644 --- a/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c +++ b/drivers/net/wireless/iwlwifi/iwl-trans-pcie.c | |||
| @@ -1058,6 +1058,11 @@ static void iwl_tx_start(struct iwl_trans *trans) | |||
| 1058 | iwl_write_prph(trans, SCD_DRAM_BASE_ADDR, | 1058 | iwl_write_prph(trans, SCD_DRAM_BASE_ADDR, |
| 1059 | trans_pcie->scd_bc_tbls.dma >> 10); | 1059 | trans_pcie->scd_bc_tbls.dma >> 10); |
| 1060 | 1060 | ||
| 1061 | /* The chain extension of the SCD doesn't work well. This feature is | ||
| 1062 | * enabled by default by the HW, so we need to disable it manually. | ||
| 1063 | */ | ||
| 1064 | iwl_write_prph(trans, SCD_CHAINEXT_EN, 0); | ||
| 1065 | |||
| 1061 | /* Enable DMA channel */ | 1066 | /* Enable DMA channel */ |
| 1062 | for (chan = 0; chan < FH_TCSR_CHNL_NUM ; chan++) | 1067 | for (chan = 0; chan < FH_TCSR_CHNL_NUM ; chan++) |
| 1063 | iwl_write_direct32(trans, FH_TCSR_CHNL_TX_CONFIG_REG(chan), | 1068 | iwl_write_direct32(trans, FH_TCSR_CHNL_TX_CONFIG_REG(chan), |