aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/libertas/scan.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/wireless/libertas/scan.c')
-rw-r--r--drivers/net/wireless/libertas/scan.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/net/wireless/libertas/scan.c b/drivers/net/wireless/libertas/scan.c
index 7881890a4e98..5c34ac588189 100644
--- a/drivers/net/wireless/libertas/scan.c
+++ b/drivers/net/wireless/libertas/scan.c
@@ -362,6 +362,7 @@ int lbs_scan_networks(struct lbs_private *priv, int full_scan)
362#ifdef CONFIG_LIBERTAS_DEBUG 362#ifdef CONFIG_LIBERTAS_DEBUG
363 struct bss_descriptor *iter; 363 struct bss_descriptor *iter;
364 int i = 0; 364 int i = 0;
365 DECLARE_SSID_BUF(ssid);
365#endif 366#endif
366 367
367 lbs_deb_enter_args(LBS_DEB_SCAN, "full_scan %d", full_scan); 368 lbs_deb_enter_args(LBS_DEB_SCAN, "full_scan %d", full_scan);
@@ -455,7 +456,7 @@ int lbs_scan_networks(struct lbs_private *priv, int full_scan)
455 list_for_each_entry(iter, &priv->network_list, list) 456 list_for_each_entry(iter, &priv->network_list, list)
456 lbs_deb_scan("%02d: BSSID %pM, RSSI %d, SSID '%s'\n", 457 lbs_deb_scan("%02d: BSSID %pM, RSSI %d, SSID '%s'\n",
457 i++, iter->bssid, iter->rssi, 458 i++, iter->bssid, iter->rssi,
458 escape_ssid(iter->ssid, iter->ssid_len)); 459 print_ssid(ssid, iter->ssid, iter->ssid_len));
459 mutex_unlock(&priv->lock); 460 mutex_unlock(&priv->lock);
460#endif 461#endif
461 462
@@ -514,6 +515,7 @@ static int lbs_process_bss(struct bss_descriptor *bss,
514 struct ieeetypes_dsparamset *pDS; 515 struct ieeetypes_dsparamset *pDS;
515 struct ieeetypes_cfparamset *pCF; 516 struct ieeetypes_cfparamset *pCF;
516 struct ieeetypes_ibssparamset *pibss; 517 struct ieeetypes_ibssparamset *pibss;
518 DECLARE_SSID_BUF(ssid);
517 struct ieeetypes_countryinfoset *pcountryinfo; 519 struct ieeetypes_countryinfoset *pcountryinfo;
518 uint8_t *pos, *end, *p; 520 uint8_t *pos, *end, *p;
519 uint8_t n_ex_rates = 0, got_basic_rates = 0, n_basic_rates = 0; 521 uint8_t n_ex_rates = 0, got_basic_rates = 0, n_basic_rates = 0;
@@ -602,7 +604,7 @@ static int lbs_process_bss(struct bss_descriptor *bss,
602 bss->ssid_len = min_t(int, 32, elem->len); 604 bss->ssid_len = min_t(int, 32, elem->len);
603 memcpy(bss->ssid, elem->data, bss->ssid_len); 605 memcpy(bss->ssid, elem->data, bss->ssid_len);
604 lbs_deb_scan("got SSID IE: '%s', len %u\n", 606 lbs_deb_scan("got SSID IE: '%s', len %u\n",
605 escape_ssid(bss->ssid, bss->ssid_len), 607 print_ssid(ssid, bss->ssid, bss->ssid_len),
606 bss->ssid_len); 608 bss->ssid_len);
607 break; 609 break;
608 610
@@ -742,10 +744,11 @@ done:
742int lbs_send_specific_ssid_scan(struct lbs_private *priv, uint8_t *ssid, 744int lbs_send_specific_ssid_scan(struct lbs_private *priv, uint8_t *ssid,
743 uint8_t ssid_len) 745 uint8_t ssid_len)
744{ 746{
747 DECLARE_SSID_BUF(ssid_buf);
745 int ret = 0; 748 int ret = 0;
746 749
747 lbs_deb_enter_args(LBS_DEB_SCAN, "SSID '%s'\n", 750 lbs_deb_enter_args(LBS_DEB_SCAN, "SSID '%s'\n",
748 escape_ssid(ssid, ssid_len)); 751 print_ssid(ssid_buf, ssid, ssid_len));
749 752
750 if (!ssid_len) 753 if (!ssid_len)
751 goto out; 754 goto out;
@@ -940,6 +943,7 @@ out:
940int lbs_set_scan(struct net_device *dev, struct iw_request_info *info, 943int lbs_set_scan(struct net_device *dev, struct iw_request_info *info,
941 union iwreq_data *wrqu, char *extra) 944 union iwreq_data *wrqu, char *extra)
942{ 945{
946 DECLARE_SSID_BUF(ssid);
943 struct lbs_private *priv = dev->priv; 947 struct lbs_private *priv = dev->priv;
944 int ret = 0; 948 int ret = 0;
945 949
@@ -969,7 +973,7 @@ int lbs_set_scan(struct net_device *dev, struct iw_request_info *info,
969 priv->scan_ssid_len = req->essid_len; 973 priv->scan_ssid_len = req->essid_len;
970 memcpy(priv->scan_ssid, req->essid, priv->scan_ssid_len); 974 memcpy(priv->scan_ssid, req->essid, priv->scan_ssid_len);
971 lbs_deb_wext("set_scan, essid '%s'\n", 975 lbs_deb_wext("set_scan, essid '%s'\n",
972 escape_ssid(priv->scan_ssid, priv->scan_ssid_len)); 976 print_ssid(ssid, priv->scan_ssid, priv->scan_ssid_len));
973 } else { 977 } else {
974 priv->scan_ssid_len = 0; 978 priv->scan_ssid_len = 0;
975 } 979 }