diff options
Diffstat (limited to 'drivers/net/wireless/libertas/scan.c')
| -rw-r--r-- | drivers/net/wireless/libertas/scan.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/net/wireless/libertas/scan.c b/drivers/net/wireless/libertas/scan.c index 8f66903641b9..fcaef38d5df9 100644 --- a/drivers/net/wireless/libertas/scan.c +++ b/drivers/net/wireless/libertas/scan.c | |||
| @@ -359,7 +359,6 @@ int lbs_scan_networks(struct lbs_private *priv, int full_scan) | |||
| 359 | #ifdef CONFIG_LIBERTAS_DEBUG | 359 | #ifdef CONFIG_LIBERTAS_DEBUG |
| 360 | struct bss_descriptor *iter; | 360 | struct bss_descriptor *iter; |
| 361 | int i = 0; | 361 | int i = 0; |
| 362 | DECLARE_MAC_BUF(mac); | ||
| 363 | #endif | 362 | #endif |
| 364 | 363 | ||
| 365 | lbs_deb_enter_args(LBS_DEB_SCAN, "full_scan %d", full_scan); | 364 | lbs_deb_enter_args(LBS_DEB_SCAN, "full_scan %d", full_scan); |
| @@ -451,8 +450,8 @@ int lbs_scan_networks(struct lbs_private *priv, int full_scan) | |||
| 451 | mutex_lock(&priv->lock); | 450 | mutex_lock(&priv->lock); |
| 452 | lbs_deb_scan("scan table:\n"); | 451 | lbs_deb_scan("scan table:\n"); |
| 453 | list_for_each_entry(iter, &priv->network_list, list) | 452 | list_for_each_entry(iter, &priv->network_list, list) |
| 454 | lbs_deb_scan("%02d: BSSID %s, RSSI %d, SSID '%s'\n", | 453 | lbs_deb_scan("%02d: BSSID %pM, RSSI %d, SSID '%s'\n", |
| 455 | i++, print_mac(mac, iter->bssid), iter->rssi, | 454 | i++, iter->bssid, iter->rssi, |
| 456 | escape_essid(iter->ssid, iter->ssid_len)); | 455 | escape_essid(iter->ssid, iter->ssid_len)); |
| 457 | mutex_unlock(&priv->lock); | 456 | mutex_unlock(&priv->lock); |
| 458 | #endif | 457 | #endif |
| @@ -512,7 +511,6 @@ static int lbs_process_bss(struct bss_descriptor *bss, | |||
| 512 | struct ieeetypes_dsparamset *pDS; | 511 | struct ieeetypes_dsparamset *pDS; |
| 513 | struct ieeetypes_cfparamset *pCF; | 512 | struct ieeetypes_cfparamset *pCF; |
| 514 | struct ieeetypes_ibssparamset *pibss; | 513 | struct ieeetypes_ibssparamset *pibss; |
| 515 | DECLARE_MAC_BUF(mac); | ||
| 516 | struct ieeetypes_countryinfoset *pcountryinfo; | 514 | struct ieeetypes_countryinfoset *pcountryinfo; |
| 517 | uint8_t *pos, *end, *p; | 515 | uint8_t *pos, *end, *p; |
| 518 | uint8_t n_ex_rates = 0, got_basic_rates = 0, n_basic_rates = 0; | 516 | uint8_t n_ex_rates = 0, got_basic_rates = 0, n_basic_rates = 0; |
| @@ -544,7 +542,7 @@ static int lbs_process_bss(struct bss_descriptor *bss, | |||
| 544 | *bytesleft -= beaconsize; | 542 | *bytesleft -= beaconsize; |
| 545 | 543 | ||
| 546 | memcpy(bss->bssid, pos, ETH_ALEN); | 544 | memcpy(bss->bssid, pos, ETH_ALEN); |
| 547 | lbs_deb_scan("process_bss: BSSID %s\n", print_mac(mac, bss->bssid)); | 545 | lbs_deb_scan("process_bss: BSSID %pM\n", bss->bssid); |
| 548 | pos += ETH_ALEN; | 546 | pos += ETH_ALEN; |
| 549 | 547 | ||
| 550 | if ((end - pos) < 12) { | 548 | if ((end - pos) < 12) { |
| @@ -1151,7 +1149,6 @@ static int lbs_ret_80211_scan(struct lbs_private *priv, unsigned long dummy, | |||
| 1151 | struct bss_descriptor new; | 1149 | struct bss_descriptor new; |
| 1152 | struct bss_descriptor *found = NULL; | 1150 | struct bss_descriptor *found = NULL; |
| 1153 | struct bss_descriptor *oldest = NULL; | 1151 | struct bss_descriptor *oldest = NULL; |
| 1154 | DECLARE_MAC_BUF(mac); | ||
| 1155 | 1152 | ||
| 1156 | /* Process the data fields and IEs returned for this BSS */ | 1153 | /* Process the data fields and IEs returned for this BSS */ |
| 1157 | memset(&new, 0, sizeof (struct bss_descriptor)); | 1154 | memset(&new, 0, sizeof (struct bss_descriptor)); |
| @@ -1190,7 +1187,7 @@ static int lbs_ret_80211_scan(struct lbs_private *priv, unsigned long dummy, | |||
| 1190 | continue; | 1187 | continue; |
| 1191 | } | 1188 | } |
| 1192 | 1189 | ||
| 1193 | lbs_deb_scan("SCAN_RESP: BSSID %s\n", print_mac(mac, new.bssid)); | 1190 | lbs_deb_scan("SCAN_RESP: BSSID %pM\n", new.bssid); |
| 1194 | 1191 | ||
| 1195 | /* Copy the locally created newbssentry to the scan table */ | 1192 | /* Copy the locally created newbssentry to the scan table */ |
| 1196 | memcpy(found, &new, offsetof(struct bss_descriptor, list)); | 1193 | memcpy(found, &new, offsetof(struct bss_descriptor, list)); |
