projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| d4cb193b GKH |
1 | From 4aa0abed3a2a11b7d71ad560c1a3e7631c5a31cd Mon Sep 17 00:00:00 2001 |
| 2 | From: Malcolm Priestley <tvboxspy@gmail.com> | |
| 3 | Date: Wed, 23 Jul 2014 21:35:12 +0100 | |
| 4 | Subject: staging: vt6655: Fix disassociated messages every 10 seconds | |
| 5 | ||
| 6 | From: Malcolm Priestley <tvboxspy@gmail.com> | |
| 7 | ||
| 8 | commit 4aa0abed3a2a11b7d71ad560c1a3e7631c5a31cd upstream. | |
| 9 | ||
| 10 | byReAssocCount is incremented every second resulting in | |
| 11 | disassociated message being send every 10 seconds whether | |
| 12 | connection or not. | |
| 13 | ||
| 14 | byReAssocCount should only advance while eCommandState | |
| 15 | is in WLAN_ASSOCIATE_WAIT | |
| 16 | ||
| 17 | Change existing scope to if condition. | |
| 18 | ||
| 19 | Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com> | |
| 20 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| 21 | ||
| 22 | --- | |
| 23 | drivers/staging/vt6655/bssdb.c | 2 +- | |
| 24 | 1 file changed, 1 insertion(+), 1 deletion(-) | |
| 25 | ||
| 26 | --- a/drivers/staging/vt6655/bssdb.c | |
| 27 | +++ b/drivers/staging/vt6655/bssdb.c | |
| 28 | @@ -983,7 +983,7 @@ start: | |
| 29 | pDevice->byERPFlag &= ~(WLAN_SET_ERP_USE_PROTECTION(1)); | |
| 30 | } | |
| 31 | ||
| 32 | - { | |
| 33 | + if (pDevice->eCommandState == WLAN_ASSOCIATE_WAIT) { | |
| 34 | pDevice->byReAssocCount++; | |
| 35 | /* 10 sec timeout */ | |
| 36 | if ((pDevice->byReAssocCount > 10) && (!pDevice->bLinkPass)) { |