mirrors/8821cu-20210916
1
0
Fork 0
mirror of https://github.com/morrownr/8821cu-20210916.git synced 2024-11-22 13:34:47 +00:00
Code Releases Activity

Merge branch 'main' of https://github.com/morrownr/8821cu-20210916

Browse Source
This commit is contained in:
morrownr 2023-03-13 21:36:53 -05:00
commit dff921fddc
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/rtw_odm.c
View File

@ -272,7 +272,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(rtl_get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(rtl_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
); );
@ -382,7 +382,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(rtl_get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(rtl_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
@ -400,7 +400,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(rtl_get_ra(wlanhdr)) ? "BC" : is_multicast_mac_addr(rtl_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

@ -4254,7 +4254,7 @@ int recv_func(_adapter *padapter, union recv_frame *rframe)
if (check_fwstate(mlmepriv, WIFI_MONITOR_STATE) if (check_fwstate(mlmepriv, WIFI_MONITOR_STATE)
#ifdef RTW_SIMPLE_CONFIG #ifdef RTW_SIMPLE_CONFIG
|| (check_fwstate(mlmepriv, WIFI_AP_STATE) && padapter->rtw_simple_config == _TRUE && IS_MCAST(get_ra(ptr))) || (check_fwstate(mlmepriv, WIFI_AP_STATE) && padapter->rtw_simple_config == _TRUE && IS_MCAST(rtl_get_ra(ptr)))
#endif #endif
) { ) {
#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24)) #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24))
@ -4607,7 +4607,7 @@ void rx_query_phy_status(
wlanhdr = get_recvframe_data(precvframe); wlanhdr = get_recvframe_data(precvframe);
ta = get_ta(wlanhdr); ta = get_ta(wlanhdr);
ra = get_ra(wlanhdr); ra = rtl_get_ra(wlanhdr);
is_ra_bmc = IS_MCAST(ra); is_ra_bmc = IS_MCAST(ra);
if (_rtw_memcmp(adapter_mac_addr(padapter), ta, ETH_ALEN) == _TRUE) { if (_rtw_memcmp(adapter_mac_addr(padapter), ta, ETH_ALEN) == _TRUE) {
@ -4755,7 +4755,7 @@ s32 pre_recv_entry(union recv_frame *precvframe, u8 *pphy_status)
{ {
s32 ret = _SUCCESS; s32 ret = _SUCCESS;
u8 *pbuf = precvframe->u.hdr.rx_data; u8 *pbuf = precvframe->u.hdr.rx_data;
u8 *ra = get_ra(pbuf); u8 *ra = rtl_get_ra(pbuf);
u8 ra_is_bmc = IS_MCAST(ra); u8 ra_is_bmc = IS_MCAST(ra);
bool phy_queried = 0; bool phy_queried = 0;
_adapter *primary_padapter = precvframe->u.hdr.adapter; _adapter *primary_padapter = precvframe->u.hdr.adapter;

2
hal/hal_com.c
View File

@ -14313,7 +14313,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__);*/ /*RTW_INFO("=>%s WIFI_DATA_TYPE or WIFI_QOS_DATA_TYPE\n", __FUNCTION__);*/
if (psta) { if (psta) {
if (IS_MCAST(get_ra(get_recvframe_data(prframe)))) if (IS_MCAST(rtl_get_ra(get_recvframe_data(prframe))))
psta_dframe_info = &psta->sta_dframe_info_bmc; psta_dframe_info = &psta->sta_dframe_info_bmc;
else else
psta_dframe_info = &psta->sta_dframe_info; psta_dframe_info = &psta->sta_dframe_info;

2
include/wifi.h
View File

@ -463,7 +463,7 @@ __inline static int IS_MCAST(const u8 *da)
return _FALSE; return _FALSE;
} }
__inline static unsigned char *get_ra(unsigned char *pframe) __inline static unsigned char *rtl_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

@ -7157,7 +7157,7 @@ void rtw_cfg80211_rx_p2p_action_public(_adapter *adapter, union recv_frame *rfra
indicate: indicate:
#endif #endif
#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), rtl_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