DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Use ether_addr_equal() to compare whether two MAC addresses are equal

Browse source 
This was done with spatch using the following semantic patch and minor
manual edits to clean up coding style and avoid compiler warnings in
driver_wext.c:

@@
expression a,b;
@@
-	os_memcmp(a, b, ETH_ALEN) == 0
+	ether_addr_equal(a, b)

@@
expression a,b;
@@
-	os_memcmp(a, b, ETH_ALEN) != 0
+	!ether_addr_equal(a, b)

@@
expression a,b;
@@
-	!os_memcmp(a, b, ETH_ALEN)
+	ether_addr_equal(a, b)

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2024-01-13 23:15:36 +02:00
parent 58027cfecc
commit 2d83d224ff
85 changed files with 460 additions and 497 deletions
Download patch file Download diff file Expand all files Collapse all files

12
wpa_supplicant/rrm.c
View file

@ -936,8 +936,8 @@ static int wpas_add_beacon_rep(struct wpa_supplicant *wpa_s,
struct rrm_measurement_beacon_report rep;
u8 idx = 0;
if (os_memcmp(data->bssid, broadcast_ether_addr, ETH_ALEN) != 0 &&
os_memcmp(data->bssid, bss->bssid, ETH_ALEN) != 0)
if (!ether_addr_equal(data->bssid, broadcast_ether_addr) &&
!ether_addr_equal(data->bssid, bss->bssid))
return 0;
if (data->ssid_len &&
@ -1515,8 +1515,8 @@ int wpas_beacon_rep_scan_process(struct wpa_supplicant *wpa_s,
MAC2STR(info->scan_start_tsf_bssid),
MAC2STR(wpa_s->current_bss->bssid));
if ((wpa_s->drv_rrm_flags & WPA_DRIVER_FLAGS_SUPPORT_BEACON_REPORT) &&
os_memcmp(info->scan_start_tsf_bssid, wpa_s->current_bss->bssid,
ETH_ALEN) != 0) {
!ether_addr_equal(info->scan_start_tsf_bssid,
wpa_s->current_bss->bssid)) {
wpa_printf(MSG_DEBUG,
"RRM: Ignore scan results due to mismatching TSF BSSID");
goto out;
@ -1531,8 +1531,8 @@ int wpas_beacon_rep_scan_process(struct wpa_supplicant *wpa_s,
if ((wpa_s->drv_rrm_flags &
WPA_DRIVER_FLAGS_SUPPORT_BEACON_REPORT) &&
os_memcmp(scan_res->res[i]->tsf_bssid,
wpa_s->current_bss->bssid, ETH_ALEN) != 0) {
!ether_addr_equal(scan_res->res[i]->tsf_bssid,
wpa_s->current_bss->bssid)) {
wpa_printf(MSG_DEBUG,
"RRM: Ignore scan result for " MACSTR
" due to mismatching TSF BSSID" MACSTR,