rtl8188eu: Change all MAC_FMT to %pM

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
This commit is contained in:
Larry Finger 2013-05-30 15:51:53 -05:00
parent 61b38d5714
commit 925510ff1a
16 changed files with 128 additions and 161 deletions

View file

@ -1185,7 +1185,7 @@ unsigned int OnAuth(_adapter *padapter, union recv_frame *precv_frame)
if (pstat == NULL)
{
// allocate a new one
DBG_88E("going to alloc stainfo for sa="MAC_FMT"\n", MAC_ARG(sa));
DBG_88E("going to alloc stainfo for sa=%pM\n", sa);
pstat = rtw_alloc_stainfo(pstapriv, sa);
if (pstat == NULL)
{
@ -1543,8 +1543,8 @@ unsigned int OnAssocReq(_adapter *padapter, union recv_frame *precv_frame)
//now parse all ieee802_11 ie to point to elems
if (rtw_ieee802_11_parse_elems(pos, left, &elems, 1) == ParseFailed ||
!elems.ssid) {
DBG_88E("STA " MAC_FMT " sent invalid association request\n",
MAC_ARG(pstat->hwaddr));
DBG_88E("STA %pM sent invalid association request\n",
pstat->hwaddr);
status = _STATS_FAILURE_;
goto OnAssocReqFail;
}
@ -1726,8 +1726,8 @@ unsigned int OnAssocReq(_adapter *padapter, union recv_frame *precv_frame)
if (psecuritypriv->wpa_psk == 0)
{
DBG_88E("STA " MAC_FMT ": WPA/RSN IE in association "
"request, but AP don't support WPA/RSN\n", MAC_ARG(pstat->hwaddr));
DBG_88E("STA %pM: WPA/RSN IE in association "
"request, but AP don't support WPA/RSN\n", pstat->hwaddr);
status = WLAN_STATUS_INVALID_IE;
@ -1845,8 +1845,8 @@ unsigned int OnAssocReq(_adapter *padapter, union recv_frame *precv_frame)
((pstat->wpa2_pairwise_cipher&WPA_CIPHER_TKIP) ||
(pstat->wpa_pairwise_cipher&WPA_CIPHER_TKIP)))
{
DBG_88E("HT: " MAC_FMT " tried to "
"use TKIP with HT association\n", MAC_ARG(pstat->hwaddr));
DBG_88E("HT: %pM tried to "
"use TKIP with HT association\n", pstat->hwaddr);
//status = WLAN_STATUS_CIPHER_REJECTED_PER_POLICY;
//goto OnAssocReqFail;
@ -2337,8 +2337,8 @@ static unsigned int on_action_spct_ch_switch (_adapter *padapter, struct sta_inf
u8 bwmode;
struct ieee80211_info_element *ie;
DBG_88E(FUNC_NDEV_FMT" from "MAC_FMT"\n",
FUNC_NDEV_ARG(padapter->pnetdev), MAC_ARG(psta->hwaddr));
DBG_88E(FUNC_NDEV_FMT" from %pM\n",
FUNC_NDEV_ARG(padapter->pnetdev), psta->hwaddr);
for_each_ie(ie, ies, ies_len) {
if (ie->id == WLAN_EID_CHANNEL_SWITCH) {
@ -5234,8 +5234,8 @@ int issue_probereq_p2p_ex(_adapter *adapter, u8 *da, int try_cnt, int wait_ms)
if (try_cnt && wait_ms) {
if (da)
DBG_88E(FUNC_ADPT_FMT" to "MAC_FMT", ch:%u%s, %d/%d in %u ms\n",
FUNC_ADPT_ARG(adapter), MAC_ARG(da), rtw_get_oper_ch(adapter),
DBG_88E(FUNC_ADPT_FMT" to %pM, ch:%u%s, %d/%d in %u ms\n",
FUNC_ADPT_ARG(adapter), da, rtw_get_oper_ch(adapter),
ret==_SUCCESS?", acked":"", i, try_cnt, rtw_get_passing_time_ms(start));
else
DBG_88E(FUNC_ADPT_FMT", ch:%u%s, %d/%d in %u ms\n",
@ -6731,8 +6731,8 @@ int issue_probereq_ex(_adapter *padapter, NDIS_802_11_SSID *pssid, u8 *da,
if (try_cnt && wait_ms) {
if (da)
DBG_88E(FUNC_ADPT_FMT" to "MAC_FMT", ch:%u%s, %d/%d in %u ms\n",
FUNC_ADPT_ARG(padapter), MAC_ARG(da), rtw_get_oper_ch(padapter),
DBG_88E(FUNC_ADPT_FMT" to %pM, ch:%u%s, %d/%d in %u ms\n",
FUNC_ADPT_ARG(padapter), da, rtw_get_oper_ch(padapter),
ret==_SUCCESS?", acked":"", i, try_cnt, rtw_get_passing_time_ms(start));
else
DBG_88E(FUNC_ADPT_FMT", ch:%u%s, %d/%d in %u ms\n",
@ -7669,8 +7669,8 @@ int issue_nulldata(_adapter *padapter, unsigned char *da, unsigned int power_mod
if (try_cnt && wait_ms) {
if (da)
DBG_88E(FUNC_ADPT_FMT" to "MAC_FMT", ch:%u%s, %d/%d in %u ms\n",
FUNC_ADPT_ARG(padapter), MAC_ARG(da), rtw_get_oper_ch(padapter),
DBG_88E(FUNC_ADPT_FMT" to %pM, ch:%u%s, %d/%d in %u ms\n",
FUNC_ADPT_ARG(padapter), da, rtw_get_oper_ch(padapter),
ret==_SUCCESS?", acked":"", i, try_cnt, rtw_get_passing_time_ms(start));
else
DBG_88E(FUNC_ADPT_FMT", ch:%u%s, %d/%d in %u ms\n",
@ -7803,8 +7803,8 @@ int issue_qos_nulldata(_adapter *padapter, unsigned char *da, u16 tid, int try_c
if (try_cnt && wait_ms) {
if (da)
DBG_88E(FUNC_ADPT_FMT" to "MAC_FMT", ch:%u%s, %d/%d in %u ms\n",
FUNC_ADPT_ARG(padapter), MAC_ARG(da), rtw_get_oper_ch(padapter),
DBG_88E(FUNC_ADPT_FMT" to %pM, ch:%u%s, %d/%d in %u ms\n",
FUNC_ADPT_ARG(padapter), da, rtw_get_oper_ch(padapter),
ret==_SUCCESS?", acked":"", i, try_cnt, rtw_get_passing_time_ms(start));
else
DBG_88E(FUNC_ADPT_FMT", ch:%u%s, %d/%d in %u ms\n",
@ -7830,8 +7830,6 @@ static int _issue_deauth(_adapter *padapter, unsigned char *da, unsigned short r
struct wifidirect_info *pwdinfo= &(padapter->wdinfo);
#endif //CONFIG_P2P
//DBG_88E("%s to "MAC_FMT"\n", __func__, MAC_ARG(da));
#ifdef CONFIG_P2P
if ( !( rtw_p2p_chk_state( pwdinfo, P2P_STATE_NONE ) ) && ( pwdinfo->rx_invitereq_info.scan_op_ch_only ) )
{
@ -7891,7 +7889,7 @@ exit:
int issue_deauth(_adapter *padapter, unsigned char *da, unsigned short reason)
{
DBG_88E("%s to "MAC_FMT"\n", __func__, MAC_ARG(da));
DBG_88E("%s to %pM\n", __func__, da);
return _issue_deauth(padapter, da, reason, false);
}
@ -7925,8 +7923,8 @@ int issue_deauth_ex(_adapter *padapter, u8 *da, unsigned short reason, int try_c
if (try_cnt && wait_ms) {
if (da)
DBG_88E(FUNC_ADPT_FMT" to "MAC_FMT", ch:%u%s, %d/%d in %u ms\n",
FUNC_ADPT_ARG(padapter), MAC_ARG(da), rtw_get_oper_ch(padapter),
DBG_88E(FUNC_ADPT_FMT" to %pM, ch:%u%s, %d/%d in %u ms\n",
FUNC_ADPT_ARG(padapter), da, rtw_get_oper_ch(padapter),
ret==_SUCCESS?", acked":"", i, try_cnt, rtw_get_passing_time_ms(start));
else
DBG_88E(FUNC_ADPT_FMT", ch:%u%s, %d/%d in %u ms\n",
@ -7952,8 +7950,8 @@ void issue_action_spct_ch_switch (_adapter *padapter, u8 *ra, u8 new_ch, u8 ch_o
struct mlme_ext_info *pmlmeinfo = &(pmlmeext->mlmext_info);
DBG_88E(FUNC_NDEV_FMT" ra="MAC_FMT", ch:%u, offset:%u\n",
FUNC_NDEV_ARG(padapter->pnetdev), MAC_ARG(ra), new_ch, ch_offset);
DBG_88E(FUNC_NDEV_FMT" ra=%pM, ch:%u, offset:%u\n",
FUNC_NDEV_ARG(padapter->pnetdev), ra, new_ch, ch_offset);
if ((pmgntframe = alloc_mgtxmitframe(pxmitpriv)) == NULL)
return;
@ -9043,8 +9041,8 @@ u8 collect_bss_info(_adapter *padapter, union recv_frame *precv_frame, WLAN_BSSI
#if defined(DBG_RX_SIGNAL_DISPLAY_PROCESSING) & 1
if (strcmp(bssid->Ssid.Ssid, DBG_RX_SIGNAL_DISPLAY_SSID_MONITORED) == 0) {
DBG_88E("Receiving %s("MAC_FMT", DSConfig:%u) from ch%u with ss:%3u, sq:%3u, RawRSSI:%3ld\n"
, bssid->Ssid.Ssid, MAC_ARG(bssid->MacAddress), bssid->Configuration.DSConfig
DBG_88E("Receiving %s(%pM, DSConfig:%u) from ch%u with ss:%3u, sq:%3u, RawRSSI:%3ld\n"
, bssid->Ssid.Ssid, bssid->MacAddress, bssid->Configuration.DSConfig
, rtw_get_oper_ch(padapter)
, bssid->PhyInfo.SignalStrength, bssid->PhyInfo.SignalQuality, bssid->Rssi
);
@ -12475,7 +12473,7 @@ u8 tdls_hdl(_adapter *padapter, unsigned char *pbuf)
//As long as TDLS handshake success, we should set RCR_CBSSID_DATA bit to 0
//such we can receive all kinds of data frames.
rtw_hal_set_hwreg(padapter, HW_VAR_TDLS_WRCR, 0);
DBG_88E("TDLS with "MAC_FMT"\n", MAC_ARG(ptdls_sta->hwaddr));
DBG_88E("TDLS with %pM\n", ptdls_sta->hwaddr);
pmlmeinfo->FW_sta_info[ptdls_sta->mac_id].psta = ptdls_sta;
//set TDLS sta rate.