staging: rtl8188eu: Use is_{zero/broadcast}_ether_addr() instead of memcmp()

Simplify the code by using is_{zero/broadcast}_ether_addr() instead of
directly using memcmp() to determine if the ethernet address is all
zeros or broadcast address.

Signed-off-by: Liu Shixin <liushixin2@huawei.com>
Link: https://lore.kernel.org/r/20210609085650.1269008-1-liushixin2@huawei.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme.c b/drivers/staging/rtl8188eu/core/rtw_mlme.c
index ba73ac5325e22b01c5758fc73e8de2eb599a8369..01bbfd29488f4bcf5bfa5c78666183d511ededef 100644 (file)
--- a/drivers/staging/rtl8188eu/core/rtw_mlme.c
+++ b/drivers/staging/rtl8188eu/core/rtw_mlme.c
@@ -19,6 +19,7 @@
 #include <wlan_bssdef.h>
 #include <rtw_ioctl_set.h>
 #include <linux/vmalloc.h>
+#include <linux/etherdevice.h>
 
 extern const u8 MCS_rate_1R[16];
 
@@ -179,9 +180,8 @@ struct wlan_network *rtw_find_network(struct __queue *scanned_queue, u8 *addr)
 {
        struct list_head *phead, *plist;
        struct wlan_network *pnetwork = NULL;
-       u8 zero_addr[ETH_ALEN] = {0, 0, 0, 0, 0, 0};
 
-       if (!memcmp(zero_addr, addr, ETH_ALEN)) {
+       if (is_zero_ether_addr(addr)) {
                pnetwork = NULL;
                goto exit;
        }

diff --git a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
index 6803e9327eb274d566515b4ee7b6476dafbb0c44..29b2d9f75fd5a46b10737fb0892a525e4809d0ec 100644 (file)
--- a/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
+++ b/drivers/staging/rtl8188eu/core/rtw_mlme_ext.c
@@ -7,6 +7,7 @@
 #define _RTW_MLME_EXT_C_
 
 #include <linux/ieee80211.h>
+#include <linux/etherdevice.h>
 #include <asm/unaligned.h>
 
 #include <osdep_service.h>
@@ -4049,13 +4050,12 @@ 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->pkt->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)))
                        return;
                ptable->func(padapter, precv_frame);
        }
@@ -4068,7 +4068,6 @@ void mgt_dispatcher(struct adapter *padapter, struct recv_frame *precv_frame)
 #ifdef CONFIG_88EU_AP_MODE
        struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
 #endif
-       u8 bc_addr[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
        u8 *pframe = precv_frame->pkt->data;
        struct sta_info *psta = rtw_get_stainfo(&padapter->stapriv, GetAddr2Ptr(pframe));
 
@@ -4086,7 +4085,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;
 
        ptable = mlme_sta_tbl;

diff --git a/drivers/staging/rtl8188eu/core/rtw_recv.c b/drivers/staging/rtl8188eu/core/rtw_recv.c
index ef37cc6bf51ff6cb55d2dd0a8227b586229882b2..5a8170d4eab694ede3f328e2fff608968c1ebfe1 100644 (file)
--- a/drivers/staging/rtl8188eu/core/rtw_recv.c
+++ b/drivers/staging/rtl8188eu/core/rtw_recv.c
@@ -16,6 +16,7 @@
 #include <mon.h>
 #include <wifi.h>
 #include <linux/vmalloc.h>
+#include <linux/etherdevice.h>
 #include <net/cfg80211.h>
 
 #define LLC_HEADER_SIZE                        6       /*  LLC Header Length */
@@ -649,8 +650,8 @@ static int sta2sta_data_frame(struct adapter *adapter,
                        goto exit;
                }
 
-               if (!memcmp(pattrib->bssid, "\x0\x0\x0\x0\x0\x0", ETH_ALEN) ||
-                   !memcmp(mybssid, "\x0\x0\x0\x0\x0\x0", ETH_ALEN) ||
+               if (is_zero_ether_addr(pattrib->bssid) ||
+                   is_zero_ether_addr(mybssid) ||
                    memcmp(pattrib->bssid, mybssid, ETH_ALEN)) {
                        ret = _FAIL;
                        goto exit;
@@ -732,9 +733,9 @@ static int ap2sta_data_frame(struct adapter *adapter,
                }
 
                /*  check BSSID */
-               if (!memcmp(pattrib->bssid, "\x0\x0\x0\x0\x0\x0", ETH_ALEN) ||
-                   !memcmp(mybssid, "\x0\x0\x0\x0\x0\x0", ETH_ALEN) ||
-                    (memcmp(pattrib->bssid, mybssid, ETH_ALEN))) {
+               if (is_zero_ether_addr(pattrib->bssid) ||
+                   is_zero_ether_addr(mybssid) ||
+                   (memcmp(pattrib->bssid, mybssid, ETH_ALEN))) {
                        RT_TRACE(_module_rtl871x_recv_c_, _drv_info_,
                                 (" %s:  compare BSSID fail ; BSSID=%pM\n", __func__, (pattrib->bssid)));
                        RT_TRACE(_module_rtl871x_recv_c_, _drv_info_, ("mybssid=%pM\n", (mybssid)));

diff --git a/drivers/staging/rtl8188eu/hal/odm.c b/drivers/staging/rtl8188eu/hal/odm.c
index 8348e02b4c8616694a50540b5e5bef336adf7d61..041ee2965add659528dfbead9cb0b9222e666260 100644 (file)
--- a/drivers/staging/rtl8188eu/hal/odm.c
+++ b/drivers/staging/rtl8188eu/hal/odm.c
@@ -5,6 +5,8 @@
  *
  ******************************************************************************/
 
+#include <linux/etherdevice.h>
+
 #include "odm_precomp.h"
 #include "phy.h"
 
@@ -893,7 +895,6 @@ void odm_RSSIMonitorCheckCE(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 (!check_fwstate(&Adapter->mlmepriv, _FW_LINKED))
                return;
@@ -902,7 +903,7 @@ void odm_RSSIMonitorCheckCE(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) &&
                    memcmp(psta->hwaddr, myid(&Adapter->eeprompriv), ETH_ALEN)) {
                        if (psta->rssi_stat.UndecoratedSmoothedPWDB < tmpEntryMinPWDB)
                                tmpEntryMinPWDB = psta->rssi_stat.UndecoratedSmoothedPWDB;