diff options
| author | Sunil Dutt <usdutt@qti.qualcomm.com> | 2014-08-07 21:24:38 +0530 |
|---|---|---|
| committer | Linux Build Service Account <lnxbuild@localhost> | 2014-11-04 08:24:10 -0700 |
| commit | b93c01f35532e505fb42d58828ca8c24bb40c4ab (patch) | |
| tree | 53da63ee58dd6a5b7e7f4aa3db9dc794f13be178 | |
| parent | 7319406bfe508486ee09ce393673085ccbcec68c (diff) | |
| download | android_external_wpa_supplicant_8-b93c01f35532e505fb42d58828ca8c24bb40c4ab.tar.gz android_external_wpa_supplicant_8-b93c01f35532e505fb42d58828ca8c24bb40c4ab.tar.bz2 android_external_wpa_supplicant_8-b93c01f35532e505fb42d58828ca8c24bb40c4ab.zip | |
Revert "TDLS: Move AID=1 workaround into driver_nl80211.c"
Some drivers shall send a valid AID in TDLS Setup Request
which exceeds IEEE80211_MAX_AID and thus the ADD_STA
fails on the TDLS responder.Thus,revert the commit
f11b72c3e9ffa28cd7ba8ced160e43f8f6bf9fca to ensure that
AID as part of ADD_STA for TDLS is 1.
CRs-fixed: 705882
Change-Id: Ia18afe6cc9d03b72c565351e806c3d1d9b6c66eb
Signed-off-by: Sunil Dutt <usdutt@qti.qualcomm.com>
| -rw-r--r-- | src/drivers/driver_nl80211.c | 14 | ||||
| -rw-r--r-- | wpa_supplicant/wpas_glue.c | 2 |
2 files changed, 3 insertions, 13 deletions
diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c index 8ebf7d9c..13ff6d81 100644 --- a/src/drivers/driver_nl80211.c +++ b/src/drivers/driver_nl80211.c @@ -7580,18 +7580,8 @@ static int wpa_driver_nl80211_sta_add(void *priv, wpa_hexdump(MSG_DEBUG, " * supported rates", params->supp_rates, params->supp_rates_len); if (!params->set) { - if (params->aid) { - wpa_printf(MSG_DEBUG, " * aid=%u", params->aid); - NLA_PUT_U16(msg, NL80211_ATTR_STA_AID, params->aid); - } else { - /* - * cfg80211 validates that AID is non-zero, so we have - * to make this a non-zero value for the TDLS case where - * a dummy STA entry is used for now. - */ - wpa_printf(MSG_DEBUG, " * aid=1 (TDLS workaround)"); - NLA_PUT_U16(msg, NL80211_ATTR_STA_AID, 1); - } + wpa_printf(MSG_DEBUG, " * aid=%u", params->aid); + NLA_PUT_U16(msg, NL80211_ATTR_STA_AID, params->aid); wpa_printf(MSG_DEBUG, " * listen_interval=%u", params->listen_interval); NLA_PUT_U16(msg, NL80211_ATTR_STA_LISTEN_INTERVAL, diff --git a/wpa_supplicant/wpas_glue.c b/wpa_supplicant/wpas_glue.c index 350b1229..e1e0b786 100644 --- a/wpa_supplicant/wpas_glue.c +++ b/wpa_supplicant/wpas_glue.c @@ -592,7 +592,7 @@ static int wpa_supplicant_tdls_peer_addset( os_memset(¶ms, 0, sizeof(params)); params.addr = peer; - params.aid = aid; + params.aid = aid ? 1 : aid; params.capability = capability; params.flags = WPA_STA_TDLS_PEER | WPA_STA_AUTHORIZED; |