From 925510ff1a14eea154a0dddc089369f91eeb06b0 Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Thu, 30 May 2013 15:51:53 -0500 Subject: [PATCH] rtl8188eu: Change all MAC_FMT to %pM Signed-off-by: Larry Finger --- core/rtw_ap.c | 37 ++++++++++++------------ core/rtw_debug.c | 6 ++-- core/rtw_ieee80211.c | 2 +- core/rtw_ioctl_set.c | 4 +-- core/rtw_mlme.c | 62 +++++++++++++++++++---------------------- core/rtw_mlme_ext.c | 52 +++++++++++++++++----------------- core/rtw_recv.c | 24 ++++++++-------- core/rtw_wlan_util.c | 5 ++-- core/rtw_xmit.c | 27 ++++++------------ include/ieee80211.h | 2 -- include/osdep_service.h | 7 ----- os_dep/ioctl_cfg80211.c | 14 +++++----- os_dep/ioctl_linux.c | 30 +++++++++----------- os_dep/mlme_linux.c | 2 +- os_dep/rtw_android.c | 2 +- os_dep/usb_intf.c | 13 ++++----- 16 files changed, 128 insertions(+), 161 deletions(-) diff --git a/core/rtw_ap.c b/core/rtw_ap.c index 85d1e73..4101cc7 100644 --- a/core/rtw_ap.c +++ b/core/rtw_ap.c @@ -318,8 +318,8 @@ u8 chk_sta_is_alive(struct sta_info *psta) { u8 ret = false; #ifdef DBG_EXPIRATION_CHK - DBG_88E("sta:"MAC_FMT", rssi:%d, rx:"STA_PKTS_FMT", expire_to:%u, %s%ssq_len:%u\n" - , MAC_ARG(psta->hwaddr) + DBG_88E("sta:%pM, rssi:%d, rx:"STA_PKTS_FMT", expire_to:%u, %s%ssq_len:%u\n" + , (psta->hwaddr) , psta->rssi_stat.UndecoratedSmoothedPWDB //, STA_RX_PKTS_ARG(psta) , STA_RX_PKTS_DIFF_ARG(psta) @@ -468,7 +468,7 @@ void expire_timeout_chk(_adapter *padapter) psta->expire_to = pstapriv->expire_to; psta->state |= WIFI_STA_ALIVE_CHK_STATE; - //DBG_88E("alive chk, sta:" MAC_FMT " is at ps mode!\n", MAC_ARG(psta->hwaddr)); + //DBG_88E("alive chk, sta:%pM is at ps mode!\n", (psta->hwaddr)); //to update bcn with tim_bitmap for this station pstapriv->tim_bitmap |= BIT(psta->aid); @@ -494,7 +494,7 @@ void expire_timeout_chk(_adapter *padapter) rtw_list_delete(&psta->asoc_list); pstapriv->asoc_list_cnt--; - DBG_88E("asoc expire "MAC_FMT", state=0x%x\n", MAC_ARG(psta->hwaddr), psta->state); + DBG_88E("asoc expire %pM, state=0x%x\n", (psta->hwaddr), psta->state); updated = ap_free_sta(padapter, psta, true, WLAN_REASON_DEAUTH_LEAVING); } else @@ -503,8 +503,8 @@ void expire_timeout_chk(_adapter *padapter) if (psta->sleepq_len > (NR_XMITFRAME/pstapriv->asoc_list_cnt) && padapter->xmitpriv.free_xmitframe_cnt < (NR_XMITFRAME/pstapriv->asoc_list_cnt/2) ){ - DBG_88E("%s sta:"MAC_FMT", sleepq_len:%u, free_xmitframe_cnt:%u, asoc_list_cnt:%u, clear sleep_q\n", __func__ - , MAC_ARG(psta->hwaddr) + DBG_88E("%s sta:%pM, sleepq_len:%u, free_xmitframe_cnt:%u, asoc_list_cnt:%u, clear sleep_q\n", __func__ + , (psta->hwaddr) , psta->sleepq_len, padapter->xmitpriv.free_xmitframe_cnt, pstapriv->asoc_list_cnt); wakeup_sta_to_xmit(padapter, psta); } @@ -539,7 +539,7 @@ if (chk_alive_num) { psta->keep_alive_trycnt++; if (ret == _SUCCESS) { - DBG_88E("asoc check, sta(" MAC_FMT ") is alive\n", MAC_ARG(psta->hwaddr)); + DBG_88E("asoc check, sta(%pM) is alive\n", (psta->hwaddr)); psta->expire_to = pstapriv->expire_to; psta->keep_alive_trycnt = 0; continue; @@ -553,7 +553,7 @@ if (chk_alive_num) { psta->keep_alive_trycnt = 0; - DBG_88E("asoc expire "MAC_FMT", state=0x%x\n", MAC_ARG(psta->hwaddr), psta->state); + DBG_88E("asoc expire %pM, state=0x%x\n", (psta->hwaddr), psta->state); _enter_critical_bh(&pstapriv->asoc_list_lock, &irqL); rtw_list_delete(&psta->asoc_list); pstapriv->asoc_list_cnt--; @@ -1562,7 +1562,7 @@ int rtw_acl_add_sta(_adapter *padapter, u8 *addr) struct wlan_acl_pool *pacl_list = &pstapriv->acl_list; _queue *pacl_node_q =&pacl_list->acl_node_q; - DBG_88E("%s(acl_num=%d)=" MAC_FMT "\n", __func__, pacl_list->num, MAC_ARG(addr)); + DBG_88E("%s(acl_num=%d)=%pM\n", __func__, pacl_list->num, (addr)); if ((NUM_ACL-1) < pacl_list->num) return (-1); @@ -1635,7 +1635,7 @@ int rtw_acl_remove_sta(_adapter *padapter, u8 *addr) struct wlan_acl_pool *pacl_list = &pstapriv->acl_list; _queue *pacl_node_q =&pacl_list->acl_node_q; - DBG_88E("%s(acl_num=%d)=" MAC_FMT "\n", __func__, pacl_list->num, MAC_ARG(addr)); + DBG_88E("%s(acl_num=%d)=%pM\n", __func__, pacl_list->num, (addr)); _enter_critical_bh(&(pacl_node_q->lock), &irqL); @@ -2152,8 +2152,8 @@ void bss_cap_update_on_sta_join(_adapter *padapter, struct sta_info *psta) { u16 ht_capab = le16_to_cpu(psta->htpriv.ht_cap.cap_info); - DBG_88E("HT: STA " MAC_FMT " HT Capabilities " - "Info: 0x%04x\n", MAC_ARG(psta->hwaddr), ht_capab); + DBG_88E("HT: STA %pM HT Capabilities " + "Info: 0x%04x\n", (psta->hwaddr), ht_capab); if (psta->no_ht_set) { psta->no_ht_set = 0; @@ -2165,9 +2165,9 @@ void bss_cap_update_on_sta_join(_adapter *padapter, struct sta_info *psta) psta->no_ht_gf_set = 1; pmlmepriv->num_sta_ht_no_gf++; } - DBG_88E("%s STA " MAC_FMT " - no " + DBG_88E("%s STA %pM - no " "greenfield, num of non-gf stations %d\n", - __func__, MAC_ARG(psta->hwaddr), + __func__, (psta->hwaddr), pmlmepriv->num_sta_ht_no_gf); } @@ -2176,9 +2176,9 @@ void bss_cap_update_on_sta_join(_adapter *padapter, struct sta_info *psta) psta->ht_20mhz_set = 1; pmlmepriv->num_sta_ht_20mhz++; } - DBG_88E("%s STA " MAC_FMT " - 20 MHz HT, " + DBG_88E("%s STA %pM - 20 MHz HT, " "num of 20MHz HT STAs %d\n", - __func__, MAC_ARG(psta->hwaddr), + __func__, (psta->hwaddr), pmlmepriv->num_sta_ht_20mhz); } @@ -2190,9 +2190,8 @@ void bss_cap_update_on_sta_join(_adapter *padapter, struct sta_info *psta) pmlmepriv->num_sta_no_ht++; } if (pmlmepriv->htpriv.ht_option == true) { - DBG_88E("%s STA " MAC_FMT - " - no HT, num of non-HT stations %d\n", - __func__, MAC_ARG(psta->hwaddr), + DBG_88E("%s STA %pM - no HT, num of non-HT stations %d\n", + __func__, (psta->hwaddr), pmlmepriv->num_sta_no_ht); } } diff --git a/core/rtw_debug.c b/core/rtw_debug.c index 3924577..6b89aa4 100644 --- a/core/rtw_debug.c +++ b/core/rtw_debug.c @@ -320,7 +320,7 @@ int proc_get_ap_info(char *page, char **start, struct recv_reorder_ctrl *preorder_ctrl; len += snprintf(page + len, count - len, "SSID=%s\n", cur_network->network.Ssid.Ssid); - len += snprintf(page + len, count - len, "sta's macaddr:" MAC_FMT "\n", MAC_ARG(psta->hwaddr)); + len += snprintf(page + len, count - len, "sta's macaddr:%pM\n", psta->hwaddr); len += snprintf(page + len, count - len, "cur_channel=%d, cur_bwmode=%d, cur_ch_offset=%d\n", pmlmeext->cur_channel, pmlmeext->cur_bwmode, pmlmeext->cur_ch_offset); len += snprintf(page + len, count - len, "rtsen=%d, cts2slef=%d\n", psta->rtsen, psta->cts2self); len += snprintf(page + len, count - len, "state=0x%x, aid=%d, macid=%d, raid=%d\n", psta->state, psta->aid, psta->mac_id, psta->raid); @@ -343,7 +343,7 @@ int proc_get_ap_info(char *page, char **start, } else { - len += snprintf(page + len, count - len, "can't get sta's macaddr, cur_network's macaddr:" MAC_FMT "\n", MAC_ARG(cur_network->network.MacAddress)); + len += snprintf(page + len, count - len, "can't get sta's macaddr, cur_network's macaddr: %pM\n", cur_network->network.MacAddress); } *eof = 1; @@ -986,7 +986,7 @@ int proc_get_all_sta_info(char *page, char **start, //if (extra_arg == psta->aid) { - len += snprintf(page + len, count - len, "sta's macaddr:" MAC_FMT "\n", MAC_ARG(psta->hwaddr)); + len += snprintf(page + len, count - len, "sta's macaddr: %pM\n", psta->hwaddr); len += snprintf(page + len, count - len, "rtsen=%d, cts2slef=%d\n", psta->rtsen, psta->cts2self); len += snprintf(page + len, count - len, "state=0x%x, aid=%d, macid=%d, raid=%d\n", psta->state, psta->aid, psta->mac_id, psta->raid); #ifdef CONFIG_80211N_HT diff --git a/core/rtw_ieee80211.c b/core/rtw_ieee80211.c index 2fed2b5..6d2641d 100644 --- a/core/rtw_ieee80211.c +++ b/core/rtw_ieee80211.c @@ -1328,7 +1328,7 @@ void rtw_macaddr_cfg(u8 *mac_addr) DBG_88E("MAC Address from efuse error, assign default one !!!\n"); } - DBG_88E("rtw_macaddr_cfg MAC Address = "MAC_FMT"\n", MAC_ARG(mac_addr)); + DBG_88E("rtw_macaddr_cfg MAC Address = %pM\n", (mac_addr)); } void dump_ies(u8 *buf, u32 buf_len) { diff --git a/core/rtw_ioctl_set.c b/core/rtw_ioctl_set.c index c9c15d8..5084e6a 100644 --- a/core/rtw_ioctl_set.c +++ b/core/rtw_ioctl_set.c @@ -344,8 +344,8 @@ _func_enter_; goto release_mlme_lock;//it means driver is in WIFI_ADHOC_MASTER_STATE, we needn't create bss again. } else { RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("Set BSSID not the same bssid\n")); - RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("set_bssid="MAC_FMT"\n", MAC_ARG(bssid) )); - RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("cur_bssid="MAC_FMT"\n", MAC_ARG(pmlmepriv->cur_network.network.MacAddress) )); + RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("set_bssid=%pM\n", (bssid) )); + RT_TRACE(_module_rtl871x_ioctl_set_c_,_drv_info_,("cur_bssid=%pM\n", (pmlmepriv->cur_network.network.MacAddress) )); rtw_disassoc_cmd(padapter, 0, true); diff --git a/core/rtw_mlme.c b/core/rtw_mlme.c index 6f4b2de..49acc6c 100644 --- a/core/rtw_mlme.c +++ b/core/rtw_mlme.c @@ -725,9 +725,9 @@ _func_enter_; #if defined(DBG_RX_SIGNAL_DISPLAY_PROCESSING) && 1 if (strcmp(dst->Ssid.Ssid, DBG_RX_SIGNAL_DISPLAY_SSID_MONITORED) == 0) { - DBG_88E("%s %s("MAC_FMT", ch%u) ss_ori:%3u, sq_ori:%3u, rssi_ori:%3ld, ss_smp:%3u, sq_smp:%3u, rssi_smp:%3ld\n" + DBG_88E("%s %s(%pm, ch%u) ss_ori:%3u, sq_ori:%3u, rssi_ori:%3ld, ss_smp:%3u, sq_smp:%3u, rssi_smp:%3ld\n" , __func__ - , src->Ssid.Ssid, MAC_ARG(src->MacAddress), src->Configuration.DSConfig + , src->Ssid.Ssid, src->MacAddress, src->Configuration.DSConfig ,ss_ori, sq_ori, rssi_ori ,ss_smp, sq_smp, rssi_smp ); @@ -768,9 +768,10 @@ _func_enter_; #if defined(DBG_RX_SIGNAL_DISPLAY_PROCESSING) && 1 if (strcmp(dst->Ssid.Ssid, DBG_RX_SIGNAL_DISPLAY_SSID_MONITORED) == 0) { - DBG_88E("%s %s("MAC_FMT"), SignalStrength:%u, SignalQuality:%u, RawRSSI:%ld\n" - , __func__ - , dst->Ssid.Ssid, MAC_ARG(dst->MacAddress), dst->PhyInfo.SignalStrength, dst->PhyInfo.SignalQuality, dst->Rssi); + DBG_88E("%s %s(%pm SignalStrength:%u, SignalQuality:%u, RawRSSI:%ld\n", + __func__, dst->Ssid.Ssid, dst->MacAddress, + dst->PhyInfo.SignalStrength, + dst->PhyInfo.SignalQuality, dst->Rssi); } #endif @@ -1315,8 +1316,8 @@ void rtw_free_assoc_resources(_adapter *adapter, int lock_scanned_queue) _func_enter_; RT_TRACE(_module_rtl871x_mlme_c_, _drv_notice_, ("+rtw_free_assoc_resources\n")); - RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("tgt_network->network.MacAddress="MAC_FMT" ssid=%s\n", - MAC_ARG(tgt_network->network.MacAddress), tgt_network->network.Ssid.Ssid)); + RT_TRACE(_module_rtl871x_mlme_c_, _drv_info_, ("tgt_network->network.MacAddress=%pM ssid=%s\n", + tgt_network->network.MacAddress, tgt_network->network.Ssid.Ssid)); if (check_fwstate( pmlmepriv, WIFI_STATION_STATE|WIFI_AP_STATE)) { @@ -1658,8 +1659,8 @@ static void rtw_joinbss_update_network(_adapter *padapter, struct wlan_network * DBG_88E("%s\n", __func__); - RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,("\nfw_state:%x, BSSID:"MAC_FMT"\n" - ,get_fwstate(pmlmepriv), MAC_ARG(pnetwork->network.MacAddress))); + RT_TRACE(_module_rtl871x_mlme_c_,_drv_info_,("\nfw_state:%x, BSSID:%pM\n", + get_fwstate(pmlmepriv), pnetwork->network.MacAddress)); // why not use ptarget_wlan?? @@ -2170,7 +2171,7 @@ _func_enter_; else mac_id = pstadel->mac_id; - DBG_88E("%s(mac_id=%d)=" MAC_FMT "\n", __func__, mac_id, MAC_ARG(pstadel->macaddr)); + DBG_88E("%s(mac_id=%d)= %pM\n", __func__, mac_id, pstadel->macaddr); if (mac_id>=0){ u16 media_status; @@ -2653,14 +2654,14 @@ static int rtw_check_join_candidate(struct mlme_priv *pmlmepriv #ifdef CONFIG_LAYER2_ROAMING "[to_roaming:%u] " #endif - "new candidate: %s("MAC_FMT") rssi:%d\n", + "new candidate: %s(%pM rssi:%d\n", pmlmepriv->assoc_by_bssid, pmlmepriv->assoc_ssid.Ssid, #ifdef CONFIG_LAYER2_ROAMING pmlmepriv->to_roaming, #endif (*candidate)->network.Ssid.Ssid, - MAC_ARG((*candidate)->network.MacAddress), + (*candidate)->network.MacAddress, (int)(*candidate)->network.Rssi ); } @@ -2718,22 +2719,19 @@ _func_enter_; ret = _FAIL; goto exit; } else { - DBG_88E("%s: candidate: %s("MAC_FMT", ch:%u)\n", __func__, - candidate->network.Ssid.Ssid, MAC_ARG(candidate->network.MacAddress), + DBG_88E("%s: candidate: %s(%pM ch:%u)\n", __func__, + candidate->network.Ssid.Ssid, candidate->network.MacAddress, candidate->network.Configuration.DSConfig); } // check for situation of _FW_LINKED - if (check_fwstate(pmlmepriv, _FW_LINKED) == true) - { + if (check_fwstate(pmlmepriv, _FW_LINKED) == true) { DBG_88E("%s: _FW_LINKED while ask_for_joinbss!!!\n", __func__); - { - rtw_disassoc_cmd(adapter, 0, true); - rtw_indicate_disconnect(adapter); - rtw_free_assoc_resources(adapter, 0); - } + rtw_disassoc_cmd(adapter, 0, true); + rtw_indicate_disconnect(adapter); + rtw_free_assoc_resources(adapter, 0); } #ifdef CONFIG_ANTENNA_DIVERSITY @@ -2842,11 +2840,9 @@ _func_enter_; ) { roaming_candidate = pnetwork; //RT_TRACE(_module_rtl871x_mlme_c_,_drv_err_, - DBG_88E - ("roaming_candidate???: %s("MAC_FMT")\n", - roaming_candidate->network.Ssid.Ssid, MAC_ARG(roaming_candidate->network.MacAddress) ) - //) - ; + DBG_88E("roaming_candidate???: %s(%pM\n", + roaming_candidate->network.Ssid.Ssid, + roaming_candidate->network.MacAddress); } continue; #endif @@ -2898,8 +2894,8 @@ _func_enter_; #ifdef CONFIG_LAYER2_ROAMING if (pmlmepriv->to_roaming>0 && roaming_candidate ){ pnetwork=roaming_candidate; - DBG_88E("select_and_join_from_scanned_queue: roaming_candidate: %s("MAC_FMT")\n", - pnetwork->network.Ssid.Ssid, MAC_ARG(pnetwork->network.MacAddress)); + DBG_88E("select_and_join_from_scanned_queue: roaming_candidate: %s(%pM\n", + pnetwork->network.Ssid.Ssid, pnetwork->network.MacAddress); goto ask_for_joinbss; } #endif @@ -2907,8 +2903,8 @@ _func_enter_; if ((pmlmepriv->assoc_by_rssi==true) && (pnetwork_max_rssi!=NULL)) { pnetwork = pnetwork_max_rssi; - DBG_88E("select_and_join_from_scanned_queue: pnetwork_max_rssi: %s("MAC_FMT")\n", - pnetwork->network.Ssid.Ssid, MAC_ARG(pnetwork->network.MacAddress)); + DBG_88E("select_and_join_from_scanned_queue: pnetwork_max_rssi: %s()))%pM\n", + pnetwork->network.Ssid.Ssid, pnetwork->network.MacAddress); goto ask_for_joinbss; } @@ -3697,9 +3693,9 @@ void _rtw_roaming(_adapter *padapter, struct wlan_network *tgt_network) pnetwork = &pmlmepriv->cur_network; if (0 < pmlmepriv->to_roaming) { - DBG_88E("roaming from %s("MAC_FMT"), length:%d\n", - pnetwork->network.Ssid.Ssid, MAC_ARG(pnetwork->network.MacAddress), - pnetwork->network.Ssid.SsidLength); + DBG_88E("roaming from %s(%pM length:%d\n", + pnetwork->network.Ssid.Ssid, pnetwork->network.MacAddress, + pnetwork->network.Ssid.SsidLength); _rtw_memcpy(&pmlmepriv->assoc_ssid, &pnetwork->network.Ssid, sizeof(NDIS_802_11_SSID)); pmlmepriv->assoc_by_bssid = false; diff --git a/core/rtw_mlme_ext.c b/core/rtw_mlme_ext.c index c4cdcbc..0e0a49a 100644 --- a/core/rtw_mlme_ext.c +++ b/core/rtw_mlme_ext.c @@ -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. diff --git a/core/rtw_recv.c b/core/rtw_recv.c index eeac9f8..bebb65b 100644 --- a/core/rtw_recv.c +++ b/core/rtw_recv.c @@ -1351,8 +1351,8 @@ _func_enter_; if (_rtw_memcmp(myhwaddr, pattrib->src, ETH_ALEN)){ RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,(" SA==myself\n")); #ifdef DBG_RX_DROP_FRAME - DBG_88E("DBG_RX_DROP_FRAME %s SA="MAC_FMT", myhwaddr="MAC_FMT"\n", - __func__, MAC_ARG(pattrib->src), MAC_ARG(myhwaddr)); + DBG_88E("DBG_RX_DROP_FRAME %s SA=%pM, myhwaddr=%pM\n", + __func__, (pattrib->src), (myhwaddr)); #endif ret= _FAIL; goto exit; @@ -1362,9 +1362,9 @@ _func_enter_; if ((!_rtw_memcmp(myhwaddr, pattrib->dst, ETH_ALEN))&& (!bmcast)) { RT_TRACE(_module_rtl871x_recv_c_,_drv_info_, - (" ap2sta_data_frame: compare DA fail; DA="MAC_FMT"\n", MAC_ARG(pattrib->dst))); + (" ap2sta_data_frame: compare DA fail; DA=%pM\n", (pattrib->dst))); #ifdef DBG_RX_DROP_FRAME - DBG_88E("DBG_RX_DROP_FRAME %s DA="MAC_FMT"\n", __func__, MAC_ARG(pattrib->dst)); + DBG_88E("DBG_RX_DROP_FRAME %s DA=%pM\n", __func__, (pattrib->dst)); #endif ret= _FAIL; goto exit; @@ -1377,17 +1377,17 @@ _func_enter_; (!_rtw_memcmp(pattrib->bssid, mybssid, ETH_ALEN)) ) { RT_TRACE(_module_rtl871x_recv_c_,_drv_info_, - (" ap2sta_data_frame: compare BSSID fail ; BSSID="MAC_FMT"\n", MAC_ARG(pattrib->bssid))); - RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("mybssid="MAC_FMT"\n", MAC_ARG(mybssid))); + (" ap2sta_data_frame: compare BSSID fail ; BSSID=%pM\n", (pattrib->bssid))); + RT_TRACE(_module_rtl871x_recv_c_,_drv_info_,("mybssid=%pM\n", (mybssid))); #ifdef DBG_RX_DROP_FRAME - DBG_88E("DBG_RX_DROP_FRAME %s BSSID="MAC_FMT", mybssid="MAC_FMT"\n", - __func__, MAC_ARG(pattrib->bssid), MAC_ARG(mybssid)); + DBG_88E("DBG_RX_DROP_FRAME %s BSSID=%pM, mybssid=%pM\n", + __func__, (pattrib->bssid), (mybssid)); DBG_88E( "this adapter = %d, buddy adapter = %d\n", adapter->adapter_type, adapter->pbuddy_adapter->adapter_type ); #endif if (!bmcast) { - DBG_88E("issue_deauth to the nonassociated ap=" MAC_FMT " for the reason(7)\n", MAC_ARG(pattrib->bssid)); + DBG_88E("issue_deauth to the nonassociated ap=%pM for the reason(7)\n", (pattrib->bssid)); issue_deauth(adapter, pattrib->bssid, WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA); } @@ -1458,7 +1458,7 @@ _func_enter_; *psta = rtw_get_stainfo(pstapriv, pattrib->bssid); // get sta_info if (*psta == NULL) { - DBG_88E("issue_deauth to the ap=" MAC_FMT " for the reason(7)\n", MAC_ARG(pattrib->bssid)); + DBG_88E("issue_deauth to the ap=%pM for the reason(7)\n", (pattrib->bssid)); issue_deauth(adapter, pattrib->bssid, WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA); } @@ -1509,7 +1509,7 @@ _func_enter_; if (*psta == NULL) { RT_TRACE(_module_rtl871x_recv_c_,_drv_err_,("can't get psta under AP_MODE; drop pkt\n")); - DBG_88E("issue_deauth to sta=" MAC_FMT " for the reason(7)\n", MAC_ARG(pattrib->src)); + DBG_88E("issue_deauth to sta=%pM for the reason(7)\n", (pattrib->src)); issue_deauth(adapter, pattrib->src, WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA); @@ -1536,7 +1536,7 @@ _func_enter_; ret = RTW_RX_HANDLED; goto exit; } - DBG_88E("issue_deauth to sta=" MAC_FMT " for the reason(7)\n", MAC_ARG(pattrib->src)); + DBG_88E("issue_deauth to sta=%pM for the reason(7)\n", (pattrib->src)); issue_deauth(adapter, pattrib->src, WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA); ret = RTW_RX_HANDLED; goto exit; diff --git a/core/rtw_wlan_util.c b/core/rtw_wlan_util.c index 9d25dd0..f0e0944 100644 --- a/core/rtw_wlan_util.c +++ b/core/rtw_wlan_util.c @@ -1386,8 +1386,8 @@ int rtw_check_bcn_info(ADAPTER *Adapter, u8 *pframe, u32 packet_len) } if (_rtw_memcmp(cur_network->network.MacAddress, pbssid, 6) == false) { - DBG_88E("Oops: rtw_check_network_encrypt linked but recv other bssid bcn\n" MAC_FMT MAC_FMT, - MAC_ARG(pbssid), MAC_ARG(cur_network->network.MacAddress)); + DBG_88E("Oops: rtw_check_network_encrypt linked but recv other bssid bcn\n%pM %pM\n", + (pbssid), (cur_network->network.MacAddress)); return true; } @@ -2235,7 +2235,6 @@ void update_wireless_mode(_adapter *padapter) update_mgnt_tx_rate(padapter, IEEE80211_OFDM_RATE_6MB); } -void fire_write_MAC_cmd(_adapter *padapter, unsigned int addr, unsigned int value); void fire_write_MAC_cmd(_adapter *padapter, unsigned int addr, unsigned int value) { } diff --git a/core/rtw_xmit.c b/core/rtw_xmit.c index b912fde..656da79 100644 --- a/core/rtw_xmit.c +++ b/core/rtw_xmit.c @@ -705,9 +705,9 @@ static s32 update_attrib(_adapter *padapter, _pkt *pkt, struct pkt_attrib *pattr } else { psta = rtw_get_stainfo(pstapriv, pattrib->ra); if (psta == NULL) { // if we cannot get psta => drrp the pkt - RT_TRACE(_module_rtl871x_xmit_c_, _drv_alert_, ("\nupdate_attrib => get sta_info fail, ra:" MAC_FMT"\n", MAC_ARG(pattrib->ra))); + RT_TRACE(_module_rtl871x_xmit_c_, _drv_alert_, ("\nupdate_attrib => get sta_info fail, ra: %pM\n", (pattrib->ra))); #ifdef DBG_TX_DROP_FRAME - DBG_88E("DBG_TX_DROP_FRAME %s get sta_info fail, ra:" MAC_FMT"\n", __func__, MAC_ARG(pattrib->ra)); + DBG_88E("DBG_TX_DROP_FRAME %s get sta_info fail, ra: %pM\n", __func__, (pattrib->ra)); #endif res =_FAIL; goto exit; @@ -728,9 +728,9 @@ static s32 update_attrib(_adapter *padapter, _pkt *pkt, struct pkt_attrib *pattr else { // if we cannot get psta => drop the pkt - RT_TRACE(_module_rtl871x_xmit_c_, _drv_alert_, ("\nupdate_attrib => get sta_info fail, ra:" MAC_FMT "\n", MAC_ARG(pattrib->ra))); + RT_TRACE(_module_rtl871x_xmit_c_, _drv_alert_, ("\nupdate_attrib => get sta_info fail, ra:%pM\n", (pattrib->ra))); #ifdef DBG_TX_DROP_FRAME - DBG_88E("DBG_TX_DROP_FRAME %s get sta_info fail, ra:" MAC_FMT"\n", __func__, MAC_ARG(pattrib->ra)); + DBG_88E("DBG_TX_DROP_FRAME %s get sta_info fail, ra:%pM\n", __func__, (pattrib->ra)); #endif res = _FAIL; goto exit; @@ -2693,13 +2693,7 @@ int rtw_br_client_tx(_adapter *padapter, struct sk_buff **pskb) memcpy(skb->data+MACADDRLEN, GET_MY_HWADDR(padapter), MACADDRLEN); padapter->scdb_entry->ageing_timer = jiffies; _exit_critical_bh(&padapter->br_ext_lock, &irqL); - } - else - //if (!priv->pmib->ethBrExtInfo.nat25_disable) - { -// if (priv->dev->br_port && -// !memcmp(skb->data+MACADDRLEN, priv->br_mac, MACADDRLEN)) { -#if 1 + } else { if (*((unsigned short *)(skb->data+MACADDRLEN*2)) == __constant_htons(ETH_P_8021Q)) { is_vlan_tag = 1; vlan_hdr = *((unsigned short *)(skb->data+MACADDRLEN*2+2)); @@ -2707,7 +2701,6 @@ int rtw_br_client_tx(_adapter *padapter, struct sk_buff **pskb) *((unsigned short *)(skb->data+MACADDRLEN*2+2-i*2)) = *((unsigned short *)(skb->data+MACADDRLEN*2-2-i*2)); skb_pull(skb, 4); } - //if SA == br_mac && skb== IP => copy SIP to br_ip ?? why if (!memcmp(skb->data+MACADDRLEN, padapter->br_mac, MACADDRLEN) && (*((unsigned short *)(skb->data+MACADDRLEN*2)) == __constant_htons(ETH_P_IP))) memcpy(padapter->br_ip, skb->data+WLAN_ETHHDR_LEN+12, 4); @@ -2723,22 +2716,18 @@ int rtw_br_client_tx(_adapter *padapter, struct sk_buff **pskb) padapter->scdb_entry->ageing_timer = jiffies; do_nat25 = 0; } - } - else { + } else { if (padapter->scdb_entry) { padapter->scdb_entry->ageing_timer = jiffies; do_nat25 = 0; - } - else { + } else { memset(padapter->scdb_mac, 0, MACADDRLEN); memset(padapter->scdb_ip, 0, 4); } } } _exit_critical_bh(&padapter->br_ext_lock, &irqL); -#endif // 1 - if (do_nat25) - { + if (do_nat25) { int nat25_db_handle(_adapter *priv, struct sk_buff *skb, int method); if (nat25_db_handle(padapter, skb, NAT25_CHECK) == 0) { struct sk_buff *newskb; diff --git a/include/ieee80211.h b/include/ieee80211.h index 33eef0d..c4897e0 100644 --- a/include/ieee80211.h +++ b/include/ieee80211.h @@ -1139,8 +1139,6 @@ enum ieee80211_state { #define DEFAULT_MAX_SCAN_AGE (15 * HZ) #define DEFAULT_FTS 2346 -#define MAC_FMT "%02x:%02x:%02x:%02x:%02x:%02x" -#define MAC_ARG(x) ((u8*)(x))[0],((u8*)(x))[1],((u8*)(x))[2],((u8*)(x))[3],((u8*)(x))[4],((u8*)(x))[5] #ifdef PLATFORM_FREEBSD //Baron change func to macro #define is_multicast_mac_addr(Addr) ((((Addr[0]) & 0x01) == 0x01) && ((Addr[0]) != 0xff)) diff --git a/include/osdep_service.h b/include/osdep_service.h index bb16f9f..ec89391 100644 --- a/include/osdep_service.h +++ b/include/osdep_service.h @@ -563,13 +563,6 @@ __inline static u32 bitshift(u32 bitmask) return i; } -#ifndef MAC_FMT -#define MAC_FMT "%02x:%02x:%02x:%02x:%02x:%02x" -#endif -#ifndef MAC_ARG -#define MAC_ARG(x) ((u8*)(x))[0],((u8*)(x))[1],((u8*)(x))[2],((u8*)(x))[3],((u8*)(x))[4],((u8*)(x))[5] -#endif - #define STRUCT_PACKED __attribute__ ((packed)) // limitation of path length diff --git a/os_dep/ioctl_cfg80211.c b/os_dep/ioctl_cfg80211.c index 270d8ff..50c7b6a 100644 --- a/os_dep/ioctl_cfg80211.c +++ b/os_dep/ioctl_cfg80211.c @@ -1477,7 +1477,7 @@ static int cfg80211_rtw_get_station(struct wiphy *wiphy, sinfo->filled = 0; #ifdef CONFIG_DEBUG_CFG80211 - DBG_88E(FUNC_NDEV_FMT" mac="MAC_FMT"\n", FUNC_NDEV_ARG(ndev), MAC_ARG(mac)); + DBG_88E(FUNC_NDEV_FMT" mac=%pM\n", FUNC_NDEV_ARG(ndev), mac); #endif //for infra./P2PClient mode @@ -1489,7 +1489,7 @@ static int cfg80211_rtw_get_station(struct wiphy *wiphy, if (_rtw_memcmp(mac, cur_network->network.MacAddress, ETH_ALEN) == false) { - DBG_88E("%s, mismatch bssid="MAC_FMT"\n", __func__, MAC_ARG(cur_network->network.MacAddress)); + DBG_88E("%s, mismatch bssid=%pM\n", __func__, cur_network->network.MacAddress); return -ENOENT; } @@ -2528,7 +2528,7 @@ static int cfg80211_rtw_connect(struct wiphy *wiphy, struct net_device *ndev, if (sme->bssid) - DBG_88E("bssid="MAC_FMT"\n", MAC_ARG(sme->bssid)); + DBG_88E("bssid=%pM\n", sme->bssid); if (check_fwstate(pmlmepriv, _FW_UNDER_SURVEY|_FW_UNDER_LINKING) == true) @@ -3155,8 +3155,8 @@ static int rtw_cfg80211_monitor_if_xmit_entry(struct sk_buff *skb, struct net_de goto fail; } - DBG_88E("RTW_Tx:da="MAC_FMT" via "FUNC_NDEV_FMT"\n", - MAC_ARG(GetAddr1Ptr(buf)), FUNC_NDEV_ARG(ndev)); + DBG_88E("RTW_Tx:da=%pM via "FUNC_NDEV_FMT"\n", + GetAddr1Ptr(buf), FUNC_NDEV_ARG(ndev)); #ifdef CONFIG_P2P if ((type = rtw_p2p_check_frames(padapter, buf, len, true)) >= 0) goto dump; @@ -3609,7 +3609,7 @@ static int cfg80211_rtw_del_station(struct wiphy *wiphy, struct net_device *ndev } - DBG_88E("free sta macaddr =" MAC_FMT "\n", MAC_ARG(mac)); + DBG_88E("free sta macaddr =%pM\n", mac); if (mac[0] == 0xff && mac[1] == 0xff && mac[2] == 0xff && mac[3] == 0xff && @@ -4456,7 +4456,7 @@ static int cfg80211_rtw_mgmt_tx(struct wiphy *wiphy, struct net_device *ndev, goto exit; } - DBG_88E("RTW_Tx:tx_ch=%d, da="MAC_FMT"\n", tx_ch, MAC_ARG(GetAddr1Ptr(buf))); + DBG_88E("RTW_Tx:tx_ch=%d, da=%pM\n", tx_ch, GetAddr1Ptr(buf)); #ifdef CONFIG_P2P if ((type = rtw_p2p_check_frames(padapter, buf, len, true)) >= 0) goto dump; diff --git a/os_dep/ioctl_linux.c b/os_dep/ioctl_linux.c index febfd90..2dd29c5 100644 --- a/os_dep/ioctl_linux.c +++ b/os_dep/ioctl_linux.c @@ -3866,7 +3866,7 @@ static int rtw_get_ap_info(struct net_device *dev, if (_rtw_memcmp(bssid, pnetwork->network.MacAddress, ETH_ALEN) == true)//BSSID match, then check if supporting wpa/wpa2 { - DBG_88E("BSSID:" MAC_FMT "\n", MAC_ARG(bssid)); + DBG_88E("BSSID:%pM\n", (bssid)); pbuf = rtw_get_wpa_ie(&pnetwork->network.IEs[12], &wpa_ielen, pnetwork->network.IELength-12); if (pbuf && (wpa_ielen>0)) @@ -6702,7 +6702,7 @@ static int rtw_dbg_port(struct net_device *dev, struct recv_reorder_ctrl *preorder_ctrl; DBG_88E("SSID=%s\n", cur_network->network.Ssid.Ssid); - DBG_88E("sta's macaddr:" MAC_FMT "\n", MAC_ARG(psta->hwaddr)); + DBG_88E("sta's macaddr: %pM\n", psta->hwaddr); DBG_88E("cur_channel=%d, cur_bwmode=%d, cur_ch_offset=%d\n", pmlmeext->cur_channel, pmlmeext->cur_bwmode, pmlmeext->cur_ch_offset); DBG_88E("rtsen=%d, cts2slef=%d\n", psta->rtsen, psta->cts2self); DBG_88E("state=0x%x, aid=%d, macid=%d, raid=%d\n", psta->state, psta->aid, psta->mac_id, psta->raid); @@ -6725,7 +6725,7 @@ static int rtw_dbg_port(struct net_device *dev, } else { - DBG_88E("can't get sta's macaddr, cur_network's macaddr:" MAC_FMT "\n", MAC_ARG(cur_network->network.MacAddress)); + DBG_88E("can't get sta's macaddr, cur_network's macaddr:%pM\n", (cur_network->network.MacAddress)); } break; case 0x06: @@ -6778,7 +6778,7 @@ static int rtw_dbg_port(struct net_device *dev, if (extra_arg == psta->aid) { - DBG_88E("sta's macaddr:" MAC_FMT "\n", MAC_ARG(psta->hwaddr)); + DBG_88E("sta's macaddr:%pM\n", (psta->hwaddr)); DBG_88E("rtsen=%d, cts2slef=%d\n", psta->rtsen, psta->cts2self); DBG_88E("state=0x%x, aid=%d, macid=%d, raid=%d\n", psta->state, psta->aid, psta->mac_id, psta->raid); #ifdef CONFIG_80211N_HT @@ -7742,7 +7742,7 @@ static int rtw_add_sta(struct net_device *dev, struct ieee_param *param) struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct sta_priv *pstapriv = &padapter->stapriv; - DBG_88E("rtw_add_sta(aid=%d)=" MAC_FMT "\n", param->u.add_sta.aid, MAC_ARG(param->sta_addr)); + DBG_88E("rtw_add_sta(aid=%d)=%pM\n", param->u.add_sta.aid, (param->sta_addr)); if (check_fwstate(pmlmepriv, (_FW_LINKED|WIFI_AP_STATE)) != true) { @@ -7831,7 +7831,7 @@ static int rtw_del_sta(struct net_device *dev, struct ieee_param *param) struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct sta_priv *pstapriv = &padapter->stapriv; - DBG_88E("rtw_del_sta=" MAC_FMT "\n", MAC_ARG(param->sta_addr)); + DBG_88E("rtw_del_sta=%pM\n", (param->sta_addr)); if (check_fwstate(pmlmepriv, (_FW_LINKED|WIFI_AP_STATE)) != true) { @@ -7889,7 +7889,7 @@ static int rtw_ioctl_get_sta_data(struct net_device *dev, struct ieee_param *par struct ieee_param_ex *param_ex = (struct ieee_param_ex *)param; struct sta_data *psta_data = (struct sta_data *)param_ex->data; - DBG_88E("rtw_ioctl_get_sta_info, sta_addr: " MAC_FMT "\n", MAC_ARG(param_ex->sta_addr)); + DBG_88E("rtw_ioctl_get_sta_info, sta_addr: %pM\n", (param_ex->sta_addr)); if (check_fwstate(pmlmepriv, (_FW_LINKED|WIFI_AP_STATE)) != true) { @@ -7958,7 +7958,7 @@ static int rtw_get_sta_wpaie(struct net_device *dev, struct ieee_param *param) struct mlme_priv *pmlmepriv = &(padapter->mlmepriv); struct sta_priv *pstapriv = &padapter->stapriv; - DBG_88E("rtw_get_sta_wpaie, sta_addr: " MAC_FMT "\n", MAC_ARG(param->sta_addr)); + DBG_88E("rtw_get_sta_wpaie, sta_addr: %pM\n", (param->sta_addr)); if (check_fwstate(pmlmepriv, (_FW_LINKED|WIFI_AP_STATE)) != true) { @@ -8486,7 +8486,7 @@ static int rtw_wx_set_priv(struct net_device *dev, } break; case ANDROID_WIFI_CMD_MACADDR : - sprintf(ext, "MACADDR = " MAC_FMT, MAC_ARG(dev->dev_addr)); + sprintf(ext, "MACADDR = %pM", (dev->dev_addr)); break; case ANDROID_WIFI_CMD_SCAN_ACTIVE : { @@ -11123,19 +11123,15 @@ static int rtw_tdls_enable(struct net_device *dev, } _exit_critical_bh(&pstapriv->sta_hash_lock, &irqL); - for (index=0; index< NUM_STA; index++) - { - if (!_rtw_memcmp(tdls_sta[index], empty_hwaddr, ETH_ALEN)) - { - printk("issue tear down to "MAC_FMT"\n", MAC_ARG(tdls_sta[index])); + for (index=0; index< NUM_STA; index++) { + if (!_rtw_memcmp(tdls_sta[index], empty_hwaddr, ETH_ALEN)) { + pr_info("issue tear down to %pM\n", tdls_sta[index]); issue_tdls_teardown(padapter, tdls_sta[index]); } } rtw_tdls_cmd(padapter, myid(&(padapter->eeprompriv)), TDLS_RS_RCR); rtw_reset_tdls_info(padapter); - } - else if (extra[ 0 ] == '1') - { + } else if (extra[ 0 ] == '1') { ptdlsinfo->enable = 1; } #endif //CONFIG_TDLS diff --git a/os_dep/mlme_linux.c b/os_dep/mlme_linux.c index 5c6c172..a02b976 100644 --- a/os_dep/mlme_linux.c +++ b/os_dep/mlme_linux.c @@ -422,7 +422,7 @@ static int mgnt_netdev_open(struct net_device *pnetdev) { struct hostapd_priv *phostapdpriv = rtw_netdev_priv(pnetdev); - DBG_88E("mgnt_netdev_open: MAC Address:" MAC_FMT "\n", MAC_ARG(pnetdev->dev_addr)); + DBG_88E("mgnt_netdev_open: MAC Address: %pM\n", pnetdev->dev_addr); init_usb_anchor(&phostapdpriv->anchored); diff --git a/os_dep/rtw_android.c b/os_dep/rtw_android.c index 9c16399..cf8905b 100644 --- a/os_dep/rtw_android.c +++ b/os_dep/rtw_android.c @@ -271,7 +271,7 @@ static int rtw_android_get_macaddr(struct net_device *net, char *command, int to _adapter *adapter = (_adapter *)rtw_netdev_priv(net); int bytes_written = 0; - bytes_written = snprintf(command, total_len, "Macaddr = "MAC_FMT, MAC_ARG(net->dev_addr)); + bytes_written = snprintf(command, total_len, "Macaddr = %pM", net->dev_addr); return bytes_written; } diff --git a/os_dep/usb_intf.c b/os_dep/usb_intf.c index bd6aa97..ac42d1b 100644 --- a/os_dep/usb_intf.c +++ b/os_dep/usb_intf.c @@ -962,12 +962,11 @@ static int rtw_suspend(struct usb_interface *pusb_intf, pm_message_t message) #ifdef CONFIG_LAYER2_ROAMING_RESUME if (check_fwstate(pmlmepriv, WIFI_STATION_STATE) && check_fwstate(pmlmepriv, _FW_LINKED) ) { - //DBG_88E("%s:%d assoc_ssid:%s\n", __func__, __LINE__, pmlmepriv->assoc_ssid.Ssid); - DBG_88E("%s:%d %s(" MAC_FMT "), length:%d assoc_ssid.length:%d\n",__func__, __LINE__, - pmlmepriv->cur_network.network.Ssid.Ssid, - MAC_ARG(pmlmepriv->cur_network.network.MacAddress), - pmlmepriv->cur_network.network.Ssid.SsidLength, - pmlmepriv->assoc_ssid.SsidLength); + DBG_88E("%s:%d %s( %pM ), length:%d assoc_ssid.length:%d\n",__func__, __LINE__, + pmlmepriv->cur_network.network.Ssid.Ssid, + pmlmepriv->cur_network.network.MacAddress, + pmlmepriv->cur_network.network.Ssid.SsidLength, + pmlmepriv->assoc_ssid.SsidLength); pmlmepriv->to_roaming = 1; } @@ -1437,7 +1436,7 @@ _adapter *rtw_usb_if1_init(struct dvobj_priv *dvobj, rtw_macaddr_cfg(padapter->eeprompriv.mac_addr); rtw_init_wifidirect_addrs(padapter, padapter->eeprompriv.mac_addr, padapter->eeprompriv.mac_addr); _rtw_memcpy(pnetdev->dev_addr, padapter->eeprompriv.mac_addr, ETH_ALEN); - DBG_88E("MAC Address from pnetdev->dev_addr= " MAC_FMT "\n", MAC_ARG(pnetdev->dev_addr)); + DBG_88E("MAC Address from pnetdev->dev_addr= %pM\n", pnetdev->dev_addr); #ifdef CONFIG_HOSTAPD_MLME hostapd_mode_init(padapter);