Messages in this thread |  | | Date | Thu, 21 Oct 2021 12:12:27 +0200 | Subject | Re: [PATCH 3/5] staging: r8188eu: use helper to check for broadcast address | From | Michael Straube <> |
| |
On 10/20/21 23:07, Phillip Potter wrote: > On Wed, Oct 20, 2021 at 09:53:59PM +0200, Martin Kaiser wrote: >> Use the is_broadcast_ether_addr function to check for a >> broadcast address. >> >> Signed-off-by: Martin Kaiser <martin@kaiser.cx> >> --- >> drivers/staging/r8188eu/core/rtw_mlme_ext.c | 6 ++---- >> drivers/staging/r8188eu/hal/odm.c | 3 +-- >> 2 files changed, 3 insertions(+), 6 deletions(-) >> >> diff --git a/drivers/staging/r8188eu/core/rtw_mlme_ext.c b/drivers/staging/r8188eu/core/rtw_mlme_ext.c >> index 995a0248c26f..b0dfafe526f7 100644 >> --- a/drivers/staging/r8188eu/core/rtw_mlme_ext.c >> +++ b/drivers/staging/r8188eu/core/rtw_mlme_ext.c >> @@ -392,13 +392,12 @@ void free_mlme_ext_priv(struct mlme_ext_priv *pmlmeext) >> >> static void _mgt_dispatcher(struct adapter *padapter, struct mlme_handler *ptable, struct recv_frame *precv_frame) >> { >> - u8 bc_addr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; >> u8 *pframe = precv_frame->rx_data; >> >> if (ptable->func) { >> /* receive the frames that ra(a1) is my address or ra(a1) is bc address. */ >> if (memcmp(GetAddr1Ptr(pframe), myid(&padapter->eeprompriv), ETH_ALEN) && >> - memcmp(GetAddr1Ptr(pframe), bc_addr, ETH_ALEN)) >> + !is_broadcast_ether_addr(GetAddr1Ptr(pframe)))
Hi Martin,
I'm not an expert regarding alignment. Is GetAddr1Ptr(pframe) always __aligned(2) as required by is_broadcast_ether_addr?
>> return; >> ptable->func(padapter, precv_frame); >> } >> @@ -409,7 +408,6 @@ void mgt_dispatcher(struct adapter *padapter, struct recv_frame *precv_frame) >> int index; >> struct mlme_handler *ptable; >> struct mlme_priv *pmlmepriv = &padapter->mlmepriv; >> - u8 bc_addr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; >> u8 *pframe = precv_frame->rx_data; >> struct sta_info *psta = rtw_get_stainfo(&padapter->stapriv, GetAddr2Ptr(pframe)); >> >> @@ -418,7 +416,7 @@ void mgt_dispatcher(struct adapter *padapter, struct recv_frame *precv_frame) >> >> /* receive the frames that ra(a1) is my address or ra(a1) is bc address. */ >> if (memcmp(GetAddr1Ptr(pframe), myid(&padapter->eeprompriv), ETH_ALEN) && >> - memcmp(GetAddr1Ptr(pframe), bc_addr, ETH_ALEN)) >> + !is_broadcast_ether_addr(GetAddr1Ptr(pframe))) >> return;
Same here.
>> >> ptable = mlme_sta_tbl; >> diff --git a/drivers/staging/r8188eu/hal/odm.c b/drivers/staging/r8188eu/hal/odm.c >> index 67cf8f7baba5..21f115194df8 100644 >> --- a/drivers/staging/r8188eu/hal/odm.c >> +++ b/drivers/staging/r8188eu/hal/odm.c >> @@ -829,7 +829,6 @@ void odm_RSSIMonitorCheck(struct odm_dm_struct *pDM_Odm) >> u8 sta_cnt = 0; >> u32 PWDB_rssi[NUM_STA] = {0};/* 0~15]:MACID, [16~31]:PWDB_rssi */ >> struct sta_info *psta; >> - u8 bcast_addr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; >> >> if (!(pDM_Odm->SupportAbility & ODM_BB_RSSI_MONITOR)) >> return; >> @@ -841,7 +840,7 @@ void odm_RSSIMonitorCheck(struct odm_dm_struct *pDM_Odm) >> psta = pDM_Odm->pODM_StaInfo[i]; >> if (IS_STA_VALID(psta) && >> (psta->state & WIFI_ASOC_STATE) && >> - memcmp(psta->hwaddr, bcast_addr, ETH_ALEN) && >> + !is_broadcast_ether_addr(psta->hwaddr) &&
Perhaps we should add __aligned(2) to the hwaddr variable in struct sta_info to be safe?
u8 hwaddr[ETH_ALEN] __aligned(2);
>> memcmp(psta->hwaddr, myid(&Adapter->eeprompriv), ETH_ALEN)) { >> if (psta->rssi_stat.UndecoratedSmoothedPWDB < tmpEntryMinPWDB) >> tmpEntryMinPWDB = psta->rssi_stat.UndecoratedSmoothedPWDB; >> -- >> 2.20.1 >>
Other than that the patch looks good, thanks.
Michael
|  |