iwlwifi: use configured valid rx chain for scan
authorShanyu Zhao <shanyu.zhao@intel.com>
Fri, 6 Nov 2009 22:52:48 +0000 (14:52 -0800)
committerJohn W. Linville <linville@tuxdriver.com>
Wed, 11 Nov 2009 20:23:42 +0000 (15:23 -0500)
Use configured valid rx chains in scan command instead of ANT_ABC, correcting
valid rx chain configuration of 4965, should be ANT_ABC instead of ANT_AB.

Signed-off-by: Shanyu Zhao <shanyu.zhao@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
drivers/net/wireless/iwlwifi/iwl-4965.c
drivers/net/wireless/iwlwifi/iwl-scan.c

index 1ff465ad40d838386dc47066aeac69a4d517921d..faa4c4e2d43c9c8855485eb6e47bde347093f30a 100644 (file)
@@ -2228,7 +2228,7 @@ struct iwl_cfg iwl4965_agn_cfg = {
        .num_of_ampdu_queues = IWL49_NUM_AMPDU_QUEUES,
        .mod_params = &iwl4965_mod_params,
        .valid_tx_ant = ANT_AB,
-       .valid_rx_ant = ANT_AB,
+       .valid_rx_ant = ANT_ABC,
        .pll_cfg_val = 0,
        .set_l0s = true,
        .use_bsm = true,
index 48bc2636a8efd944b796efc12388367f353975a4..a2b2b8315ff9efa2509c47dbfafe123644423d7f 100644 (file)
@@ -749,7 +749,7 @@ static void iwl_bg_request_scan(struct work_struct *data)
                rx_ant = first_antenna(active_chains);
        }
        /* MIMO is not used here, but value is required */
-       rx_chain |= ANT_ABC << RXON_RX_CHAIN_VALID_POS;
+       rx_chain |= priv->hw_params.valid_rx_ant << RXON_RX_CHAIN_VALID_POS;
        rx_chain |= rx_ant << RXON_RX_CHAIN_FORCE_MIMO_SEL_POS;
        rx_chain |= rx_ant << RXON_RX_CHAIN_FORCE_SEL_POS;
        rx_chain |= 0x1 << RXON_RX_CHAIN_DRIVER_FORCE_POS;