aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/common/eapol_common.h4
-rw-r--r--wpa_supplicant/config.c4
2 files changed, 8 insertions, 0 deletions
diff --git a/src/common/eapol_common.h b/src/common/eapol_common.h
index 4811f38..3f4261a 100644
--- a/src/common/eapol_common.h
+++ b/src/common/eapol_common.h
@@ -26,7 +26,11 @@ struct ieee802_1x_hdr {
#pragma pack(pop)
#endif /* _MSC_VER */
+#ifdef CONFIG_MACSEC
+#define EAPOL_VERSION 3
+#else /* CONFIG_MACSEC */
#define EAPOL_VERSION 2
+#endif /* CONFIG_MACSEC */
enum { IEEE802_1X_TYPE_EAP_PACKET = 0,
IEEE802_1X_TYPE_EAPOL_START = 1,
diff --git a/wpa_supplicant/config.c b/wpa_supplicant/config.c
index b5a5d78..7d58c05 100644
--- a/wpa_supplicant/config.c
+++ b/wpa_supplicant/config.c
@@ -3784,7 +3784,11 @@ static const struct global_parse_data global_fields[] = {
{ FUNC_NO_VAR(no_ctrl_interface), 0 },
{ STR(ctrl_interface_group), 0 } /* deprecated */,
#endif /* CONFIG_CTRL_IFACE */
+#ifdef CONFIG_MACSEC
+ { INT_RANGE(eapol_version, 1, 3), 0 },
+#else /* CONFIG_MACSEC */
{ INT_RANGE(eapol_version, 1, 2), 0 },
+#endif /* CONFIG_MACSEC */
{ INT(ap_scan), 0 },
{ FUNC(bgscan), 0 },
{ INT(disable_scan_offload), 0 },