diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2012-08-24 17:03:35 -0700 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2012-08-24 17:03:35 -0700 |
| commit | ad266fb3da6083126e7619e525153839b918aa44 (patch) | |
| tree | 13d6cfbb2e8bea428c4c96cc3cd7063689fdad9d /src | |
| parent | f48e4f901d4b39a4e03210fe0154cdb11112e22e (diff) | |
| download | external_wpa_supplicant_8-ad266fb3da6083126e7619e525153839b918aa44.zip external_wpa_supplicant_8-ad266fb3da6083126e7619e525153839b918aa44.tar.gz external_wpa_supplicant_8-ad266fb3da6083126e7619e525153839b918aa44.tar.bz2 | |
wpa_supplicant: Update to BRCM version 0.8.0-37
- Allow AP_SME support
- Do not send disassoc after EAP failure since AP_SME is enabled
and del_station will be called
- Allow group idle timeout to run during WPS disconnect
Change-Id: I7e9e15b9c44804196bc98c01d51a71e24412b91d
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/ap/ieee802_1x.c | 5 | ||||
| -rw-r--r-- | src/drivers/driver_nl80211.c | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/ap/ieee802_1x.c b/src/ap/ieee802_1x.c index dd0df1d..9bbd1ff 100644 --- a/src/ap/ieee802_1x.c +++ b/src/ap/ieee802_1x.c @@ -2193,7 +2193,12 @@ static void ieee802_1x_finished(struct hostapd_data *hapd, * driver reorder operations. */ os_sleep(0, 10000); +#ifndef ANDROID_P2P + /* We need not do this for driver. For AP-SME flags if we send this disassoc, + * the p2p_client is gettig disassoc after it has completed the assoc + */ ap_sta_disconnect(hapd, sta, sta->addr, WLAN_REASON_IEEE_802_1X_AUTH_FAILED); +#endif } } diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c index e099a67..b9503f1 100644 --- a/src/drivers/driver_nl80211.c +++ b/src/drivers/driver_nl80211.c @@ -2566,9 +2566,8 @@ broken_combination: WPA_DRIVER_FLAGS_TDLS_EXTERNAL_SETUP; } } -#ifndef ANDROID_P2P + if (tb[NL80211_ATTR_DEVICE_AP_SME]) -#endif info->device_ap_sme = 1; if (tb[NL80211_ATTR_FEATURE_FLAGS]) { @@ -2646,9 +2645,8 @@ static int wpa_driver_nl80211_capa(struct wpa_driver_nl80211_data *drv) drv->capa.flags |= WPA_DRIVER_FLAGS_SANE_ERROR_CODES; drv->capa.flags |= WPA_DRIVER_FLAGS_SET_KEYS_AFTER_ASSOC_DONE; drv->capa.flags |= WPA_DRIVER_FLAGS_EAPOL_TX_STATUS; -#ifndef ANDROID_P2P + if (!info.device_ap_sme) -#endif drv->capa.flags |= WPA_DRIVER_FLAGS_DEAUTH_TX_STATUS; drv->device_ap_sme = info.device_ap_sme; |