random-mirrors/amazingfate-rtl8723ds
1
0
Fork 0
mirror of https://github.com/amazingfate/rtl8723ds.git synced 2025-10-13 20:36:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

rtl8723ds: get_ra() exists only on PowerPC

Browse Source 
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 <giulio.benetti@benettiengineering.com>
This commit is contained in:
Giulio Benetti 2022-12-01 15:24:08 +01:00
parent 3f1d7b6dc7
commit aaf31f36eb
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/rtw_odm.c
View File

@ -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" RTW_PRINT("phys_t%u ta="MAC_FMT" %s, %s(band:%u, ch:%u, l_rxsc:%u)\n"
, *phys & 0xf , *phys & 0xf
, MAC_ARG(get_ta(wlanhdr)) , 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) , HDATA_RATE(attrib->data_rate)
, phys_t0->band, phys_t0->channel, phys_t0->rxsc , 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" 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 , *phys & 0xf
, MAC_ARG(get_ta(wlanhdr)) , 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) , HDATA_RATE(attrib->data_rate)
, phys_t1->band, phys_t1->channel, phys_t1->rf_mode, phys_t1->l_rxsc, phys_t1->ht_rxsc , phys_t1->band, phys_t1->channel, phys_t1->rf_mode, phys_t1->l_rxsc, phys_t1->ht_rxsc
, pkt_cch, pkt_bw , 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" RTW_PRINT("phys_t%u ta="MAC_FMT" %s, %s(band:%u, ch:%u, l_rxsc:%u, ht_rxsc:%u)\n"
, *phys & 0xf , *phys & 0xf
, MAC_ARG(get_ta(wlanhdr)) , 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) , HDATA_RATE(attrib->data_rate)
, phys_t2->band, phys_t2->channel, phys_t2->l_rxsc, phys_t2->ht_rxsc , phys_t2->band, phys_t2->channel, phys_t2->l_rxsc, phys_t2->ht_rxsc
); );

6
core/rtw_recv.c
View File

@ -4444,10 +4444,10 @@ void rx_query_phy_status(
&& _rtw_memcmp(get_hdr_bssid(wlanhdr), get_bssid(&padapter->mlmepriv), ETH_ALEN); && _rtw_memcmp(get_hdr_bssid(wlanhdr), get_bssid(&padapter->mlmepriv), ETH_ALEN);
pkt_info.bToSelf = (!pattrib->icv_err) && (!pattrib->crc_err) 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 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 pkt_info.bPacketBeacon = pkt_info.bPacketMatchBSSID
&& (GetFrameSubType(wlanhdr) == WIFI_BEACON); && (GetFrameSubType(wlanhdr) == WIFI_BEACON);
@ -4549,7 +4549,7 @@ s32 pre_recv_entry(union recv_frame *precvframe, u8 *pphy_status)
_adapter *iface = NULL; _adapter *iface = NULL;
_adapter *primary_padapter = precvframe->u.hdr.adapter; _adapter *primary_padapter = precvframe->u.hdr.adapter;
pda = get_ra(pbuf); pda = wifi_get_ra(pbuf);
if (IS_MCAST(pda) == _FALSE) { /*unicast packets*/ if (IS_MCAST(pda) == _FALSE) { /*unicast packets*/
iface = rtw_get_iface_by_macddr(primary_padapter , pda); iface = rtw_get_iface_by_macddr(primary_padapter , pda);

2
include/wifi.h
View File

@ -455,7 +455,7 @@ __inline static int IS_MCAST(unsigned char *da)
return _FALSE; return _FALSE;
} }
__inline static unsigned char *get_ra(unsigned char *pframe) __inline static unsigned char *wifi_get_ra(unsigned char *pframe)
{ {
unsigned char *ra; unsigned char *ra;
ra = GetAddr1Ptr(pframe); ra = GetAddr1Ptr(pframe);

2
os_dep/linux/ioctl_cfg80211.c
View File

@ -4735,7 +4735,7 @@ void rtw_cfg80211_rx_p2p_action_public(_adapter *adapter, union recv_frame *rfra
indicate: indicate:
#if defined(RTW_DEDICATED_P2P_DEVICE) #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) if (0)
RTW_INFO("redirect to pd_wdev:%p\n", wdev); RTW_INFO("redirect to pd_wdev:%p\n", wdev);
#endif #endif