From: Jouni Malinen <jouni.malinen@atheros.com>
Date: Fri, 26 Nov 2010 15:39:31 +0000 (+0200)
Subject: nl80211: Fix NL80211_CMD_CONNECT with WPA/WPS networks
X-Git-Tag: hostap-1-bp~716
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce04af5a74fbb3c4d6aa11ec31fe839da5ff208b;p=thirdparty%2Fhostap.git

nl80211: Fix NL80211_CMD_CONNECT with WPA/WPS networks
---

diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
index f0e070471..f386fa213 100644
--- a/src/drivers/driver_nl80211.c
+++ b/src/drivers/driver_nl80211.c
@@ -2611,6 +2611,12 @@ static int nl80211_set_conn_keys(struct wpa_driver_associate_params *params,
 		privacy = 1;
 		break;
 	}
+	if (params->wps == WPS_MODE_PRIVACY)
+		privacy = 1;
+	if (params->pairwise_suite &&
+	    params->pairwise_suite != WPA_CIPHER_NONE)
+		privacy = 1;
+
 	if (!privacy)
 		return 0;