hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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:
Andy Shevchenko 2010-09-11 17:17:05 +03:00 committed by Greg Kroah-Hartman
parent d225eef71c
commit fa1ae16c97
3 changed files with 13 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/staging/ath6kl/os/linux/ar6000_drv.c
View File

@ -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 */

20
drivers/staging/ath6kl/os/linux/cfg80211.c
View File

@ -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);

8
drivers/staging/ath6kl/wmi/wmi.c
View File

@ -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);