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 b755eb46341fd519205d42eb96df3dd702e7bb8b..6810766edfcf19fa9f8d5578c1ae229536f9fdae 100644 (file)
--- a/drivers/staging/rtl8192u/r819xU_cmdpkt.c
+++ b/drivers/staging/rtl8192u/r819xU_cmdpkt.c
@@ -41,7 +41,7 @@
 rt_status
 SendTxCommandPacket(
        struct net_device *dev,
-       void*                   pData,
+       void                    *pData,
        u32                             DataLen
        )
 {
@@ -57,7 +57,7 @@ SendTxCommandPacket(
        //Get TCB and local buffer from common pool. (It is shared by CmdQ, MgntQ, and USB coalesce DataQ)
        skb  = dev_alloc_skb(USB_HWDESC_HEADER_LEN + DataLen + 4);
        memcpy((unsigned char *)(skb->cb),&dev,sizeof(dev));
-       tcb_desc = (cb_desc*)(skb->cb + MAX_DEV_ADDR_SIZE);
+       tcb_desc = (cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);
        tcb_desc->queue_index = TXCMD_QUEUE;
        tcb_desc->bCmdOrInit = DESC_PACKET_TYPE_NORMAL;
        tcb_desc->bLastIniPkt = 0;
@@ -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");
@@ -101,7 +101,7 @@ SendTxCommandPacket(
  *---------------------------------------------------------------------------*/
  extern        rt_status       cmpk_message_handle_tx(
        struct net_device *dev,
-       u8*     codevirtualaddress,
+       u8      *codevirtualaddress,
        u32     packettype,
        u32     buffer_len)
 {
@@ -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;
 
@@ -145,7 +145,7 @@ SendTxCommandPacket(
                skb  = dev_alloc_skb(frag_length + 4);
                #endif
                memcpy((unsigned char *)(skb->cb),&dev,sizeof(dev));
-               tcb_desc = (cb_desc*)(skb->cb + MAX_DEV_ADDR_SIZE);
+               tcb_desc = (cb_desc *)(skb->cb + MAX_DEV_ADDR_SIZE);
                tcb_desc->queue_index = TXCMD_QUEUE;
                tcb_desc->bCmdOrInit = packettype;
                tcb_desc->bLastIniPkt = bLastIniPkt;
@@ -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
@@ -303,7 +303,7 @@ cmpk_count_txstatistic(
 static void
 cmpk_handle_tx_feedback(
        struct net_device *dev,
-       u8      *       pmsg)
+       u8      *pmsg)
 {
        struct r8192_priv *priv = ieee80211_priv(dev);
        cmpk_txfb_t             rx_tx_fb;       /* */
@@ -319,7 +319,7 @@ cmpk_handle_tx_feedback(
           endian type before copy the message copy. */
        /* 2007/07/05 MH Use pointer to transfer structure memory. */
        //memcpy((UINT8 *)&rx_tx_fb, pMsg, sizeof(CMPK_TXFB_T));
-       memcpy((u8*)&rx_tx_fb, pmsg, sizeof(cmpk_txfb_t));
+       memcpy((u8 *)&rx_tx_fb, pmsg, sizeof(cmpk_txfb_t));
        /* 2. Use tx feedback info to count TX statistics. */
        cmpk_count_txstatistic(dev, &rx_tx_fb);
        /* 2007/01/17 MH Comment previous method for TX statistic function. */
@@ -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)))
                {
@@ -386,7 +386,7 @@ cmdpkt_beacontimerinterrupt_819xusb(
 static void
 cmpk_handle_interrupt_status(
        struct net_device *dev,
-       u8*     pmsg)
+       u8      *pmsg)
 {
        cmpk_intr_sta_t         rx_intr_status; /* */
        struct r8192_priv *priv = ieee80211_priv(dev);
@@ -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));
@@ -467,7 +467,7 @@ cmpk_handle_interrupt_status(
 static void
 cmpk_handle_query_config_rx(
        struct net_device *dev,
-       u8*        pmsg)
+       u8         *pmsg)
 {
        cmpk_query_cfg_t        rx_query_cfg;   /* */
 
@@ -580,11 +580,11 @@ static    void    cmpk_count_tx_status(   struct net_device *dev,
 static void
 cmpk_handle_tx_status(
        struct net_device *dev,
-       u8*        pmsg)
+       u8         *pmsg)
 {
        cmpk_tx_status_t        rx_tx_sts;      /* */
 
-       memcpy((void*)&rx_tx_sts, (void*)pmsg, sizeof(cmpk_tx_status_t));
+       memcpy((void *)&rx_tx_sts, (void *)pmsg, sizeof(cmpk_tx_status_t));
        /* 2. Use tx feedback info to count TX statistics. */
        cmpk_count_tx_status(dev, &rx_tx_sts);
 
@@ -610,7 +610,7 @@ cmpk_handle_tx_status(
 static void
 cmpk_handle_tx_rate_history(
        struct net_device *dev,
-       u8*        pmsg)
+       u8         *pmsg)
 {
        cmpk_tx_rahis_t *ptxrate;
 //     RT_RF_POWER_STATE       rtState;
@@ -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);