net: convert print_mac to %pM
This converts pretty much everything to print_mac. There were a few things that had conflicts which I have just dropped for now, no harm done. I've built an allyesconfig with this and looked at the files that weren't built very carefully, but it's a huge patch. Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
committed by
David S. Miller
parent
0c68ae2605
commit
e174961ca1
@@ -359,7 +359,6 @@ int lbs_scan_networks(struct lbs_private *priv, int full_scan)
|
||||
#ifdef CONFIG_LIBERTAS_DEBUG
|
||||
struct bss_descriptor *iter;
|
||||
int i = 0;
|
||||
DECLARE_MAC_BUF(mac);
|
||||
#endif
|
||||
|
||||
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)
|
||||
mutex_lock(&priv->lock);
|
||||
lbs_deb_scan("scan table:\n");
|
||||
list_for_each_entry(iter, &priv->network_list, list)
|
||||
lbs_deb_scan("%02d: BSSID %s, RSSI %d, SSID '%s'\n",
|
||||
i++, print_mac(mac, iter->bssid), iter->rssi,
|
||||
lbs_deb_scan("%02d: BSSID %pM, RSSI %d, SSID '%s'\n",
|
||||
i++, iter->bssid, iter->rssi,
|
||||
escape_essid(iter->ssid, iter->ssid_len));
|
||||
mutex_unlock(&priv->lock);
|
||||
#endif
|
||||
@@ -512,7 +511,6 @@ static int lbs_process_bss(struct bss_descriptor *bss,
|
||||
struct ieeetypes_dsparamset *pDS;
|
||||
struct ieeetypes_cfparamset *pCF;
|
||||
struct ieeetypes_ibssparamset *pibss;
|
||||
DECLARE_MAC_BUF(mac);
|
||||
struct ieeetypes_countryinfoset *pcountryinfo;
|
||||
uint8_t *pos, *end, *p;
|
||||
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,
|
||||
*bytesleft -= beaconsize;
|
||||
|
||||
memcpy(bss->bssid, pos, ETH_ALEN);
|
||||
lbs_deb_scan("process_bss: BSSID %s\n", print_mac(mac, bss->bssid));
|
||||
lbs_deb_scan("process_bss: BSSID %pM\n", bss->bssid);
|
||||
pos += ETH_ALEN;
|
||||
|
||||
if ((end - pos) < 12) {
|
||||
@@ -1151,7 +1149,6 @@ static int lbs_ret_80211_scan(struct lbs_private *priv, unsigned long dummy,
|
||||
struct bss_descriptor new;
|
||||
struct bss_descriptor *found = NULL;
|
||||
struct bss_descriptor *oldest = NULL;
|
||||
DECLARE_MAC_BUF(mac);
|
||||
|
||||
/* Process the data fields and IEs returned for this BSS */
|
||||
memset(&new, 0, sizeof (struct bss_descriptor));
|
||||
@@ -1190,7 +1187,7 @@ static int lbs_ret_80211_scan(struct lbs_private *priv, unsigned long dummy,
|
||||
continue;
|
||||
}
|
||||
|
||||
lbs_deb_scan("SCAN_RESP: BSSID %s\n", print_mac(mac, new.bssid));
|
||||
lbs_deb_scan("SCAN_RESP: BSSID %pM\n", new.bssid);
|
||||
|
||||
/* Copy the locally created newbssentry to the scan table */
|
||||
memcpy(found, &new, offsetof(struct bss_descriptor, list));
|
||||
|
Reference in New Issue
Block a user