If a driver advertises 4-way handshake offload support for 802.1X, it may reject the NL80211_CMD_CONNECT when NL80211_ATTR_WANT_1X_4WAY_HS attribute flag is not present. This patch includes the attribute flag in NL80211_CMD_CONNECT for the offload. Signed-off-by: Chung-Hsien Hsu <stanley.hsu@xxxxxxxxxxx> --- src/drivers/driver_nl80211.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c index 39a02d3ee51f..8699efd1ba51 100644 --- a/src/drivers/driver_nl80211.c +++ b/src/drivers/driver_nl80211.c @@ -5405,11 +5405,15 @@ static int nl80211_connect_common(struct wpa_driver_nl80211_data *drv, return -1; } - /* Add PSK in case of 4-way handshake offload */ - if (params->psk && - (drv->capa.flags & WPA_DRIVER_FLAGS_4WAY_HANDSHAKE)) { - wpa_hexdump_key(MSG_DEBUG, " * PSK", params->psk, 32); - if (nla_put(msg, NL80211_ATTR_PMK, 32, params->psk)) + if (drv->capa.flags & WPA_DRIVER_FLAGS_4WAY_HANDSHAKE) { + /* Add PSK in case of 4-way handshake offload */ + if (params->psk) { + wpa_hexdump_key(MSG_DEBUG, " * PSK", params->psk, 32); + if (nla_put(msg, NL80211_ATTR_PMK, 32, params->psk)) + return -1; + } + if (wpa_key_mgmt_wpa_ieee8021x(params->key_mgmt_suite) && + nla_put_flag(msg, NL80211_ATTR_WANT_1X_4WAY_HS)) return -1; } -- 2.1.0 _______________________________________________ Hostap mailing list Hostap@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/hostap