From d4ad2121c906c860750fbd8614485152f0fef913 Mon Sep 17 00:00:00 2001 From: kimocoder Date: Tue, 2 May 2023 00:25:10 +0200 Subject: [PATCH] get_ra() exists only on PowerPC --- core/rtw_odm.c | 6 +++--- core/rtw_recv.c | 4 ++-- hal/hal_com.c | 2 +- include/wifi.h | 2 +- os_dep/linux/ioctl_cfg80211.c | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/core/rtw_odm.c b/core/rtw_odm.c index 7204181..4e1151d 100644 --- a/core/rtw_odm.c +++ b/core/rtw_odm.c @@ -273,7 +273,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 ); @@ -389,7 +389,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 @@ -407,7 +407,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 ffd1ff9..025b300 100644 --- a/core/rtw_recv.c +++ b/core/rtw_recv.c @@ -4851,7 +4851,7 @@ void rx_query_phy_status( wlanhdr = get_recvframe_data(precvframe); ta = get_ta(wlanhdr); - ra = get_ra(wlanhdr); + ra = wifi_get_ra(wlanhdr); is_ra_bmc = IS_MCAST(ra); if (_rtw_memcmp(adapter_mac_addr(padapter), ta, ETH_ALEN) == _TRUE) { @@ -4991,7 +4991,7 @@ s32 pre_recv_entry(union recv_frame *precvframe, u8 *pphy_status) { s32 ret = _SUCCESS; u8 *pbuf = precvframe->u.hdr.rx_data; - u8 *pda = get_ra(pbuf); + u8 *pda = wifi_get_ra(pbuf); u8 ra_is_bmc = IS_MCAST(pda); _adapter *primary_padapter = precvframe->u.hdr.adapter; #ifdef CONFIG_CONCURRENT_MODE diff --git a/hal/hal_com.c b/hal/hal_com.c index dcf8edf..7ef3222 100644 --- a/hal/hal_com.c +++ b/hal/hal_com.c @@ -12569,7 +12569,7 @@ void rtw_store_phy_info(_adapter *padapter, union recv_frame *prframe) /*RTW_INFO("=>%s WIFI_DATA_TYPE or WIFI_QOS_DATA_TYPE\n", __FUNCTION__);*/ if (psta) { - if (IS_MCAST(get_ra(get_recvframe_data(prframe)))) + if (IS_MCAST(wifi_get_ra(get_recvframe_data(prframe)))) psta_dframe_info = &psta->sta_dframe_info_bmc; else psta_dframe_info = &psta->sta_dframe_info; diff --git a/include/wifi.h b/include/wifi.h index f071dd0..622e005 100644 --- a/include/wifi.h +++ b/include/wifi.h @@ -454,7 +454,7 @@ __inline static int IS_MCAST(const u8 *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 2e08234..49052fd 100644 --- a/os_dep/linux/ioctl_cfg80211.c +++ b/os_dep/linux/ioctl_cfg80211.c @@ -6475,7 +6475,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