summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Kwaczynski <marek.kwaczynski@tieto.com>2012-02-29 15:14:11 +0100
committerPhilippe Langlais <philippe.langlais@stericsson.com>2012-05-22 11:06:36 +0200
commit2f60d34aa23fc9dd795b0a6df18bd3879b6154b5 (patch)
tree645d34440e054c85b0a63f1fe4abddf6c266b385
parent82669a6f865087397aa8c538f60aeed5218826e5 (diff)
cw1200: Remove unnecessary condition in scan function
When length of ssid is zero all networks are scanned. It is needed to display all networks in scan results when ssid of network was set before. ST-Ericsson ID: 365688 ST-Ericsson FOSS-OUT ID: NA Change-Id: I8e025d2e0f89cdd353b9cc2ac3eecbb399103588 Signed-off-by: Marek Kwaczynski <marek.kwaczynski@tieto.com> Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/34420 Reviewed-by: Bartosz MARKOWSKI <bartosz.markowski@tieto.com>
-rw-r--r--drivers/staging/cw1200/scan.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/drivers/staging/cw1200/scan.c b/drivers/staging/cw1200/scan.c
index cb63376649e..391fab8c2dc 100644
--- a/drivers/staging/cw1200/scan.c
+++ b/drivers/staging/cw1200/scan.c
@@ -107,15 +107,13 @@ int cw1200_hw_scan(struct ieee80211_hw *hw,
priv->scan.output_power = priv->output_power;
for (i = 0; i < req->n_ssids; ++i) {
- if (req->ssids[i].ssid_len) {
- struct wsm_ssid *dst =
- &priv->scan.ssids[priv->scan.n_ssids];
- BUG_ON(req->ssids[i].ssid_len > sizeof(dst->ssid));
- memcpy(&dst->ssid[0], req->ssids[i].ssid,
- sizeof(dst->ssid));
- dst->length = req->ssids[i].ssid_len;
- ++priv->scan.n_ssids;
- }
+ struct wsm_ssid *dst =
+ &priv->scan.ssids[priv->scan.n_ssids];
+ BUG_ON(req->ssids[i].ssid_len > sizeof(dst->ssid));
+ memcpy(&dst->ssid[0], req->ssids[i].ssid,
+ sizeof(dst->ssid));
+ dst->length = req->ssids[i].ssid_len;
+ ++priv->scan.n_ssids;
}
mutex_unlock(&priv->conf_mutex);