From 7245a6982d878d6122fa3978d255e27625ad2cec Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Mon, 28 Nov 2022 13:36:55 -0600 Subject: [PATCH] rtl8188eu: Change get_ra() to wifi_get_ra() Author: Giulio Benetti giulio.benetti@benettiengineering.com In PowerPc Linux only get_ra() exists[0] and conflicts with local get_ra() that has a completely different purpose. So let's rename local get_ra() to wifi_get_ra() to make it different from Linux's get_ra(). [0]: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/powerpc/include/asm/disassemble.h?h=v6.1-rc7#n49 Signed-off-by: Giulio Benetti Signed-off-by: Larry Finger --- rtw_odm.c | 6 +++--- rtw_recv.c | 6 +++--- wifi.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/rtw_odm.c b/rtw_odm.c index 922a7b9..76f73d6 100644 --- a/rtw_odm.c +++ b/rtw_odm.c @@ -283,7 +283,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 ); @@ -399,7 +399,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 @@ -417,7 +417,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/rtw_recv.c b/rtw_recv.c index 9439415..24eb9e9 100755 --- a/rtw_recv.c +++ b/rtw_recv.c @@ -4040,10 +4040,10 @@ void rx_query_phy_status( && !memcmp(get_hdr_bssid(wlanhdr), get_bssid(&padapter->mlmepriv), ETH_ALEN); pkt_info.is_to_self = (!pattrib->icv_err) && (!pattrib->crc_err) - && !memcmp(get_ra(wlanhdr), adapter_mac_addr(padapter), ETH_ALEN); + && !memcmp(wifi_get_ra(wlanhdr), adapter_mac_addr(padapter), ETH_ALEN); pkt_info.is_packet_to_self = pkt_info.is_packet_match_bssid - && !memcmp(get_ra(wlanhdr), adapter_mac_addr(padapter), ETH_ALEN); + && !memcmp(wifi_get_ra(wlanhdr), adapter_mac_addr(padapter), ETH_ALEN); pkt_info.is_packet_beacon = pkt_info.is_packet_match_bssid && (get_frame_sub_type(wlanhdr) == WIFI_BEACON); @@ -4129,7 +4129,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/wifi.h b/wifi.h index a6fc5b4..4b7377b 100644 --- a/wifi.h +++ b/wifi.h @@ -404,7 +404,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);