summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIrfan Sheriff <isheriff@google.com>2010-04-13 16:29:36 -0700
committerIrfan Sheriff <isheriff@google.com>2010-04-13 17:48:57 -0700
commit23f1bd9e9114d77087c7b8fafbcadf97de70c662 (patch)
tree87e30526aed449b3d84b896b948419b08f10b082
parent3bb9a92880f8cda8c242707ad02077f13b009632 (diff)
downloadwlan-23f1bd9e9114d77087c7b8fafbcadf97de70c662.tar.gz
Reset RSN and ciphers after disconnectandroid-sdk-tools_r6android-sdk-2.2_r1
Clean up RSN structure on disconnect; also cleanup unicast and broadcast flags on disconnect. This prevents RSN flags being filled up in association requests when switching networks that caused the problems. Bug: 2575704 Change-Id: I527d7644f801b294051b916926994a7a3fbaf770
-rw-r--r--wl1271/stad/src/Connection_Managment/rsn.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/wl1271/stad/src/Connection_Managment/rsn.c b/wl1271/stad/src/Connection_Managment/rsn.c
index ac18623..0222010 100644
--- a/wl1271/stad/src/Connection_Managment/rsn.c
+++ b/wl1271/stad/src/Connection_Managment/rsn.c
@@ -629,6 +629,9 @@ TI_STATUS rsn_stop (TI_HANDLE hRsn, TI_BOOL removeKeys)
if (removeKeys)
{ /* reset PMKID list if exist */
pRsn->pAdmCtrl->resetPmkidList (pRsn->pAdmCtrl);
+ /* reset unicast and broadcast ciphers after disconnect */
+ pRsn->pAdmCtrl->unicastSuite = TWD_CIPHER_NONE;
+ pRsn->pAdmCtrl->broadcastSuite = TWD_CIPHER_NONE;
}
return status;
@@ -2374,7 +2377,7 @@ TI_STATUS rsn_getGenInfoElement(rsn_t *pRsn, TI_UINT8 *out_buff, TI_UINT32 *out_
*/
void rsn_clearGenInfoElement(rsn_t *pRsn )
{
- /*pRsn->genericIE.length = 0; */
+ os_memoryZero(pRsn->hOs, &pRsn->genericIE, sizeof(pRsn->genericIE));
}