|
@@ -233,8 +233,7 @@ static void rtusb_dataout_complete(unsigned long data)
|
|
|
FREE_HTTX_RING(pAd, BulkOutPipeId, pHTTXContext);
|
|
|
/*RTMP_IRQ_UNLOCK(&pAd->TxContextQueueLock[BulkOutPipeId], IrqFlags); */
|
|
|
|
|
|
- } else /* STATUS_OTHER */
|
|
|
- {
|
|
|
+ } else { /* STATUS_OTHER */
|
|
|
u8 *pBuf;
|
|
|
|
|
|
pAd->BulkOutCompleteOther++;
|
|
@@ -316,8 +315,7 @@ static void rtusb_null_frame_done_tasklet(unsigned long data)
|
|
|
RTMP_IRQ_UNLOCK(&pAd->BulkOutLock[0], irqFlag);
|
|
|
|
|
|
RTMPDeQueuePacket(pAd, FALSE, NUM_OF_TX_RING, MAX_TX_PROCESS);
|
|
|
- } else /* STATUS_OTHER */
|
|
|
- {
|
|
|
+ } else { /* STATUS_OTHER */
|
|
|
if ((!RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_RESET_IN_PROGRESS)) &&
|
|
|
(!RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_HALT_IN_PROGRESS)) &&
|
|
|
(!RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_NIC_NOT_EXIST)) &&
|
|
@@ -362,8 +360,7 @@ static void rtusb_rts_frame_done_tasklet(unsigned long data)
|
|
|
if (Status == USB_ST_NOERROR) {
|
|
|
RTMP_IRQ_UNLOCK(&pAd->BulkOutLock[0], irqFlag);
|
|
|
RTMPDeQueuePacket(pAd, FALSE, NUM_OF_TX_RING, MAX_TX_PROCESS);
|
|
|
- } else /* STATUS_OTHER */
|
|
|
- {
|
|
|
+ } else { /* STATUS_OTHER */
|
|
|
if ((!RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_RESET_IN_PROGRESS)) &&
|
|
|
(!RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_HALT_IN_PROGRESS)) &&
|
|
|
(!RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_NIC_NOT_EXIST)) &&
|
|
@@ -410,8 +407,7 @@ static void rtusb_pspoll_frame_done_tasklet(unsigned long data)
|
|
|
|
|
|
if (Status == USB_ST_NOERROR) {
|
|
|
RTMPDeQueuePacket(pAd, FALSE, NUM_OF_TX_RING, MAX_TX_PROCESS);
|
|
|
- } else /* STATUS_OTHER */
|
|
|
- {
|
|
|
+ } else { /* STATUS_OTHER */
|
|
|
if ((!RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_RESET_IN_PROGRESS)) &&
|
|
|
(!RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_HALT_IN_PROGRESS)) &&
|
|
|
(!RTMP_TEST_FLAG(pAd, fRTMP_ADAPTER_NIC_NOT_EXIST)) &&
|
|
@@ -473,14 +469,12 @@ static void rx_done_tasklet(unsigned long data)
|
|
|
if (Status == USB_ST_NOERROR) {
|
|
|
pAd->BulkInComplete++;
|
|
|
pAd->NextRxBulkInPosition = 0;
|
|
|
- if (pRxContext->BulkInOffset) /* As jan's comment, it may bulk-in success but size is zero. */
|
|
|
- {
|
|
|
+ if (pRxContext->BulkInOffset) { /* As jan's comment, it may bulk-in success but size is zero. */
|
|
|
pRxContext->Readable = TRUE;
|
|
|
INC_RING_INDEX(pAd->NextRxBulkInIndex, RX_RING_SIZE);
|
|
|
}
|
|
|
RTMP_IRQ_UNLOCK(&pAd->BulkInLock, IrqFlags);
|
|
|
- } else /* STATUS_OTHER */
|
|
|
- {
|
|
|
+ } else { /* STATUS_OTHER */
|
|
|
pAd->BulkInCompleteFail++;
|
|
|
/* Still read this packet although it may comtain wrong bytes. */
|
|
|
pRxContext->Readable = FALSE;
|
|
@@ -584,7 +578,7 @@ static void rtusb_mgmt_dma_done_tasklet(unsigned long data)
|
|
|
/* The protectioon of rest bulk should be in BulkOut routine */
|
|
|
if (pAd->MgmtRing.TxSwFreeIdx <
|
|
|
MGMT_RING_SIZE
|
|
|
- /* pMLMEContext->bWaitingBulkOut == TRUE */ ) {
|
|
|
+ /* pMLMEContext->bWaitingBulkOut == TRUE */) {
|
|
|
RTUSB_SET_BULK_FLAG(pAd, fRTUSB_BULK_OUT_MLME);
|
|
|
}
|
|
|
RTUSBKickBulkOut(pAd);
|