Commit d1d4120f authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman

staging: vt6656: lock changes: vRunCommand remove locks.

Removing atomic locked paths to usbpipe.c PIPEnsControlOut and PIPEnsControlIn

This function will nolonger need any locking.
Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7af94000
...@@ -286,8 +286,6 @@ void vRunCommand(struct work_struct *work) ...@@ -286,8 +286,6 @@ void vRunCommand(struct work_struct *work)
if (pDevice->bCmdRunning != true) if (pDevice->bCmdRunning != true)
return; return;
spin_lock_irq(&pDevice->lock);
switch (pDevice->eCommandState) { switch (pDevice->eCommandState) {
case WLAN_CMD_SCAN_START: case WLAN_CMD_SCAN_START:
...@@ -365,11 +363,9 @@ void vRunCommand(struct work_struct *work) ...@@ -365,11 +363,9 @@ void vRunCommand(struct work_struct *work)
if ((pMgmt->b11hEnable == false) || if ((pMgmt->b11hEnable == false) ||
(pMgmt->uScanChannel < CB_MAX_CHANNEL_24G)) { (pMgmt->uScanChannel < CB_MAX_CHANNEL_24G)) {
s_vProbeChannel(pDevice); s_vProbeChannel(pDevice);
spin_unlock_irq(&pDevice->lock);
vCommandTimerWait((void *) pDevice, 100); vCommandTimerWait((void *) pDevice, 100);
return; return;
} else { } else {
spin_unlock_irq(&pDevice->lock);
vCommandTimerWait((void *) pDevice, WCMD_PASSIVE_SCAN_TIME); vCommandTimerWait((void *) pDevice, WCMD_PASSIVE_SCAN_TIME);
return; return;
} }
...@@ -504,7 +500,6 @@ void vRunCommand(struct work_struct *work) ...@@ -504,7 +500,6 @@ void vRunCommand(struct work_struct *work)
pDevice->byLinkWaitCount = 0; pDevice->byLinkWaitCount = 0;
pDevice->eCommandState = WLAN_AUTHENTICATE_WAIT; pDevice->eCommandState = WLAN_AUTHENTICATE_WAIT;
vCommandTimerWait((void *) pDevice, AUTHENTICATE_TIMEOUT); vCommandTimerWait((void *) pDevice, AUTHENTICATE_TIMEOUT);
spin_unlock_irq(&pDevice->lock);
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" Set eCommandState = WLAN_AUTHENTICATE_WAIT\n"); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" Set eCommandState = WLAN_AUTHENTICATE_WAIT\n");
return; return;
} }
...@@ -578,7 +573,6 @@ void vRunCommand(struct work_struct *work) ...@@ -578,7 +573,6 @@ void vRunCommand(struct work_struct *work)
pDevice->byLinkWaitCount = 0; pDevice->byLinkWaitCount = 0;
pDevice->eCommandState = WLAN_ASSOCIATE_WAIT; pDevice->eCommandState = WLAN_ASSOCIATE_WAIT;
vCommandTimerWait((void *) pDevice, ASSOCIATE_TIMEOUT); vCommandTimerWait((void *) pDevice, ASSOCIATE_TIMEOUT);
spin_unlock_irq(&pDevice->lock);
return; return;
} }
} else if (pMgmt->eCurrState < WMAC_STATE_AUTHPENDING) { } else if (pMgmt->eCurrState < WMAC_STATE_AUTHPENDING) {
...@@ -587,7 +581,6 @@ void vRunCommand(struct work_struct *work) ...@@ -587,7 +581,6 @@ void vRunCommand(struct work_struct *work)
//mike add:wait another 2 sec if authenticated_frame delay! //mike add:wait another 2 sec if authenticated_frame delay!
pDevice->byLinkWaitCount++; pDevice->byLinkWaitCount++;
printk("WLAN_AUTHENTICATE_WAIT:wait %d times!!\n", pDevice->byLinkWaitCount); printk("WLAN_AUTHENTICATE_WAIT:wait %d times!!\n", pDevice->byLinkWaitCount);
spin_unlock_irq(&pDevice->lock);
vCommandTimerWait((void *) pDevice, AUTHENTICATE_TIMEOUT/2); vCommandTimerWait((void *) pDevice, AUTHENTICATE_TIMEOUT/2);
return; return;
} }
...@@ -622,7 +615,6 @@ void vRunCommand(struct work_struct *work) ...@@ -622,7 +615,6 @@ void vRunCommand(struct work_struct *work)
//mike add:wait another 2 sec if associated_frame delay! //mike add:wait another 2 sec if associated_frame delay!
pDevice->byLinkWaitCount++; pDevice->byLinkWaitCount++;
printk("WLAN_ASSOCIATE_WAIT:wait %d times!!\n", pDevice->byLinkWaitCount); printk("WLAN_ASSOCIATE_WAIT:wait %d times!!\n", pDevice->byLinkWaitCount);
spin_unlock_irq(&pDevice->lock);
vCommandTimerWait((void *) pDevice, ASSOCIATE_TIMEOUT/2); vCommandTimerWait((void *) pDevice, ASSOCIATE_TIMEOUT/2);
return; return;
} }
...@@ -752,9 +744,9 @@ void vRunCommand(struct work_struct *work) ...@@ -752,9 +744,9 @@ void vRunCommand(struct work_struct *work)
pDevice->byKeyIndex = 0; pDevice->byKeyIndex = 0;
pDevice->bTransmitKey = false; pDevice->bTransmitKey = false;
spin_unlock_irq(&pDevice->lock);
KeyvInitTable(pDevice, &pDevice->sKey); KeyvInitTable(pDevice, &pDevice->sKey);
spin_lock_irq(&pDevice->lock);
pMgmt->byCSSPK = KEY_CTL_NONE; pMgmt->byCSSPK = KEY_CTL_NONE;
pMgmt->byCSSGK = KEY_CTL_NONE; pMgmt->byCSSGK = KEY_CTL_NONE;
...@@ -882,7 +874,6 @@ void vRunCommand(struct work_struct *work) ...@@ -882,7 +874,6 @@ void vRunCommand(struct work_struct *work)
s_bCommandComplete(pDevice); s_bCommandComplete(pDevice);
spin_unlock_irq(&pDevice->lock);
return; return;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment