[PATCH] libertas: use MAC_FMT and MAC_ARG where appropriate

[safe/jmp/linux-2.6] / drivers / net / wireless / libertas / scan.c

diff --git a/drivers/net/wireless/libertas/scan.c b/drivers/net/wireless/libertas/scan.c
index 437a1e9..133be93 100644 (file)
--- a/drivers/net/wireless/libertas/scan.c
+++ b/drivers/net/wireless/libertas/scan.c
@@ -235,32 +235,15 @@ static void wlan_scan_process_results(wlan_private * priv)
        wlan_adapter *adapter = priv->adapter;
        struct bss_descriptor * iter_bss;
 
-       mutex_lock(&adapter->lock);
-
-       if (adapter->connect_status != libertas_connected)
-               goto debug_print;
-
-       /* try to find the current BSSID in the scan list */
-       list_for_each_entry (iter_bss, &adapter->network_list, list) {
-               if (libertas_SSID_cmp(&iter_bss->ssid, &adapter->curbssparams.ssid))
-                       continue;
-               if (memcmp(adapter->curbssparams.bssid, iter_bss->bssid, ETH_ALEN))
-                       continue;
-               /* Make a copy of current BSSID descriptor */
-               memcpy(&adapter->curbssparams.bssdescriptor, iter_bss,
-                      sizeof(struct bss_descriptor));
-               break;
-       }
+       if (adapter->connect_status == libertas_connected)
+               return;
 
-debug_print:
+       mutex_lock(&adapter->lock);
        list_for_each_entry (iter_bss, &adapter->network_list, list) {
                lbs_deb_scan("Scan:(%02d) " MAC_FMT ", RSSI[%03d], SSID[%s]\n",
-                      i++,
-                      iter_bss->bssid[0], iter_bss->bssid[1], iter_bss->bssid[2],
-                      iter_bss->bssid[3], iter_bss->bssid[4], iter_bss->bssid[5],
-                      (s32) iter_bss->rssi, iter_bss->ssid.ssid);
+                      i++, MAC_ARG(iter_bss->bssid), (s32) iter_bss->rssi,
+                      iter_bss->ssid.ssid);
        }
-
        mutex_unlock(&adapter->lock);
 }
 
@@ -998,9 +981,7 @@ static int libertas_process_bss(struct bss_descriptor * bss,
        bytesleftforcurrentbeacon = beaconsize;
 
        memcpy(bss->bssid, pcurrentptr, ETH_ALEN);
-       lbs_deb_scan("process_bss: AP BSSID " MAC_FMT "\n",
-              bss->bssid[0], bss->bssid[1], bss->bssid[2],
-              bss->bssid[3], bss->bssid[4], bss->bssid[5]);
+       lbs_deb_scan("process_bss: AP BSSID " MAC_FMT "\n", MAC_ARG(bss->bssid));
 
        pcurrentptr += ETH_ALEN;
        bytesleftforcurrentbeacon -= ETH_ALEN;