Merge branch 'for-davem' of ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6

1 files changed, 32 insertions, 39 deletions

diff --git a/drivers/net/wireless/iwlwifi/iwl-1000.c b/drivers/net/wireless/iwlwifi/iwl-1000.c
index af85458401a4..ba78bc8a259f 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;
 
@@ -272,60 +276,49 @@ static struct iwl_ht_params iwl1000_ht_params = {
         .use_rts_for_aggregation = true, /* use rts/cts protection */
 };
 
+#define IWL_DEVICE_1000                                         \
+        .fw_name_pre = IWL1000_FW_PRE,                          \
+        .ucode_api_max = IWL1000_UCODE_API_MAX,                 \
+        .ucode_api_min = IWL1000_UCODE_API_MIN,                 \
+        .eeprom_ver = EEPROM_1000_EEPROM_VERSION,               \
+        .eeprom_calib_ver = EEPROM_1000_TX_POWER_VERSION,       \
+        .ops = &iwl1000_ops,                                    \
+        .mod_params = &iwlagn_mod_params,                       \
+        .base_params = &iwl1000_base_params,                    \
+        .led_mode = IWL_LED_BLINK
+
 struct iwl_cfg iwl1000_bgn_cfg = {
         .name = "Intel(R) Centrino(R) Wireless-N 1000 BGN",
-        .fw_name_pre = IWL1000_FW_PRE,
-        .ucode_api_max = IWL1000_UCODE_API_MAX,
-        .ucode_api_min = IWL1000_UCODE_API_MIN,
-        .eeprom_ver = EEPROM_1000_EEPROM_VERSION,
-        .eeprom_calib_ver = EEPROM_1000_TX_POWER_VERSION,
-        .ops = &iwl1000_ops,
-        .mod_params = &iwlagn_mod_params,
-        .base_params = &iwl1000_base_params,
+        IWL_DEVICE_1000,
         .ht_params = &iwl1000_ht_params,
-        .led_mode = IWL_LED_BLINK,
 };
 
 struct iwl_cfg iwl1000_bg_cfg = {
         .name = "Intel(R) Centrino(R) Wireless-N 1000 BG",
-        .fw_name_pre = IWL1000_FW_PRE,
-        .ucode_api_max = IWL1000_UCODE_API_MAX,
-        .ucode_api_min = IWL1000_UCODE_API_MIN,
-        .eeprom_ver = EEPROM_1000_EEPROM_VERSION,
-        .eeprom_calib_ver = EEPROM_1000_TX_POWER_VERSION,
-        .ops = &iwl1000_ops,
-        .mod_params = &iwlagn_mod_params,
-        .base_params = &iwl1000_base_params,
-        .led_mode = IWL_LED_BLINK,
+        IWL_DEVICE_1000,
 };
 
+#define IWL_DEVICE_100                                          \
+        .fw_name_pre = IWL100_FW_PRE,                           \
+        .ucode_api_max = IWL100_UCODE_API_MAX,                  \
+        .ucode_api_min = IWL100_UCODE_API_MIN,                  \
+        .eeprom_ver = EEPROM_1000_EEPROM_VERSION,               \
+        .eeprom_calib_ver = EEPROM_1000_TX_POWER_VERSION,       \
+        .ops = &iwl1000_ops,                                    \
+        .mod_params = &iwlagn_mod_params,                       \
+        .base_params = &iwl1000_base_params,                    \
+        .led_mode = IWL_LED_RF_STATE,                           \
+        .rx_with_siso_diversity = true
+
 struct iwl_cfg iwl100_bgn_cfg = {
         .name = "Intel(R) Centrino(R) Wireless-N 100 BGN",
-        .fw_name_pre = IWL100_FW_PRE,
-        .ucode_api_max = IWL100_UCODE_API_MAX,
-        .ucode_api_min = IWL100_UCODE_API_MIN,
-        .eeprom_ver = EEPROM_1000_EEPROM_VERSION,
-        .eeprom_calib_ver = EEPROM_1000_TX_POWER_VERSION,
-        .ops = &iwl1000_ops,
-        .mod_params = &iwlagn_mod_params,
-        .base_params = &iwl1000_base_params,
+        IWL_DEVICE_100,
         .ht_params = &iwl1000_ht_params,
-        .led_mode = IWL_LED_RF_STATE,
-        .use_new_eeprom_reading = true,
 };
 
 struct iwl_cfg iwl100_bg_cfg = {
         .name = "Intel(R) Centrino(R) Wireless-N 100 BG",
-        .fw_name_pre = IWL100_FW_PRE,
-        .ucode_api_max = IWL100_UCODE_API_MAX,
-        .ucode_api_min = IWL100_UCODE_API_MIN,
-        .eeprom_ver = EEPROM_1000_EEPROM_VERSION,
-        .eeprom_calib_ver = EEPROM_1000_TX_POWER_VERSION,
-        .ops = &iwl1000_ops,
-        .mod_params = &iwlagn_mod_params,
-        .base_params = &iwl1000_base_params,
-        .led_mode = IWL_LED_RF_STATE,
-        .use_new_eeprom_reading = true,
+        IWL_DEVICE_100,
 };
 
 MODULE_FIRMWARE(IWL1000_MODULE_FIRMWARE(IWL1000_UCODE_API_MAX));