summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMalcolm Priestley <tvboxspy@gmail.com>2014-07-23 21:35:12 +0100
committerJiri Slaby <jslaby@suse.cz>2014-08-19 14:23:35 +0200
commit0a5d8d71f528efeeffa3415fb61846e6f18541ae (patch)
treecf65f9cc0d570a6543081a62cd25fc16875177f2
parent5f24f2a63160e8bc5f12bc2d786048d5ce2f49cb (diff)
downloadlwn-0a5d8d71f528efeeffa3415fb61846e6f18541ae.tar.gz
lwn-0a5d8d71f528efeeffa3415fb61846e6f18541ae.zip
staging: vt6655: Fix disassociated messages every 10 seconds
commit 4aa0abed3a2a11b7d71ad560c1a3e7631c5a31cd upstream. byReAssocCount is incremented every second resulting in disassociated message being send every 10 seconds whether connection or not. byReAssocCount should only advance while eCommandState is in WLAN_ASSOCIATE_WAIT Change existing scope to if condition. Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> Signed-off-by: Jiri Slaby <jslaby@suse.cz>
-rw-r--r--drivers/staging/vt6655/bssdb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/vt6655/bssdb.c b/drivers/staging/vt6655/bssdb.c
index f983915168b7..3496a77612ba 100644
--- a/drivers/staging/vt6655/bssdb.c
+++ b/drivers/staging/vt6655/bssdb.c
@@ -1026,7 +1026,7 @@ start:
pDevice->byERPFlag &= ~(WLAN_SET_ERP_USE_PROTECTION(1));
}
- {
+ if (pDevice->eCommandState == WLAN_ASSOCIATE_WAIT) {
pDevice->byReAssocCount++;
if ((pDevice->byReAssocCount > 10) && (pDevice->bLinkPass != true)) { //10 sec timeout
printk("Re-association timeout!!!\n");