staging: ath6kl: use '%pM' format to print MAC address
Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Родитель
d225eef71c
Коммит
fa1ae16c97
|
@ -959,9 +959,7 @@ ar6000_softmac_update(AR_SOFTC_T *ar, A_UCHAR *eeprom_data, size_t size)
|
||||||
AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Invalid Target Type\n"));
|
AR_DEBUG_PRINTF(ATH_DEBUG_ERR, ("Invalid Target Type\n"));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
printk("MAC from EEPROM %02X:%02X:%02X:%02X:%02X:%02X\n",
|
printk(KERN_DEBUG "MAC from EEPROM %pM\n", &ptr_mac[0]);
|
||||||
ptr_mac[0], ptr_mac[1], ptr_mac[2],
|
|
||||||
ptr_mac[3], ptr_mac[4], ptr_mac[5]);
|
|
||||||
|
|
||||||
/* create a random MAC in case we cannot read file from system */
|
/* create a random MAC in case we cannot read file from system */
|
||||||
ptr_mac[0] = 0;
|
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);
|
A_RELEASE_FIRMWARE(softmac_entry);
|
||||||
}
|
}
|
||||||
printk("MAC from %s %02X:%02X:%02X:%02X:%02X:%02X\n", source,
|
printk(KERN_DEBUG "MAC from %s %pM\n", source, &ptr_mac[0]);
|
||||||
ptr_mac[0], ptr_mac[1], ptr_mac[2],
|
|
||||||
ptr_mac[3], ptr_mac[4], ptr_mac[5]);
|
|
||||||
calculate_crc(ar->arTargetType, eeprom_data);
|
calculate_crc(ar->arTargetType, eeprom_data);
|
||||||
}
|
}
|
||||||
#endif /* SOFTMAC_FILE_USED */
|
#endif /* SOFTMAC_FILE_USED */
|
||||||
|
|
|
@ -545,11 +545,8 @@ ar6k_cfg80211_connect_event(AR_SOFTC_T *ar, A_UINT16 channel,
|
||||||
ibss_channel = ieee80211_get_channel(ar->wdev->wiphy, (int)channel);
|
ibss_channel = ieee80211_get_channel(ar->wdev->wiphy, (int)channel);
|
||||||
|
|
||||||
AR_DEBUG_PRINTF(ATH_DEBUG_INFO,
|
AR_DEBUG_PRINTF(ATH_DEBUG_INFO,
|
||||||
("%s: inform bss with bssid %02x:%02x:%02x:%02x:%02x:%02x "\
|
("%s: inform bss with bssid %pM channel %d beaconInterval %d "
|
||||||
"channel %d beaconInterval %d capability 0x%x\n",
|
"capability 0x%x\n", __func__, &mgmt->bssid[0],
|
||||||
__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));
|
ibss_channel->hw_value, beaconInterval, capability));
|
||||||
|
|
||||||
bss = cfg80211_inform_bss_frame(ar->wdev->wiphy,
|
bss = cfg80211_inform_bss_frame(ar->wdev->wiphy,
|
||||||
|
@ -716,11 +713,8 @@ ar6k_cfg80211_scan_node(void *arg, bss_t *ni)
|
||||||
signal = ni->ni_snr * 100;
|
signal = ni->ni_snr * 100;
|
||||||
|
|
||||||
AR_DEBUG_PRINTF(ATH_DEBUG_INFO,
|
AR_DEBUG_PRINTF(ATH_DEBUG_INFO,
|
||||||
("%s: bssid %02x:%02x:%02x:%02x:%02x:%02x channel %d freq %d size %d\n",
|
("%s: bssid %pM channel %d freq %d size %d\n", __func__,
|
||||||
__func__,
|
&mgmt->bssid[0], channel->hw_value, freq, size));
|
||||||
mgmt->bssid[0], mgmt->bssid[1], mgmt->bssid[2],
|
|
||||||
mgmt->bssid[3], mgmt->bssid[4], mgmt->bssid[5],
|
|
||||||
channel->hw_value, freq, size));
|
|
||||||
cfg80211_inform_bss_frame(wiphy, channel, mgmt,
|
cfg80211_inform_bss_frame(wiphy, channel, mgmt,
|
||||||
le16_to_cpu(size),
|
le16_to_cpu(size),
|
||||||
signal, GFP_KERNEL);
|
signal, GFP_KERNEL);
|
||||||
|
|
|
@ -1457,10 +1457,8 @@ wmi_bssInfo_event_rx(struct wmi_t *wmip, A_UINT8 *datap, int len)
|
||||||
len -= sizeof(WMI_BSS_INFO_HDR);
|
len -= sizeof(WMI_BSS_INFO_HDR);
|
||||||
|
|
||||||
A_DPRINTF(DBG_WMI2, (DBGFMT "bssInfo event - ch %u, rssi %02x, "
|
A_DPRINTF(DBG_WMI2, (DBGFMT "bssInfo event - ch %u, rssi %02x, "
|
||||||
"bssid \"%02x:%02x:%02x:%02x:%02x:%02x\"\n", DBGARG,
|
"bssid \"%pM\"\n", DBGARG, bih->channel,
|
||||||
bih->channel, (unsigned char) bih->rssi, bih->bssid[0],
|
(unsigned char) bih->rssi, i&bih->bssid[0]));
|
||||||
bih->bssid[1], bih->bssid[2], bih->bssid[3], bih->bssid[4],
|
|
||||||
bih->bssid[5]));
|
|
||||||
|
|
||||||
if(wps_enable && (bih->frameType == PROBERESP_FTYPE) ) {
|
if(wps_enable && (bih->frameType == PROBERESP_FTYPE) ) {
|
||||||
wmi_node_return(wmip, bss);
|
wmi_node_return(wmip, bss);
|
||||||
|
|
Загрузка…
Ссылка в новой задаче