aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/iwlwifi/iwl-scan.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2008-09-30 20:59:05 -0400
committerJohn W. Linville <linville@tuxdriver.com>2008-10-31 19:00:50 -0400
commit9387b7caf3049168fc97a8a9111af8fe2143af18 (patch)
tree6a19e5477d6a6badf19788536a9d3e1913ae48e1 /drivers/net/wireless/iwlwifi/iwl-scan.c
parent2819f8ad6da1e24b5dd94a221978e61f2a9c972a (diff)
wireless: use individual buffers for printing ssid values
Also change escape_ssid to print_ssid to match print_mac semantics. Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/iwlwifi/iwl-scan.c')
-rw-r--r--drivers/net/wireless/iwlwifi/iwl-scan.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/net/wireless/iwlwifi/iwl-scan.c b/drivers/net/wireless/iwlwifi/iwl-scan.c
index 1cc8aa592821..3379b41fb5ee 100644
--- a/drivers/net/wireless/iwlwifi/iwl-scan.c
+++ b/drivers/net/wireless/iwlwifi/iwl-scan.c
@@ -643,6 +643,7 @@ static void iwl_bg_request_scan(struct work_struct *data)
643 u8 n_probes = 2; 643 u8 n_probes = 2;
644 u8 rx_chain = priv->hw_params.valid_rx_ant; 644 u8 rx_chain = priv->hw_params.valid_rx_ant;
645 u8 rate; 645 u8 rate;
646 DECLARE_SSID_BUF(ssid);
646 647
647 conf = ieee80211_get_hw_conf(priv->hw); 648 conf = ieee80211_get_hw_conf(priv->hw);
648 649
@@ -735,8 +736,8 @@ static void iwl_bg_request_scan(struct work_struct *data)
735 /* We should add the ability for user to lock to PASSIVE ONLY */ 736 /* We should add the ability for user to lock to PASSIVE ONLY */
736 if (priv->one_direct_scan) { 737 if (priv->one_direct_scan) {
737 IWL_DEBUG_SCAN("Start direct scan for '%s'\n", 738 IWL_DEBUG_SCAN("Start direct scan for '%s'\n",
738 escape_ssid(priv->direct_ssid, 739 print_ssid(ssid, priv->direct_ssid,
739 priv->direct_ssid_len)); 740 priv->direct_ssid_len));
740 scan->direct_scan[0].id = WLAN_EID_SSID; 741 scan->direct_scan[0].id = WLAN_EID_SSID;
741 scan->direct_scan[0].len = priv->direct_ssid_len; 742 scan->direct_scan[0].len = priv->direct_ssid_len;
742 memcpy(scan->direct_scan[0].ssid, 743 memcpy(scan->direct_scan[0].ssid,
@@ -744,7 +745,7 @@ static void iwl_bg_request_scan(struct work_struct *data)
744 n_probes++; 745 n_probes++;
745 } else if (!iwl_is_associated(priv) && priv->essid_len) { 746 } else if (!iwl_is_associated(priv) && priv->essid_len) {
746 IWL_DEBUG_SCAN("Start direct scan for '%s' (not associated)\n", 747 IWL_DEBUG_SCAN("Start direct scan for '%s' (not associated)\n",
747 escape_ssid(priv->essid, priv->essid_len)); 748 print_ssid(ssid, priv->essid, priv->essid_len));
748 scan->direct_scan[0].id = WLAN_EID_SSID; 749 scan->direct_scan[0].id = WLAN_EID_SSID;
749 scan->direct_scan[0].len = priv->essid_len; 750 scan->direct_scan[0].len = priv->essid_len;
750 memcpy(scan->direct_scan[0].ssid, priv->essid, priv->essid_len); 751 memcpy(scan->direct_scan[0].ssid, priv->essid, priv->essid_len);