From 9a3639f2facd8716cf72f7ea2f44e2d996437c3d Mon Sep 17 00:00:00 2001 From: James Prestwood Date: Wed, 12 May 2021 16:01:46 -0700 Subject: [PATCH] ie: use bitwise compare for IE_AKM_IS_FT This has the same effect when passing a single AKM value, but also handles AKM bit fields (e.g. ie_rsn_info->akm_suites) --- src/ie.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ie.h b/src/ie.h index 600cf297..538ca9a8 100644 --- a/src/ie.h +++ b/src/ie.h @@ -289,12 +289,12 @@ enum ie_rsn_akm_suite { (akm == IE_RSN_AKM_SUITE_FT_OVER_SAE_SHA256)) #define IE_AKM_IS_FT(akm) \ - ((akm == IE_RSN_AKM_SUITE_FT_OVER_8021X) || \ - (akm == IE_RSN_AKM_SUITE_FT_USING_PSK) || \ - (akm == IE_RSN_AKM_SUITE_FT_OVER_SAE_SHA256) || \ - (akm == IE_RSN_AKM_SUITE_FT_OVER_8021X_SHA384) || \ - (akm == IE_RSN_AKM_SUITE_FT_OVER_FILS_SHA256) || \ - (akm == IE_RSN_AKM_SUITE_FT_OVER_FILS_SHA384)) + (akm & (IE_RSN_AKM_SUITE_FT_OVER_8021X | \ + IE_RSN_AKM_SUITE_FT_USING_PSK | \ + IE_RSN_AKM_SUITE_FT_OVER_SAE_SHA256 | \ + IE_RSN_AKM_SUITE_FT_OVER_8021X_SHA384 | \ + IE_RSN_AKM_SUITE_FT_OVER_FILS_SHA256 | \ + IE_RSN_AKM_SUITE_FT_OVER_FILS_SHA384)) #define IE_AKM_IS_FILS(akm) \ ((akm == IE_RSN_AKM_SUITE_FILS_SHA256) || \