[PATCH 04/99] cw1200: Remove unnecessary condition in scan function
Dmitry Tarnyagin
dmitry.tarnyagin at stericsson.com
Wed Feb 29 14:14:11 UTC 2012
From: Marek Kwaczynski <marek.kwaczynski at tieto.com>
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 at tieto.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/34420
Reviewed-by: Bartosz MARKOWSKI <bartosz.markowski at tieto.com>
---
drivers/staging/cw1200/scan.c | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/cw1200/scan.c b/drivers/staging/cw1200/scan.c
index cb63376..391fab8 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);
--
1.7.8.3
More information about the kernel
mailing list