From 631d0bab050aae15428783bbdb282af755e5f045 Mon Sep 17 00:00:00 2001 From: Eliad Peller Date: Tue, 15 May 2012 18:31:58 +0300 Subject: [PATCH] --- yaml --- r: 314155 b: refs/heads/master c: 587cc286c8a8e22bbe4521c331b88d62d0cb1076 h: refs/heads/master i: 314153: 0aba73e95df75baf12778c9a899f5fa61d6f0278 314151: 3e0ab78fa772128496dda24877e29b70d2b7ea6d v: v3 --- [refs] | 2 +- trunk/drivers/net/wireless/ti/wlcore/scan.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 152d29e39a58..4136aa505d51 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 78f85f5066b721666f869d537eaca6a0818aa301 +refs/heads/master: 587cc286c8a8e22bbe4521c331b88d62d0cb1076 diff --git a/trunk/drivers/net/wireless/ti/wlcore/scan.c b/trunk/drivers/net/wireless/ti/wlcore/scan.c index 94668d8ba14e..e1dbe812615f 100644 --- a/trunk/drivers/net/wireless/ti/wlcore/scan.c +++ b/trunk/drivers/net/wireless/ti/wlcore/scan.c @@ -605,7 +605,9 @@ wl12xx_scan_sched_scan_ssid_list(struct wl1271 *wl, continue; for (j = 0; j < cmd->n_ssids; j++) - if (!memcmp(req->ssids[i].ssid, + if ((req->ssids[i].ssid_len == + req->ssids[j].ssid_len) && + !memcmp(req->ssids[i].ssid, cmd->ssids[j].ssid, req->ssids[i].ssid_len)) { cmd->ssids[j].type =