diff options
| author | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2010-12-06 11:51:39 -0800 |
|---|---|---|
| committer | Wey-Yi Guy <wey-yi.w.guy@intel.com> | 2010-12-13 15:51:44 -0800 |
| commit | 17423ea8776362100b0a9a162cdd4b16b886a4a2 (patch) | |
| tree | 00da36f5fd1687e9226fe1afdbbad672532b89e3 /drivers/net/wireless/iwlwifi/iwl-1000.c | |
| parent | 9decde95be8a77a16f5668544bee45d41a7ae665 (diff) | |
iwlagn: rx antenna diversity
For the new 1x1 devices, hw and uCode will support rx
antenna diversity, but we need to indicate 1x1 device to
AccessPoint to make sure it won't use MIMO.
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-1000.c')
| -rw-r--r-- | drivers/net/wireless/iwlwifi/iwl-1000.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-1000.c b/drivers/net/wireless/iwlwifi/iwl-1000.c index 3c983e426f2..94521d4417a 100644 --- a/drivers/net/wireless/iwlwifi/iwl-1000.c +++ b/drivers/net/wireless/iwlwifi/iwl-1000.c @@ -147,7 +147,11 @@ static int iwl1000_hw_set_hw_params(struct iwl_priv *priv) priv->hw_params.rx_wrt_ptr_reg = FH_RSCSR_CHNL0_WPTR; priv->hw_params.tx_chains_num = num_of_ant(priv->cfg->valid_tx_ant); - priv->hw_params.rx_chains_num = num_of_ant(priv->cfg->valid_rx_ant); + if (priv->cfg->rx_with_siso_diversity) + priv->hw_params.rx_chains_num = 1; + else + priv->hw_params.rx_chains_num = + num_of_ant(priv->cfg->valid_rx_ant); priv->hw_params.valid_tx_ant = priv->cfg->valid_tx_ant; priv->hw_params.valid_rx_ant = priv->cfg->valid_rx_ant; @@ -311,6 +315,7 @@ struct iwl_cfg iwl100_bgn_cfg = { .base_params = &iwl1000_base_params, .ht_params = &iwl1000_ht_params, .led_mode = IWL_LED_RF_STATE, + .rx_with_siso_diversity = true, }; struct iwl_cfg iwl100_bg_cfg = { @@ -324,6 +329,7 @@ struct iwl_cfg iwl100_bg_cfg = { .mod_params = &iwlagn_mod_params, .base_params = &iwl1000_base_params, .led_mode = IWL_LED_RF_STATE, + .rx_with_siso_diversity = true, }; MODULE_FIRMWARE(IWL1000_MODULE_FIRMWARE(IWL1000_UCODE_API_MAX)); |