| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <e06c4d8a38d257edb6eff704da2b0178fb15c1ff.1284214459.git.andy.shevchenko@gmail.com>
Date: Sat, 11 Sep 2010 17:17:05 +0300
From: Andy Shevchenko <andy.shevchenko@...il.com>
To: devel@...verdev.osuosl.org, linux-kernel@...r.kernel.org
Cc: Greg Kroah-Hartman <gregkh@...e.de>,
Andy Shevchenko <andy.shevchenko@...il.com>
Subject: [PATCH 02/10] staging: ath6kl: use '%pM' format to print MAC address
Signed-off-by: Andy Shevchenko <andy.shevchenko@...il.com>
---
drivers/staging/ath6kl/os/linux/ar6000_drv.c | 10 +++-------
drivers/staging/ath6kl/os/linux/cfg80211.c | 20 +++++++-------------
drivers/staging/ath6kl/wmi/wmi.c | 8 +++-----
3 files changed, 13 insertions(+), 25 deletions(-)
diff --git a/drivers/staging/ath6kl/os/linux/ar6000_drv.c b/drivers/staging/ath6kl/os/linux/ar6000_drv.c
index ff7976e..03ece0f 100644
--- a/drivers/staging/ath6kl/os/linux/ar6000_drv.c
+++ b/drivers/staging/ath6kl/os/linux/ar6000_drv.c
@@ -956,12 +956,10 @@ ar6000_softmac_update(AR_SOFTC_T *ar, A_UCHAR *eeprom_data, size_t size)
ptr_mac = (A_UINT8 *)((A_UCHAR *)eeprom_data + AR6003_MAC_ADDRESS_OFFSET);
break;
default:
- AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("Invalid Target Type \n"));
+ AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Invalid Target Type\n"));
return;
}
- printk("MAC from EEPROM %02X:%02X:%02X:%02X:%02X:%02X\n",
- ptr_mac[0], ptr_mac[1], ptr_mac[2],
- ptr_mac[3], ptr_mac[4], ptr_mac[5]);
+ printk(KERN_DEBUG "MAC from EEPROM %pM\n", &ptr_mac[0]);
/* create a random MAC in case we cannot read file from system */
ptr_mac[0] = 0;
@@ -990,9 +988,7 @@ ar6000_softmac_update(AR_SOFTC_T *ar, A_UCHAR *eeprom_data, size_t size)
}
A_RELEASE_FIRMWARE(softmac_entry);
}
- printk("MAC from %s %02X:%02X:%02X:%02X:%02X:%02X\n", source,
- ptr_mac[0], ptr_mac[1], ptr_mac[2],
- ptr_mac[3], ptr_mac[4], ptr_mac[5]);
+ printk(KERN_DEBUG "MAC from %s %pM\n", source, &ptr_mac[0]);
calculate_crc(ar->arTargetType, eeprom_data);
}
#endif /* SOFTMAC_FILE_USED */
diff --git a/drivers/staging/ath6kl/os/linux/cfg80211.c b/drivers/staging/ath6kl/os/linux/cfg80211.c
index 7a3784d..d5890d4 100644
--- a/drivers/staging/ath6kl/os/linux/cfg80211.c
+++ b/drivers/staging/ath6kl/os/linux/cfg80211.c
@@ -544,13 +544,10 @@ ar6k_cfg80211_connect_event(AR_SOFTC_T *ar, A_UINT16 channel,
ibss_channel = ieee80211_get_channel(ar->wdev->wiphy, (int)channel);
- AR_DEBUG_PRINTF(ATH_DEBUG_INFO,
- ("%s: inform bss with bssid %02x:%02x:%02x:%02x:%02x:%02x "\
- "channel %d beaconInterval %d capability 0x%x\n",
- __func__,
- mgmt->bssid[0], mgmt->bssid[1], mgmt->bssid[2],
- mgmt->bssid[3], mgmt->bssid[4], mgmt->bssid[5],
- ibss_channel->hw_value, beaconInterval, capability));
+ AR_DEBUG_PRINTF(ATH_DEBUG_INFO,
+ ("%s: inform bss with bssid %pM channel %d beaconInterval %d "
+ "capability 0x%x\n", __func__, &mgmt->bssid[0],
+ ibss_channel->hw_value, beaconInterval, capability));
bss = cfg80211_inform_bss_frame(ar->wdev->wiphy,
ibss_channel, mgmt,
@@ -715,12 +712,9 @@ ar6k_cfg80211_scan_node(void *arg, bss_t *ni)
channel = ieee80211_get_channel(wiphy, freq);
signal = ni->ni_snr * 100;
- AR_DEBUG_PRINTF(ATH_DEBUG_INFO,
- ("%s: bssid %02x:%02x:%02x:%02x:%02x:%02x channel %d freq %d size %d\n",
- __func__,
- mgmt->bssid[0], mgmt->bssid[1], mgmt->bssid[2],
- mgmt->bssid[3], mgmt->bssid[4], mgmt->bssid[5],
- channel->hw_value, freq, size));
+ AR_DEBUG_PRINTF(ATH_DEBUG_INFO,
+ ("%s: bssid %pM channel %d freq %d size %d\n", __func__,
+ &mgmt->bssid[0], channel->hw_value, freq, size));
cfg80211_inform_bss_frame(wiphy, channel, mgmt,
le16_to_cpu(size),
signal, GFP_KERNEL);
diff --git a/drivers/staging/ath6kl/wmi/wmi.c b/drivers/staging/ath6kl/wmi/wmi.c
index d14bad2..9811ce7 100644
--- a/drivers/staging/ath6kl/wmi/wmi.c
+++ b/drivers/staging/ath6kl/wmi/wmi.c
@@ -1456,11 +1456,9 @@ wmi_bssInfo_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
buf = datap + sizeof(WMI_BSS_INFO_HDR);
len -= sizeof(WMI_BSS_INFO_HDR);
- A_DPRINTF(DBG_WMI2, (DBGFMT "bssInfo event - ch %u, rssi %02x, "
- "bssid \"%02x:%02x:%02x:%02x:%02x:%02x\"\n", DBGARG,
- bih->channel, (unsigned char) bih->rssi, bih->bssid[0],
- bih->bssid[1], bih->bssid[2], bih->bssid[3], bih->bssid[4],
- bih->bssid[5]));
+ A_DPRINTF(DBG_WMI2, (DBGFMT "bssInfo event - ch %u, rssi %02x, "
+ "bssid \"%pM\"\n", DBGARG, bih->channel,
+ (unsigned char) bih->rssi, i&bih->bssid[0]));
if(wps_enable && (bih->frameType == PROBERESP_FTYPE) ) {
wmi_node_return(wmip, bss);
--
1.7.2.2
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists