diff options
| author | Malcolm Priestley <tvboxspy@gmail.com> | 2014-05-15 22:49:18 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-05-15 15:02:19 -0700 |
| commit | 97641ca2b284ddc9870afdcfe22487702ee27b3e (patch) | |
| tree | 88715171eccacc141710bb430782422ce5e0dcdf /drivers | |
| parent | 8783a1a4afa4e14cf134afc7838b23fcd745b996 (diff) | |
staging: vt6656: lock changes: vRunCommand nsDMA_tx_packet
vRunCommand is nolonger atomic add lock for nsDMA_tx_packet.
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/staging/vt6656/wcmd.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/staging/vt6656/wcmd.c b/drivers/staging/vt6656/wcmd.c index d51cc90047f..66d59d51bf8 100644 --- a/drivers/staging/vt6656/wcmd.c +++ b/drivers/staging/vt6656/wcmd.c @@ -279,6 +279,7 @@ void vRunCommand(struct work_struct *work) int ii; u8 byMask[8] = {1, 2, 4, 8, 0x10, 0x20, 0x40, 0x80}; u8 byData; + unsigned long flags; if (pDevice->Flags & fMP_DISCONNECTED) return; @@ -667,9 +668,13 @@ void vRunCommand(struct work_struct *work) pDevice->bMoreData = true; } + spin_lock_irqsave(&pDevice->lock, flags); + if (nsDMA_tx_packet(pDevice, skb) != 0) DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Multicast ps tx fail\n"); + spin_unlock_irqrestore(&pDevice->lock, flags); + pMgmt->sNodeDBTable[0].wEnQueueCnt--; } } @@ -690,9 +695,13 @@ void vRunCommand(struct work_struct *work) pDevice->bMoreData = true; } + spin_lock_irqsave(&pDevice->lock, flags); + if (nsDMA_tx_packet(pDevice, skb) != 0) DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "sta ps tx fail\n"); + spin_unlock_irqrestore(&pDevice->lock, flags); + pMgmt->sNodeDBTable[ii].wEnQueueCnt--; // check if sta ps enable, wait next pspoll // if sta ps disable, send all pending buffers. |