diff options
| author | Jouni Malinen <jouni.malinen@atheros.com> | 2008-12-31 18:10:14 +0200 |
|---|---|---|
| committer | Jouni Malinen <j@w1.fi> | 2008-12-31 18:10:14 +0200 |
| commit | e834272f732739bad2b0168dc0fe6422b045e4e5 (patch) | |
| tree | 60a763d0bad3f129da901f7461b506b763975af5 /src | |
| parent | c2fef14520cce933b7e4d23d8f269b92ca13860a (diff) | |
| download | external_wpa_supplicant_8_ti-e834272f732739bad2b0168dc0fe6422b045e4e5.zip external_wpa_supplicant_8_ti-e834272f732739bad2b0168dc0fe6422b045e4e5.tar.gz external_wpa_supplicant_8_ti-e834272f732739bad2b0168dc0fe6422b045e4e5.tar.bz2 | |
Include pending MFP defines in nl80211_copy.h
This can be used to get rid of the extra cpp define since we have our
local copy of wireless.h and nl80211.h.
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/nl80211_copy.h | 8 | ||||
| -rw-r--r-- | src/drivers/driver_wext.c | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/common/nl80211_copy.h b/src/common/nl80211_copy.h index e86ed59..ee742bc 100644 --- a/src/common/nl80211_copy.h +++ b/src/common/nl80211_copy.h @@ -72,8 +72,8 @@ * * @NL80211_CMD_GET_KEY: Get sequence counter information for a key specified * by %NL80211_ATTR_KEY_IDX and/or %NL80211_ATTR_MAC. - * @NL80211_CMD_SET_KEY: Set key attributes %NL80211_ATTR_KEY_DEFAULT or - * %NL80211_ATTR_KEY_THRESHOLD. + * @NL80211_CMD_SET_KEY: Set key attributes %NL80211_ATTR_KEY_DEFAULT, + * %NL80211_ATTR_KEY_DEFAULT_MGMT, or %NL80211_ATTR_KEY_THRESHOLD. * @NL80211_CMD_NEW_KEY: add a key with given %NL80211_ATTR_KEY_DATA, * %NL80211_ATTR_KEY_IDX, %NL80211_ATTR_MAC and %NL80211_ATTR_KEY_CIPHER * attributes. @@ -346,6 +346,8 @@ enum nl80211_attrs { NL80211_ATTR_WIPHY_FREQ, NL80211_ATTR_WIPHY_CHANNEL_TYPE, + NL80211_ATTR_KEY_DEFAULT_MGMT, + /* add attributes here, update the policy in nl80211.c */ __NL80211_ATTR_AFTER_LAST, @@ -412,12 +414,14 @@ enum nl80211_iftype { * @NL80211_STA_FLAG_SHORT_PREAMBLE: station is capable of receiving frames * with short barker preamble * @NL80211_STA_FLAG_WME: station is WME/QoS capable + * @NL80211_STA_FLAG_MFP: station uses management frame protection */ enum nl80211_sta_flags { __NL80211_STA_FLAG_INVALID, NL80211_STA_FLAG_AUTHORIZED, NL80211_STA_FLAG_SHORT_PREAMBLE, NL80211_STA_FLAG_WME, + NL80211_STA_FLAG_MFP, /* keep last */ __NL80211_STA_FLAG_AFTER_LAST, diff --git a/src/drivers/driver_wext.c b/src/drivers/driver_wext.c index 74135d6..2d98cdd 100644 --- a/src/drivers/driver_wext.c +++ b/src/drivers/driver_wext.c @@ -1726,13 +1726,11 @@ 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); @@ -2084,7 +2082,6 @@ 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: @@ -2100,7 +2097,6 @@ 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) |