Merge branch 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / drivers / staging / rtl8192u / r819xU_cmdpkt.c

diff --git a/drivers/staging/rtl8192u/r819xU_cmdpkt.c b/drivers/staging/rtl8192u/r819xU_cmdpkt.c
index fbd5f4b9374fb662bedf3c13a08e78aace1ce31f..6810766edfcf19fa9f8d5578c1ae229536f9fdae 100644 (file)
--- a/drivers/staging/rtl8192u/r819xU_cmdpkt.c
+++ b/drivers/staging/rtl8192u/r819xU_cmdpkt.c
@@ -66,7 +66,7 @@ SendTxCommandPacket(
        memcpy(ptr_buf,pData,DataLen);
        tcb_desc->txbuf_size= (u16)DataLen;
 
-       if(!priv->ieee80211->check_nic_enough_desc(dev,tcb_desc->queue_index)||
+       if (!priv->ieee80211->check_nic_enough_desc(dev,tcb_desc->queue_index)||
                        (!skb_queue_empty(&priv->ieee80211->skb_waitQ[tcb_desc->queue_index]))||\
                        (priv->ieee80211->queue_stop) ) {
                        RT_TRACE(COMP_FIRMWARE,"===================NULL packet==================================> tx full!\n");
@@ -126,7 +126,7 @@ SendTxCommandPacket(
        //Fragmentation might be required
        frag_threshold = pfirmware->cmdpacket_frag_thresold;
        do {
-               if((buffer_len - frag_offset) > frag_threshold) {
+               if ((buffer_len - frag_offset) > frag_threshold) {
                        frag_length = frag_threshold ;
                        bLastIniPkt = 0;
 
@@ -163,7 +163,7 @@ SendTxCommandPacket(
                tcb_desc->txbuf_size= (u16)buffer_len;
 
 
-               if(!priv->ieee80211->check_nic_enough_desc(dev,tcb_desc->queue_index)||
+               if (!priv->ieee80211->check_nic_enough_desc(dev,tcb_desc->queue_index)||
                        (!skb_queue_empty(&priv->ieee80211->skb_waitQ[tcb_desc->queue_index]))||\
                        (priv->ieee80211->queue_stop) ) {
                        RT_TRACE(COMP_FIRMWARE,"=====================================================> tx full!\n");
@@ -221,7 +221,7 @@ cmpk_count_txstatistic(
 #endif
 
 #ifdef TODO
-       if(pAdapter->bInHctTest)
+       if (pAdapter->bInHctTest)
                return;
 #endif
        /* We can not know the packet length and transmit type: broadcast or uni
@@ -341,7 +341,7 @@ cmdpkt_beacontimerinterrupt_819xusb(
                //
                // 070117, rcnjko: 87B have to S/W beacon for DTM encryption_cmn.
                //
-               if(priv->ieee80211->current_network.mode == IEEE_A  ||
+               if (priv->ieee80211->current_network.mode == IEEE_A  ||
                        priv->ieee80211->current_network.mode == IEEE_N_5G ||
                        (priv->ieee80211->current_network.mode == IEEE_N_24G  && (!priv->ieee80211->pHTInfo->bCurSuppCCK)))
                {
@@ -411,7 +411,7 @@ cmpk_handle_interrupt_status(
 
 
        // Statistics of beacon for ad-hoc mode.
-       if(     priv->ieee80211->iw_mode == IW_MODE_ADHOC)
+       if (    priv->ieee80211->iw_mode == IW_MODE_ADHOC)
        {
                //2 maybe need endian transform?
                rx_intr_status.interrupt_status = *((u32 *)(pmsg + 4));
@@ -727,12 +727,12 @@ cmpk_message_handle_rx(
              element type. Because FW may aggregate RX command packet to minimize
              transmit time between DRV and FW.*/
        // Add a counter to prevent the lock in the loop from being held too long
-       while (total_length > 0 || exe_cnt++ >100)
+       while (total_length > 0 && exe_cnt++ < 100)
        {
                /* 2007/01/17 MH We support aggregation of different cmd in the same packet. */
                element_id = pcmd_buff[0];
 
-               switch(element_id)
+               switch (element_id)
                {
                        case RX_TX_FEEDBACK:
                                cmpk_handle_tx_feedback (dev, pcmd_buff);