diff options
| author | Jouni Malinen <jouni@qca.qualcomm.com> | 2012-02-17 11:34:56 +0200 |
|---|---|---|
| committer | Jouni Malinen <j@w1.fi> | 2012-02-17 11:34:56 +0200 |
| commit | b8a8d6774bf045f72d76fb4ac3dd557c4ee9f369 (patch) | |
| tree | 0bca8a1e7071f20e53dc84c5b274fbece68f3e4a | |
| parent | 0047c047fc8bae4a78f48bc687011acc093d9680 (diff) | |
| download | external_wpa_supplicant_8_ti-b8a8d6774bf045f72d76fb4ac3dd557c4ee9f369.zip external_wpa_supplicant_8_ti-b8a8d6774bf045f72d76fb4ac3dd557c4ee9f369.tar.gz external_wpa_supplicant_8_ti-b8a8d6774bf045f72d76fb4ac3dd557c4ee9f369.tar.bz2 | |
P2P: Do not include P2P IE in association request to non-P2P AP
This was previously fixed for most cases in commit
ffad8858370e297b22ff5d9e6e36372755364ec0, but the check here for
drivers that implement SME/MLME was missed in that commit.
This removes the P2P IE from (Re)Association Request frame with
drivers that do not use wpa_supplicant SME implementation and are
P2P cabable when associating with a non-P2P AP (i.e., not a GO or
P2P WLAN manager AP).
Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
intended-for: hostap-1
| -rw-r--r-- | wpa_supplicant/wpa_supplicant.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/wpa_supplicant/wpa_supplicant.c b/wpa_supplicant/wpa_supplicant.c index b58e2fd..caf9099 100644 --- a/wpa_supplicant/wpa_supplicant.c +++ b/wpa_supplicant/wpa_supplicant.c @@ -1248,11 +1248,10 @@ void wpa_supplicant_associate(struct wpa_supplicant *wpa_s, u8 *pos; size_t len; int res; - int p2p_group; - p2p_group = wpa_s->drv_flags & WPA_DRIVER_FLAGS_P2P_CAPABLE; pos = wpa_ie + wpa_ie_len; len = sizeof(wpa_ie) - wpa_ie_len; - res = wpas_p2p_assoc_req_ie(wpa_s, bss, pos, len, p2p_group); + res = wpas_p2p_assoc_req_ie(wpa_s, bss, pos, len, + ssid->p2p_group); if (res >= 0) wpa_ie_len += res; } |