diff --git a/core/rtw_odm.c b/core/rtw_odm.c index d9b7db1..962560a 100644 --- a/core/rtw_odm.c +++ b/core/rtw_odm.c @@ -430,7 +430,7 @@ void rtw_odm_parse_rx_phy_status_chinfo(union recv_frame *rframe, u8 *phys) RTW_PRINT("phys_t%u ta="MAC_FMT" %s, %s(band:%u, ch:%u, l_rxsc:%u)\n" , *phys & 0xf , MAC_ARG(get_ta(wlanhdr)) - , is_broadcast_mac_addr(get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(get_ra(wlanhdr)) ? "MC" : "UC" + , is_broadcast_mac_addr(wifi_get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(wifi_get_ra(wlanhdr)) ? "MC" : "UC" , HDATA_RATE(attrib->data_rate) , phys_t0->band, phys_t0->channel, phys_t0->rxsc ); @@ -546,7 +546,7 @@ type1_end: RTW_PRINT("phys_t%u ta="MAC_FMT" %s, %s(band:%u, ch:%u, rf_mode:%u, l_rxsc:%u, ht_rxsc:%u) => %u,%u\n" , *phys & 0xf , MAC_ARG(get_ta(wlanhdr)) - , is_broadcast_mac_addr(get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(get_ra(wlanhdr)) ? "MC" : "UC" + , is_broadcast_mac_addr(wifi_get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(wifi_get_ra(wlanhdr)) ? "MC" : "UC" , HDATA_RATE(attrib->data_rate) , phys_t1->band, phys_t1->channel, phys_t1->rf_mode, phys_t1->l_rxsc, phys_t1->ht_rxsc , pkt_cch, pkt_bw @@ -564,7 +564,7 @@ type1_end: RTW_PRINT("phys_t%u ta="MAC_FMT" %s, %s(band:%u, ch:%u, l_rxsc:%u, ht_rxsc:%u)\n" , *phys & 0xf , MAC_ARG(get_ta(wlanhdr)) - , is_broadcast_mac_addr(get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(get_ra(wlanhdr)) ? "MC" : "UC" + , is_broadcast_mac_addr(wifi_get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(wifi_get_ra(wlanhdr)) ? "MC" : "UC" , HDATA_RATE(attrib->data_rate) , phys_t2->band, phys_t2->channel, phys_t2->l_rxsc, phys_t2->ht_rxsc ); diff --git a/core/rtw_recv.c b/core/rtw_recv.c index 87a6b2a..6a3c26d 100644 --- a/core/rtw_recv.c +++ b/core/rtw_recv.c @@ -4444,10 +4444,10 @@ void rx_query_phy_status( && _rtw_memcmp(get_hdr_bssid(wlanhdr), get_bssid(&padapter->mlmepriv), ETH_ALEN); pkt_info.bToSelf = (!pattrib->icv_err) && (!pattrib->crc_err) - && _rtw_memcmp(get_ra(wlanhdr), adapter_mac_addr(padapter), ETH_ALEN); + && _rtw_memcmp(wifi_get_ra(wlanhdr), adapter_mac_addr(padapter), ETH_ALEN); pkt_info.bPacketToSelf = pkt_info.bPacketMatchBSSID - && _rtw_memcmp(get_ra(wlanhdr), adapter_mac_addr(padapter), ETH_ALEN); + && _rtw_memcmp(wifi_get_ra(wlanhdr), adapter_mac_addr(padapter), ETH_ALEN); pkt_info.bPacketBeacon = pkt_info.bPacketMatchBSSID && (GetFrameSubType(wlanhdr) == WIFI_BEACON); @@ -4549,7 +4549,7 @@ s32 pre_recv_entry(union recv_frame *precvframe, u8 *pphy_status) _adapter *iface = NULL; _adapter *primary_padapter = precvframe->u.hdr.adapter; - pda = get_ra(pbuf); + pda = wifi_get_ra(pbuf); if (IS_MCAST(pda) == _FALSE) { /*unicast packets*/ iface = rtw_get_iface_by_macddr(primary_padapter , pda); diff --git a/include/wifi.h b/include/wifi.h index ce78bf6..ccdbd0f 100644 --- a/include/wifi.h +++ b/include/wifi.h @@ -455,7 +455,7 @@ __inline static int IS_MCAST(unsigned char *da) return _FALSE; } -__inline static unsigned char *get_ra(unsigned char *pframe) +__inline static unsigned char *wifi_get_ra(unsigned char *pframe) { unsigned char *ra; ra = GetAddr1Ptr(pframe); diff --git a/os_dep/linux/ioctl_cfg80211.c b/os_dep/linux/ioctl_cfg80211.c index a197612..4fff23a 100644 --- a/os_dep/linux/ioctl_cfg80211.c +++ b/os_dep/linux/ioctl_cfg80211.c @@ -4735,7 +4735,7 @@ void rtw_cfg80211_rx_p2p_action_public(_adapter *adapter, union recv_frame *rfra indicate: #if defined(RTW_DEDICATED_P2P_DEVICE) - if (rtw_cfg80211_redirect_pd_wdev(dvobj_to_wiphy(dvobj), get_ra(frame), &wdev)) + if (rtw_cfg80211_redirect_pd_wdev(dvobj_to_wiphy(dvobj), wifi_get_ra(frame), &wdev)) if (0) RTW_INFO("redirect to pd_wdev:%p\n", wdev); #endif