iwlwifi: scan correct setting of valid rx_chains

commit d588be6bae40f7965f1b681a4dbc3254411787b9 upstream.

This patch sets rx_chain bitmap correctly according hw configuration.

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c
index 3a90a678f37d6c3c24bb41e74605c77adedb8c6a..87d020c98a760f1e71c8320e6267b8665548f54c 100644 (file)
--- a/drivers/net/wireless/iwlwifi/iwl-scan.c
+++ b/drivers/net/wireless/iwlwifi/iwl-scan.c
@@ -704,7 +704,7 @@ static void iwl_bg_request_scan(struct work_struct *data)
        u16 cmd_len;
        enum ieee80211_band band;
        u8 n_probes = 2;
-       u8 rx_chain = 0x7; /* bitmap: ABC chains */
+       u8 rx_chain = priv->hw_params.valid_rx_ant;
 
        conf = ieee80211_get_hw_conf(priv->hw);