replace custom macros with is_broadcast_ether_addr

Replace usage of custom macros with is_broadcast_ether_addr. All buffers
are properly aligned. Remove the now unsued macros MacAddr_isBcst and
IS_MAC_ADDRESS_BROADCAST.

Link: https://lore.kernel.org/r/20210805205010.31192-1-straube.linux@gmail.com
This commit is contained in:
Michael Straube 2021-08-05 22:50:10 +02:00 committed by Carlos Garcés
parent 2965c273c9
commit 03af80bee9
6 changed files with 4 additions and 18 deletions

View File

@ -20,13 +20,6 @@
extern void indicate_wx_scan_complete_event(_adapter *padapter); extern void indicate_wx_scan_complete_event(_adapter *padapter);
#define IS_MAC_ADDRESS_BROADCAST(addr) \
(\
((addr[0] == 0xff) && (addr[1] == 0xff) && \
(addr[2] == 0xff) && (addr[3] == 0xff) && \
(addr[4] == 0xff) && (addr[5] == 0xff)) ? _TRUE : _FALSE \
)
u8 rtw_validate_bssid(u8 *bssid) u8 rtw_validate_bssid(u8 *bssid)
{ {
u8 ret = _TRUE; u8 ret = _TRUE;

View File

@ -1113,7 +1113,7 @@ void count_rx_stats(_adapter *padapter, union recv_frame *prframe, struct sta_in
padapter->mlmepriv.LinkDetectInfo.NumRxOkInPeriod++; padapter->mlmepriv.LinkDetectInfo.NumRxOkInPeriod++;
if ((!MacAddr_isBcst(pattrib->dst)) && (!IS_MCAST(pattrib->dst))) if (!is_broadcast_ether_addr(pattrib->dst) && !IS_MCAST(pattrib->dst))
padapter->mlmepriv.LinkDetectInfo.NumRxUnicastOkInPeriod++; padapter->mlmepriv.LinkDetectInfo.NumRxUnicastOkInPeriod++;
if (sta) if (sta)

View File

@ -713,7 +713,7 @@ u32 rtw_free_stainfo(_adapter *padapter , struct sta_info *psta)
} }
if (!((psta->state & WIFI_AP_STATE) || MacAddr_isBcst(psta->cmn.mac_addr)) && is_pre_link_sta == _FALSE) if (!((psta->state & WIFI_AP_STATE) || is_broadcast_ether_addr(psta->cmn.mac_addr)) && is_pre_link_sta == _FALSE)
rtw_hal_set_odm_var(padapter, HAL_ODM_STA_INFO, psta, _FALSE); rtw_hal_set_odm_var(padapter, HAL_ODM_STA_INFO, psta, _FALSE);

View File

@ -2376,7 +2376,7 @@ int On_TDLS_Dis_Req(_adapter *padapter, union recv_frame *precv_frame)
if (psta_ap == NULL) if (psta_ap == NULL)
goto exit; goto exit;
dst = pIE->data + 12; dst = pIE->data + 12;
if (MacAddr_isBcst(dst) == _FALSE && (_rtw_memcmp(adapter_mac_addr(padapter), dst, ETH_ALEN) == _FALSE)) if (MacAddr_isMulticast(dst) == _FALSE && (_rtw_memcmp(adapter_mac_addr(padapter), dst, ETH_ALEN) == _FALSE))
goto exit; goto exit;
break; break;
default: default:

View File

@ -54,7 +54,7 @@ void beamforming_gid_paid(
/* VHT SU PPDU carrying one or more group addressed MPDUs or */ /* VHT SU PPDU carrying one or more group addressed MPDUs or */
/* Transmitting a VHT NDP intended for multiple recipients */ /* Transmitting a VHT NDP intended for multiple recipients */
if (MacAddr_isBcst(RA) || MacAddr_isMulticast(RA) || tcb->macId == MAC_ID_STATIC_FOR_BROADCAST_MULTICAST) { if (is_broadcast_ether_addr(RA) || MacAddr_isMulticast(RA) || tcb->macId == MAC_ID_STATIC_FOR_BROADCAST_MULTICAST) {
tcb->G_ID = 63; tcb->G_ID = 63;
tcb->P_AID = 0; tcb->P_AID = 0;
} else if (ACTING_AS_AP(adapter)) { } else if (ACTING_AS_AP(adapter)) {

View File

@ -441,13 +441,6 @@ enum WIFI_REG_DOMAIN {
#define GetAddr4Ptr(pbuf) ((unsigned char *)((SIZE_PTR)(pbuf) + 24)) #define GetAddr4Ptr(pbuf) ((unsigned char *)((SIZE_PTR)(pbuf) + 24))
#define MacAddr_isBcst(addr) \
(\
((addr[0] == 0xff) && (addr[1] == 0xff) && \
(addr[2] == 0xff) && (addr[3] == 0xff) && \
(addr[4] == 0xff) && (addr[5] == 0xff)) ? _TRUE : _FALSE \
)
__inline static int IS_MCAST(const u8 *da) __inline static int IS_MCAST(const u8 *da)
{ {
if ((*da) & 0x01) if ((*da) & 0x01)