mirror of
https://git.freebsd.org/ports.git
synced 2025-06-05 12:56:28 -04:00
248bca32f4
See http://w1.fi/cgit/hostap/plain/wpa_supplicant/ChangeLog for list of changes since version 2.3.
32 lines
1 KiB
C
32 lines
1 KiB
C
--- wpa_supplicant/scan.c.orig 2015-03-15 17:30:39 UTC
|
|
+++ wpa_supplicant/scan.c
|
|
@@ -1621,7 +1621,7 @@ struct wpabuf * wpa_scan_get_vendor_ie_m
|
|
* better. */
|
|
static int wpa_scan_result_compar(const void *a, const void *b)
|
|
{
|
|
-#define MIN(a,b) a < b ? a : b
|
|
+#define MINAB(a,b) a < b ? a : b
|
|
struct wpa_scan_res **_wa = (void *) a;
|
|
struct wpa_scan_res **_wb = (void *) b;
|
|
struct wpa_scan_res *wa = *_wa;
|
|
@@ -1650,9 +1650,9 @@ static int wpa_scan_result_compar(const
|
|
|
|
if (wa->flags & wb->flags & WPA_SCAN_LEVEL_DBM) {
|
|
snr_a_full = wa->snr;
|
|
- snr_a = MIN(wa->snr, GREAT_SNR);
|
|
+ snr_a = MINAB(wa->snr, GREAT_SNR);
|
|
snr_b_full = wb->snr;
|
|
- snr_b = MIN(wa->snr, GREAT_SNR);
|
|
+ snr_b = MINAB(wa->snr, GREAT_SNR);
|
|
} else {
|
|
/* Level is not in dBm, so we can't calculate
|
|
* SNR. Just use raw level (units unknown). */
|
|
@@ -1675,7 +1675,7 @@ static int wpa_scan_result_compar(const
|
|
if (snr_b_full == snr_a_full)
|
|
return wb->qual - wa->qual;
|
|
return snr_b_full - snr_a_full;
|
|
-#undef MIN
|
|
+#undef MINAB
|
|
}
|
|
|
|
|