staging: vt6655: Fix disassociated messages every 10 seconds

Malcolm Priestley · gregkh · commit 4aa0abed3a2a · 2014-07-24T15:10:42.000-07:00
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 &lt;tvboxspy@gmail.com&gt;
Cc: &lt;stable@vger.kernel.org&gt;
Signed-off-by: Greg Kroah-Hartman &lt;gregkh@linuxfoundation.org&gt;
diff --git a/drivers/staging/vt6655/bssdb.c b/drivers/staging/vt6655/bssdb.c
@@ -981,7 +981,7 @@ BSSvSecondCallBack(
 		pDevice->byERPFlag &= ~(WLAN_SET_ERP_USE_PROTECTION(1));
 	}
 
-	{
+	if (pDevice->eCommandState == WLAN_ASSOCIATE_WAIT) {
 		pDevice->byReAssocCount++;
 		/* 10 sec timeout */
 		if ((pDevice->byReAssocCount > 10) && (!pDevice->bLinkPass)) {

Original file line number	Diff line number	Diff line change
`@@ -981,7 +981,7 @@ BSSvSecondCallBack(`
`981`	`981`	`pDevice->byERPFlag &= ~(WLAN_SET_ERP_USE_PROTECTION(1));`
`982`	`982`	`}`
`983`	`983`
`984`		`- {`
	`984`	`+ if (pDevice->eCommandState == WLAN_ASSOCIATE_WAIT) {`
`985`	`985`	`pDevice->byReAssocCount++;`
`986`	`986`	`/* 10 sec timeout */`
`987`	`987`	`if ((pDevice->byReAssocCount > 10) && (!pDevice->bLinkPass)) {`