diff options
| author | Jouni Malinen <jouni@qca.qualcomm.com> | 2011-08-09 13:59:43 +0300 |
|---|---|---|
| committer | Jouni Malinen <j@w1.fi> | 2011-08-09 13:59:43 +0300 |
| commit | a381f2a2868047475e8d64c2d6bbae6ee03e1786 (patch) | |
| tree | e332d1abc52310f54a50e79243a0aba7d14c0fc6 | |
| parent | a05225c8196e7f38b99b587705cc21b8bf5339da (diff) | |
| download | external_wpa_supplicant_8_ti-a381f2a2868047475e8d64c2d6bbae6ee03e1786.zip external_wpa_supplicant_8_ti-a381f2a2868047475e8d64c2d6bbae6ee03e1786.tar.gz external_wpa_supplicant_8_ti-a381f2a2868047475e8d64c2d6bbae6ee03e1786.tar.bz2 | |
nl80211: Fix connect command to not claim WPA if WPS is used
Such using params->wpa_ie to figure out whether the connection is for
WPA/WPA2 is not correct since that buffer is used also to add WPS IE. In
case of WPS, do not add NL80211_ATTR_WPA_VERSIONS to avoid confusing
drivers.
| -rw-r--r-- | src/drivers/driver_nl80211.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c index 41b718d..42551c3 100644 --- a/src/drivers/driver_nl80211.c +++ b/src/drivers/driver_nl80211.c @@ -4801,7 +4801,8 @@ static int wpa_driver_nl80211_connect( NLA_PUT_U32(msg, NL80211_ATTR_AUTH_TYPE, type); skip_auth_type: - if (params->wpa_ie && params->wpa_ie_len) { + if (params->wpa_ie && params->wpa_ie_len && + params->key_mgmt_suite != KEY_MGMT_WPS) { enum nl80211_wpa_versions ver; if (params->wpa_ie[0] == WLAN_EID_RSN) |