summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Spinadel <david.spinadel@intel.com>2013-07-04 15:17:48 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-08-11 18:35:21 -0700
commitd9bd9f5e484d91b89f022d40a925f2870502e4af (patch)
tree05565a4db40bd9750ba8a6d83ed1f98d53db6749
parentc0e4964618515104556da8bd96cc6604ab8286e2 (diff)
downloadlinux-3.10-d9bd9f5e484d91b89f022d40a925f2870502e4af.tar.gz
linux-3.10-d9bd9f5e484d91b89f022d40a925f2870502e4af.tar.bz2
linux-3.10-d9bd9f5e484d91b89f022d40a925f2870502e4af.zip
iwlwifi: mvm: fix bug in scan ssid
commit fe04e83706037802c502ea41c0d1799ec35fc0d7 upstream. Increment index in each iteration. Without this increment we are overriding the added SSIDs and we will send only the last SSId and (n_ssids - 1) broadcast probes. Signed-off-by: David Spinadel <david.spinadel@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/net/wireless/iwlwifi/mvm/scan.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/wireless/iwlwifi/mvm/scan.c b/drivers/net/wireless/iwlwifi/mvm/scan.c
index 2476e43799d..08fbfe0fca6 100644
--- a/drivers/net/wireless/iwlwifi/mvm/scan.c
+++ b/drivers/net/wireless/iwlwifi/mvm/scan.c
@@ -137,8 +137,8 @@ static void iwl_mvm_scan_fill_ssids(struct iwl_scan_cmd *cmd,
{
int fw_idx, req_idx;
- fw_idx = 0;
- for (req_idx = req->n_ssids - 1; req_idx > 0; req_idx--) {
+ for (req_idx = req->n_ssids - 1, fw_idx = 0; req_idx > 0;
+ req_idx--, fw_idx++) {
cmd->direct_scan[fw_idx].id = WLAN_EID_SSID;
cmd->direct_scan[fw_idx].len = req->ssids[req_idx].ssid_len;
memcpy(cmd->direct_scan[fw_idx].ssid,