From 089165e6a4df26a62c6c78f9e8dcdc097adf82d6 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Wed, 18 Jun 2008 11:18:26 +0300 Subject: [PATCH] Added temporary #ifdef WEXT_MFP_PENDING around the MFP changes Just in case, do not use the not-yet-approved WEXT changes even if someone where to build wpa_supplicant with IEEE 802.11w support unless this new macro has been defined explicitly. --- src/drivers/driver_wext.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/drivers/driver_wext.c b/src/drivers/driver_wext.c index 157243ee4..4c5ff7b6b 100644 --- a/src/drivers/driver_wext.c +++ b/src/drivers/driver_wext.c @@ -1800,11 +1800,13 @@ static int wpa_driver_wext_set_key_ext(void *priv, wpa_alg alg, case WPA_ALG_PMK: ext->alg = IW_ENCODE_ALG_PMK; break; +#ifdef WEXT_MFP_PENDING #ifdef CONFIG_IEEE80211W case WPA_ALG_IGTK: ext->alg = IW_ENCODE_ALG_AES_CMAC; break; #endif /* CONFIG_IEEE80211W */ +#endif /* WEXT_MFP_PENDING */ default: wpa_printf(MSG_DEBUG, "%s: Unknown algorithm %d", __FUNCTION__, alg); @@ -2158,6 +2160,7 @@ int wpa_driver_wext_associate(void *priv, IW_AUTH_RX_UNENCRYPTED_EAPOL, allow_unencrypted_eapol) < 0) ret = -1; +#ifdef WEXT_MFP_PENDING #ifdef CONFIG_IEEE80211W switch (params->mgmt_frame_protection) { case NO_MGMT_FRAME_PROTECTION: @@ -2173,6 +2176,7 @@ int wpa_driver_wext_associate(void *priv, if (wpa_driver_wext_set_auth_param(drv, IW_AUTH_MFP, value) < 0) ret = -1; #endif /* CONFIG_IEEE80211W */ +#endif /* WEXT_MFP_PENDING */ if (params->freq && wpa_driver_wext_set_freq(drv, params->freq) < 0) ret = -1; if (wpa_driver_wext_set_ssid(drv, params->ssid, params->ssid_len) < 0)