staging: rtl8192e: Cleanup checkpatch -f warnings and errors - Part II
authorLarry Finger <Larry.Finger@lwfinger.net>
Mon, 1 Aug 2011 22:59:24 +0000 (17:59 -0500)
committerLarry Finger <Larry.Finger@lwfinger.net>
Thu, 25 Aug 2011 05:42:09 +0000 (00:42 -0500)
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
drivers/staging/rtl8192e/r8192E_dev.c

index aaba5586dbef248c761a39ee29a3d8bad2a6d0ce..229d6df789fdd1eaf3f37422c65774a83a8f6f7d 100644 (file)
@@ -37,8 +37,8 @@ void rtl8192e_start_beacon(struct net_device *dev)
        struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
        struct rtllib_network *net = &priv->rtllib->current_network;
        u16 BcnTimeCfg = 0;
-        u16 BcnCW = 6;
-        u16 BcnIFS = 0xf;
+       u16 BcnCW = 6;
+       u16 BcnIFS = 0xf;
 
        DMESG("Enabling beacon TX");
        rtl8192_irq_disable(dev);
@@ -63,7 +63,7 @@ void rtl8192e_update_msr(struct net_device *dev)
        u8 msr;
        enum led_ctl_mode LedAction = LED_CTL_NO_LINK;
        msr  = read_nic_byte(dev, MSR);
-       msr &= ~ MSR_LINK_MASK;
+       msr &= ~MSR_LINK_MASK;
 
        switch (priv->rtllib->iw_mode) {
        case IW_MODE_INFRA:
@@ -94,250 +94,246 @@ void rtl8192e_update_msr(struct net_device *dev)
                priv->rtllib->LedControlHandler(dev, LedAction);
 }
 
-void
-rtl8192e_SetHwReg(struct net_device *dev,u8 variable,u8* val)
+void rtl8192e_SetHwReg(struct net_device *dev, u8 variable, u8 *val)
 {
-       struct r8192_priv * priv = rtllib_priv(dev);
-
-       switch (variable)
-       {
+       struct r8192_priv *priv = rtllib_priv(dev);
 
-               case HW_VAR_BSSID:
-                       write_nic_dword(dev, BSSIDR, ((u32*)(val))[0]);
-                       write_nic_word(dev, BSSIDR+2, ((u16*)(val+2))[0]);
+       switch (variable) {
+       case HW_VAR_BSSID:
+               write_nic_dword(dev, BSSIDR, ((u32 *)(val))[0]);
+               write_nic_word(dev, BSSIDR+2, ((u16 *)(val+2))[0]);
                break;
 
-               case HW_VAR_MEDIA_STATUS:
-               {
-                       enum rt_op_mode OpMode = *((enum rt_op_mode *)(val));
-                       enum led_ctl_mode LedAction = LED_CTL_NO_LINK;
-                       u8              btMsr = read_nic_byte(dev, MSR);
+       case HW_VAR_MEDIA_STATUS:
+       {
+               enum rt_op_mode OpMode = *((enum rt_op_mode *)(val));
+               enum led_ctl_mode LedAction = LED_CTL_NO_LINK;
+               u8              btMsr = read_nic_byte(dev, MSR);
 
-                       btMsr &= 0xfc;
+               btMsr &= 0xfc;
 
-                       switch (OpMode)
-                       {
-                       case RT_OP_MODE_INFRASTRUCTURE:
-                               btMsr |= MSR_INFRA;
-                               LedAction = LED_CTL_LINK;
-                               break;
+               switch (OpMode) {
+               case RT_OP_MODE_INFRASTRUCTURE:
+                       btMsr |= MSR_INFRA;
+                       LedAction = LED_CTL_LINK;
+                       break;
 
-                       case RT_OP_MODE_IBSS:
-                               btMsr |= MSR_ADHOC;
-                               break;
+               case RT_OP_MODE_IBSS:
+                       btMsr |= MSR_ADHOC;
+                       break;
 
-                       case RT_OP_MODE_AP:
-                               btMsr |= MSR_AP;
-                               LedAction = LED_CTL_LINK;
-                               break;
+               case RT_OP_MODE_AP:
+                       btMsr |= MSR_AP;
+                       LedAction = LED_CTL_LINK;
+                       break;
 
-                       default:
-                               btMsr |= MSR_NOLINK;
-                               break;
-                       }
+               default:
+                       btMsr |= MSR_NOLINK;
+                       break;
+               }
 
-                       write_nic_byte(dev, MSR, btMsr);
+               write_nic_byte(dev, MSR, btMsr);
 
-               }
-               break;
+       }
+       break;
 
-               case HW_VAR_CECHK_BSSID:
-               {
-                       u32     RegRCR, Type;
+       case HW_VAR_CECHK_BSSID:
+       {
+               u32     RegRCR, Type;
 
-                       Type = ((u8*)(val))[0];
-                       RegRCR = read_nic_dword(dev,RCR);
-                       priv->ReceiveConfig = RegRCR;
+               Type = ((u8 *)(val))[0];
+               RegRCR = read_nic_dword(dev, RCR);
+               priv->ReceiveConfig = RegRCR;
 
-                       if (Type == true)
-                               RegRCR |= (RCR_CBSSID);
-                       else if (Type == false)
-                               RegRCR &= (~RCR_CBSSID);
+               if (Type == true)
+                       RegRCR |= (RCR_CBSSID);
+               else if (Type == false)
+                       RegRCR &= (~RCR_CBSSID);
 
-                       write_nic_dword(dev, RCR,RegRCR);
-                       priv->ReceiveConfig = RegRCR;
+               write_nic_dword(dev, RCR, RegRCR);
+               priv->ReceiveConfig = RegRCR;
 
-               }
-               break;
+       }
+       break;
 
-               case HW_VAR_SLOT_TIME:
-               {
+       case HW_VAR_SLOT_TIME:
 
-                       priv->slot_time = val[0];
-                       write_nic_byte(dev, SLOT_TIME, val[0]);
+               priv->slot_time = val[0];
+               write_nic_byte(dev, SLOT_TIME, val[0]);
 
-               }
                break;
 
-               case HW_VAR_ACK_PREAMBLE:
-               {
-                       u32 regTmp = 0;
-                       priv->short_preamble = (bool)(*(u8*)val );
-                       regTmp = priv->basic_rate;
-                       if (priv->short_preamble)
-                               regTmp |= BRSR_AckShortPmb;
-                       write_nic_dword(dev, RRSR, regTmp);
-               }
+       case HW_VAR_ACK_PREAMBLE:
+       {
+               u32 regTmp;
+               priv->short_preamble = (bool)(*(u8 *)val);
+               regTmp = priv->basic_rate;
+               if (priv->short_preamble)
+                       regTmp |= BRSR_AckShortPmb;
+               write_nic_dword(dev, RRSR, regTmp);
                break;
+       }
 
-               case HW_VAR_CPU_RST:
-                       write_nic_dword(dev, CPU_GEN, ((u32*)(val))[0]);
+       case HW_VAR_CPU_RST:
+               write_nic_dword(dev, CPU_GEN, ((u32 *)(val))[0]);
                break;
 
-               case HW_VAR_AC_PARAM:
-               {
-                       u8      pAcParam = *((u8*)val);
-                       u32     eACI = pAcParam;
-                       u8              u1bAIFS;
-                       u32             u4bAcParam;
-                       u8 mode = priv->rtllib->mode;
-                       struct rtllib_qos_parameters *qos_parameters = &priv->rtllib->current_network.qos_data.parameters;
-
+       case HW_VAR_AC_PARAM:
+       {
+               u8      pAcParam = *((u8 *)val);
+               u32     eACI = pAcParam;
+               u8              u1bAIFS;
+               u32             u4bAcParam;
+               u8 mode = priv->rtllib->mode;
+               struct rtllib_qos_parameters *qos_parameters =
+                        &priv->rtllib->current_network.qos_data.parameters;
+
+               u1bAIFS = qos_parameters->aifs[pAcParam] *
+                         ((mode&(IEEE_G|IEEE_N_24G)) ? 9 : 20) + aSifsTime;
+
+               dm_init_edca_turbo(dev);
+
+               u4bAcParam = ((((u32)(qos_parameters->tx_op_limit[pAcParam])) <<
+                            AC_PARAM_TXOP_LIMIT_OFFSET) |
+                            (((u32)(qos_parameters->cw_max[pAcParam])) <<
+                            AC_PARAM_ECW_MAX_OFFSET) |
+                            (((u32)(qos_parameters->cw_min[pAcParam])) <<
+                            AC_PARAM_ECW_MIN_OFFSET) |
+                            (((u32)u1bAIFS) << AC_PARAM_AIFS_OFFSET));
+
+               RT_TRACE(COMP_DBG, "%s():HW_VAR_AC_PARAM eACI:%x:%x\n",
+                        __func__, eACI, u4bAcParam);
+               switch (eACI) {
+               case AC1_BK:
+                       write_nic_dword(dev, EDCAPARA_BK, u4bAcParam);
+                       break;
 
-                       u1bAIFS = qos_parameters->aifs[pAcParam] * ((mode&(IEEE_G|IEEE_N_24G)) ?9:20) + aSifsTime;
+               case AC0_BE:
+                       write_nic_dword(dev, EDCAPARA_BE, u4bAcParam);
+                       break;
 
-                       dm_init_edca_turbo(dev);
+               case AC2_VI:
+                       write_nic_dword(dev, EDCAPARA_VI, u4bAcParam);
+                       break;
 
-                       u4bAcParam = (  (((u32)(qos_parameters->tx_op_limit[pAcParam])) << AC_PARAM_TXOP_LIMIT_OFFSET)  |
-                                                       (((u32)(qos_parameters->cw_max[pAcParam])) << AC_PARAM_ECW_MAX_OFFSET)  |
-                                                       (((u32)(qos_parameters->cw_min[pAcParam])) << AC_PARAM_ECW_MIN_OFFSET)  |
-                                                       (((u32)u1bAIFS) << AC_PARAM_AIFS_OFFSET)        );
+               case AC3_VO:
+                       write_nic_dword(dev, EDCAPARA_VO, u4bAcParam);
+                       break;
 
-                       RT_TRACE(COMP_DBG, "%s():HW_VAR_AC_PARAM eACI:%x:%x\n", __func__,eACI, u4bAcParam);
-                       switch (eACI)
-                       {
-                       case AC1_BK:
-                               write_nic_dword(dev, EDCAPARA_BK, u4bAcParam);
-                               break;
+               default:
+                       printk(KERN_INFO "SetHwReg8185(): invalid ACI: %d !\n",
+                              eACI);
+                       break;
+               }
+               priv->rtllib->SetHwRegHandler(dev, HW_VAR_ACM_CTRL,
+                                             (u8 *)(&pAcParam));
+               break;
+       }
 
+       case HW_VAR_ACM_CTRL:
+       {
+               struct rtllib_qos_parameters *qos_parameters =
+                        &priv->rtllib->current_network.qos_data.parameters;
+               u8 pAcParam = *((u8 *)val);
+               u32 eACI = pAcParam;
+               union aci_aifsn *pAciAifsn = (union aci_aifsn *) &
+                                             (qos_parameters->aifs[0]);
+               u8 acm = pAciAifsn->f.acm;
+               u8 AcmCtrl = read_nic_byte(dev, AcmHwCtrl);
+
+               RT_TRACE(COMP_DBG, "===========>%s():HW_VAR_ACM_CTRL:%x\n",
+                        __func__, eACI);
+               AcmCtrl = AcmCtrl | ((priv->AcmMethod == 2) ? 0x0 : 0x1);
+
+               if (acm) {
+                       switch (eACI) {
                        case AC0_BE:
-                               write_nic_dword(dev, EDCAPARA_BE, u4bAcParam);
+                               AcmCtrl |= AcmHw_BeqEn;
                                break;
 
                        case AC2_VI:
-                               write_nic_dword(dev, EDCAPARA_VI, u4bAcParam);
+                               AcmCtrl |= AcmHw_ViqEn;
                                break;
 
                        case AC3_VO:
-                               write_nic_dword(dev, EDCAPARA_VO, u4bAcParam);
+                               AcmCtrl |= AcmHw_VoqEn;
                                break;
 
                        default:
-                               printk("SetHwReg8185(): invalid ACI: %d !\n", eACI);
+                               RT_TRACE(COMP_QOS, "SetHwReg8185(): [HW_VAR_"
+                                        "ACM_CTRL] acm set failed: eACI is "
+                                        "%d\n", eACI);
                                break;
                        }
-                               priv->rtllib->SetHwRegHandler(dev, HW_VAR_ACM_CTRL, (u8*)(&pAcParam));
-               }
-               break;
-
-               case HW_VAR_ACM_CTRL:
-               {
-                       struct rtllib_qos_parameters *qos_parameters = &priv->rtllib->current_network.qos_data.parameters;
-                       u8      pAcParam = *((u8*)val);
-                       u32     eACI = pAcParam;
-                       union aci_aifsn *pAciAifsn = (union aci_aifsn *)&(qos_parameters->aifs[0]);
-                       u8              acm = pAciAifsn->f.acm;
-                       u8              AcmCtrl = read_nic_byte( dev, AcmHwCtrl);
-
-                       RT_TRACE(COMP_DBG, "===========>%s():HW_VAR_ACM_CTRL:%x\n", __func__,eACI);
-                       AcmCtrl = AcmCtrl | ((priv->AcmMethod == 2)?0x0:0x1);
-
-                       if (acm)
-                       {
-                               switch (eACI)
-                               {
-                               case AC0_BE:
-                                       AcmCtrl |= AcmHw_BeqEn;
-                                       break;
-
-                               case AC2_VI:
-                                       AcmCtrl |= AcmHw_ViqEn;
-                                       break;
-
-                               case AC3_VO:
-                                       AcmCtrl |= AcmHw_VoqEn;
-                                       break;
-
-                               default:
-                                       RT_TRACE( COMP_QOS, "SetHwReg8185(): [HW_VAR_ACM_CTRL] acm set failed: eACI is %d\n", eACI );
-                                       break;
-                               }
-                       }
-                       else
-                       {
-                               switch (eACI)
-                               {
-                               case AC0_BE:
-                                       AcmCtrl &= (~AcmHw_BeqEn);
-                                       break;
+               } else {
+                       switch (eACI) {
+                       case AC0_BE:
+                               AcmCtrl &= (~AcmHw_BeqEn);
+                               break;
 
-                               case AC2_VI:
-                                       AcmCtrl &= (~AcmHw_ViqEn);
-                                       break;
+                       case AC2_VI:
+                               AcmCtrl &= (~AcmHw_ViqEn);
+                               break;
 
-                               case AC3_VO:
-                                       AcmCtrl &= (~AcmHw_BeqEn);
-                                       break;
+                       case AC3_VO:
+                               AcmCtrl &= (~AcmHw_BeqEn);
+                               break;
 
-                               default:
-                                       break;
-                               }
+                       default:
+                               break;
                        }
-
-                       RT_TRACE( COMP_QOS, "SetHwReg8190pci(): [HW_VAR_ACM_CTRL] Write 0x%X\n", AcmCtrl );
-                       write_nic_byte(dev, AcmHwCtrl, AcmCtrl );
                }
+
+               RT_TRACE(COMP_QOS, "SetHwReg8190pci(): [HW_VAR_ACM_CTRL] Write"
+                        " 0x%X\n", AcmCtrl);
+               write_nic_byte(dev, AcmHwCtrl, AcmCtrl);
                break;
+       }
 
-               case HW_VAR_SIFS:
-                       write_nic_byte(dev, SIFS, val[0]);
-                       write_nic_byte(dev, SIFS+1, val[0]);
+       case HW_VAR_SIFS:
+               write_nic_byte(dev, SIFS, val[0]);
+               write_nic_byte(dev, SIFS+1, val[0]);
                break;
 
-                case HW_VAR_RF_TIMING:
-               {
-                       u8 Rf_Timing = *((u8*)val);
-                       write_nic_byte(dev, rFPGA0_RFTiming1, Rf_Timing);
-               }
+       case HW_VAR_RF_TIMING:
+       {
+               u8 Rf_Timing = *((u8 *)val);
+               write_nic_byte(dev, rFPGA0_RFTiming1, Rf_Timing);
                break;
+       }
 
-               default:
+       default:
                break;
        }
 
 }
 
-static void rtl8192_read_eeprom_info(struct net_devicedev)
+static void rtl8192_read_eeprom_info(struct net_device *dev)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
 
-       u8                      tempval;
-       u8                      ICVer8192, ICVer8256;
-       u16                     i,usValue, IC_Version;
-       u16                     EEPROMId;
+       u8 tempval;
+       u8 ICVer8192, ICVer8256;
+       u16 i, usValue, IC_Version;
+       u16 EEPROMId;
        u8 bMac_Tmp_Addr[6] = {0x00, 0xe0, 0x4c, 0x00, 0x00, 0x01};
        RT_TRACE(COMP_INIT, "====> rtl8192_read_eeprom_info\n");
 
-
-
        EEPROMId = eprom_read(dev, 0);
-       if ( EEPROMId != RTL8190_EEPROM_ID )
-       {
-               RT_TRACE(COMP_ERR, "EEPROM ID is invalid:%x, %x\n", EEPROMId, RTL8190_EEPROM_ID);
-               priv->AutoloadFailFlag=true;
-       }
-       else
-       {
-               priv->AutoloadFailFlag=false;
+       if (EEPROMId != RTL8190_EEPROM_ID) {
+               RT_TRACE(COMP_ERR, "EEPROM ID is invalid:%x, %x\n",
+                        EEPROMId, RTL8190_EEPROM_ID);
+               priv->AutoloadFailFlag = true;
+       } else {
+               priv->AutoloadFailFlag = false;
        }
 
-       if (!priv->AutoloadFailFlag)
-       {
+       if (!priv->AutoloadFailFlag) {
                priv->eeprom_vid = eprom_read(dev, (EEPROM_VID >> 1));
                priv->eeprom_did = eprom_read(dev, (EEPROM_DID >> 1));
 
-               usValue = eprom_read(dev, (u16)(EEPROM_Customer_ID>>1)) >> 8 ;
-               priv->eeprom_CustomerID = (u8)( usValue & 0xff);
+               usValue = eprom_read(dev, (u16)(EEPROM_Customer_ID>>1)) >> 8;
+               priv->eeprom_CustomerID = (u8)(usValue & 0xff);
                usValue = eprom_read(dev, (EEPROM_ICVersion_ChannelPlan>>1));
                priv->eeprom_ChannelPlan = usValue&0xff;
                IC_Version = ((usValue&0xff00)>>8);
@@ -346,24 +342,21 @@ static void rtl8192_read_eeprom_info(struct net_device* dev)
                ICVer8256 = ((IC_Version&0xf0)>>4);
                RT_TRACE(COMP_INIT, "\nICVer8192 = 0x%x\n", ICVer8192);
                RT_TRACE(COMP_INIT, "\nICVer8256 = 0x%x\n", ICVer8256);
-               if (ICVer8192 == 0x2)
-               {
+               if (ICVer8192 == 0x2) {
                        if (ICVer8256 == 0x5)
-                               priv->card_8192_version= VERSION_8190_BE;
+                               priv->card_8192_version = VERSION_8190_BE;
                }
-               switch (priv->card_8192_version)
-               {
-                       case VERSION_8190_BD:
-                       case VERSION_8190_BE:
-                               break;
-                       default:
-                               priv->card_8192_version = VERSION_8190_BD;
-                               break;
+               switch (priv->card_8192_version) {
+               case VERSION_8190_BD:
+               case VERSION_8190_BE:
+                       break;
+               default:
+                       priv->card_8192_version = VERSION_8190_BD;
+                       break;
                }
-               RT_TRACE(COMP_INIT, "\nIC Version = 0x%x\n", priv->card_8192_version);
-       }
-       else
-       {
+               RT_TRACE(COMP_INIT, "\nIC Version = 0x%x\n",
+                         priv->card_8192_version);
+       } else {
                priv->card_8192_version = VERSION_8190_BD;
                priv->eeprom_vid = 0;
                priv->eeprom_did = 0;
@@ -374,282 +367,289 @@ static void rtl8192_read_eeprom_info(struct net_device* dev)
 
        RT_TRACE(COMP_INIT, "EEPROM VID = 0x%4x\n", priv->eeprom_vid);
        RT_TRACE(COMP_INIT, "EEPROM DID = 0x%4x\n", priv->eeprom_did);
-       RT_TRACE(COMP_INIT,"EEPROM Customer ID: 0x%2x\n", priv->eeprom_CustomerID);
-
-       if (!priv->AutoloadFailFlag)
-       {
-               for (i = 0; i < 6; i += 2)
-               {
-                       usValue = eprom_read(dev, (u16) ((EEPROM_NODE_ADDRESS_BYTE_0+i)>>1));
-                       *(u16*)(&dev->dev_addr[i]) = usValue;
+       RT_TRACE(COMP_INIT, "EEPROM Customer ID: 0x%2x\n",
+                priv->eeprom_CustomerID);
+
+       if (!priv->AutoloadFailFlag) {
+               for (i = 0; i < 6; i += 2) {
+                       usValue = eprom_read(dev,
+                                (u16)((EEPROM_NODE_ADDRESS_BYTE_0 + i) >> 1));
+                       *(u16 *)(&dev->dev_addr[i]) = usValue;
                }
        } else {
                memcpy(dev->dev_addr, bMac_Tmp_Addr, 6);
        }
 
-       RT_TRACE(COMP_INIT, "Permanent Address = %02x-%02x-%02x-%02x-%02x-%02x\n",
-                       dev->dev_addr[0], dev->dev_addr[1],
-                       dev->dev_addr[2], dev->dev_addr[3],
-                       dev->dev_addr[4], dev->dev_addr[5]);
+       RT_TRACE(COMP_INIT, "Permanent Address = %pM\n",
+                dev->dev_addr);
 
-       if (priv->card_8192_version > VERSION_8190_BD) {
+       if (priv->card_8192_version > VERSION_8190_BD)
                priv->bTXPowerDataReadFromEEPORM = true;
-       } else {
+       else
                priv->bTXPowerDataReadFromEEPORM = false;
-       }
 
        priv->rf_type = RTL819X_DEFAULT_RF_TYPE;
 
-       if (priv->card_8192_version > VERSION_8190_BD)
-       {
-               if (!priv->AutoloadFailFlag)
-               {
-                       tempval = (eprom_read(dev, (EEPROM_RFInd_PowerDiff>>1))) & 0xff;
+       if (priv->card_8192_version > VERSION_8190_BD) {
+               if (!priv->AutoloadFailFlag) {
+                       tempval = (eprom_read(dev, (EEPROM_RFInd_PowerDiff >>
+                                             1))) & 0xff;
                        priv->EEPROMLegacyHTTxPowerDiff = tempval & 0xf;
 
                        if (tempval&0x80)
                                priv->rf_type = RF_1T2R;
                        else
                                priv->rf_type = RF_2T4R;
-               }
-               else
-               {
+               } else {
                        priv->EEPROMLegacyHTTxPowerDiff = 0x04;
                }
                RT_TRACE(COMP_INIT, "EEPROMLegacyHTTxPowerDiff = %d\n",
                        priv->EEPROMLegacyHTTxPowerDiff);
 
                if (!priv->AutoloadFailFlag)
-               {
-                       priv->EEPROMThermalMeter = (u8)(((eprom_read(dev, (EEPROM_ThermalMeter>>1))) & 0xff00)>>8);
-               }
+                       priv->EEPROMThermalMeter = (u8)(((eprom_read(dev,
+                                                  (EEPROM_ThermalMeter>>1))) &
+                                                  0xff00)>>8);
                else
-               {
                        priv->EEPROMThermalMeter = EEPROM_Default_ThermalMeter;
-               }
-               RT_TRACE(COMP_INIT, "ThermalMeter = %d\n", priv->EEPROMThermalMeter);
-               priv->TSSI_13dBm = priv->EEPROMThermalMeter *100;
-
-               if (priv->epromtype == EEPROM_93C46)
-               {
-               if (!priv->AutoloadFailFlag)
-               {
-                               usValue = eprom_read(dev, (EEPROM_TxPwDiff_CrystalCap>>1));
+               RT_TRACE(COMP_INIT, "ThermalMeter = %d\n",
+                        priv->EEPROMThermalMeter);
+               priv->TSSI_13dBm = priv->EEPROMThermalMeter * 100;
+
+               if (priv->epromtype == EEPROM_93C46) {
+                       if (!priv->AutoloadFailFlag) {
+                               usValue = eprom_read(dev,
+                                         (EEPROM_TxPwDiff_CrystalCap >> 1));
                                priv->EEPROMAntPwDiff = (usValue&0x0fff);
-                               priv->EEPROMCrystalCap = (u8)((usValue&0xf000)>>12);
-               }
-               else
-               {
-                               priv->EEPROMAntPwDiff = EEPROM_Default_AntTxPowerDiff;
-                               priv->EEPROMCrystalCap = EEPROM_Default_TxPwDiff_CrystalCap;
-               }
-                       RT_TRACE(COMP_INIT, "EEPROMAntPwDiff = %d\n", priv->EEPROMAntPwDiff);
-                       RT_TRACE(COMP_INIT, "EEPROMCrystalCap = %d\n", priv->EEPROMCrystalCap);
-
-               for (i=0; i<14; i+=2)
-               {
-                       if (!priv->AutoloadFailFlag)
-                       {
-                               usValue = eprom_read(dev, (u16) ((EEPROM_TxPwIndex_CCK+i)>>1) );
-                       }
-                       else
-                       {
-                               usValue = EEPROM_Default_TxPower;
+                               priv->EEPROMCrystalCap = (u8)((usValue & 0xf000)
+                                                        >> 12);
+                       } else {
+                               priv->EEPROMAntPwDiff =
+                                        EEPROM_Default_AntTxPowerDiff;
+                               priv->EEPROMCrystalCap =
+                                        EEPROM_Default_TxPwDiff_CrystalCap;
                        }
-                       *((u16*)(&priv->EEPROMTxPowerLevelCCK[i])) = usValue;
-                       RT_TRACE(COMP_INIT,"CCK Tx Power Level, Index %d = 0x%02x\n", i, priv->EEPROMTxPowerLevelCCK[i]);
-                       RT_TRACE(COMP_INIT, "CCK Tx Power Level, Index %d = 0x%02x\n", i+1, priv->EEPROMTxPowerLevelCCK[i+1]);
-               }
-               for (i=0; i<14; i+=2)
-               {
-                       if (!priv->AutoloadFailFlag)
-                       {
-                               usValue = eprom_read(dev, (u16) ((EEPROM_TxPwIndex_OFDM_24G+i)>>1) );
+                       RT_TRACE(COMP_INIT, "EEPROMAntPwDiff = %d\n",
+                                priv->EEPROMAntPwDiff);
+                       RT_TRACE(COMP_INIT, "EEPROMCrystalCap = %d\n",
+                                priv->EEPROMCrystalCap);
+
+                       for (i = 0; i < 14; i += 2) {
+                               if (!priv->AutoloadFailFlag)
+                                       usValue = eprom_read(dev,
+                                                 (u16)((EEPROM_TxPwIndex_CCK +
+                                                 i) >> 1));
+                               else
+                                       usValue = EEPROM_Default_TxPower;
+                               *((u16 *)(&priv->EEPROMTxPowerLevelCCK[i])) =
+                                                                usValue;
+                               RT_TRACE(COMP_INIT, "CCK Tx Power Level, Index"
+                                        " %d = 0x%02x\n", i,
+                                        priv->EEPROMTxPowerLevelCCK[i]);
+                               RT_TRACE(COMP_INIT, "CCK Tx Power Level, Index"
+                                        " %d = 0x%02x\n", i+1,
+                                        priv->EEPROMTxPowerLevelCCK[i+1]);
                        }
-                       else
-                       {
-                               usValue = EEPROM_Default_TxPower;
+                       for (i = 0; i < 14; i += 2) {
+                               if (!priv->AutoloadFailFlag)
+                                       usValue = eprom_read(dev,
+                                               (u16)((EEPROM_TxPwIndex_OFDM_24G
+                                               + i) >> 1));
+                               else
+                                       usValue = EEPROM_Default_TxPower;
+                               *((u16 *)(&priv->EEPROMTxPowerLevelOFDM24G[i]))
+                                                        = usValue;
+                               RT_TRACE(COMP_INIT, "OFDM 2.4G Tx Power Level,"
+                                        " Index %d = 0x%02x\n", i,
+                                        priv->EEPROMTxPowerLevelOFDM24G[i]);
+                               RT_TRACE(COMP_INIT, "OFDM 2.4G Tx Power Level,"
+                                        " Index %d = 0x%02x\n", i + 1,
+                                        priv->EEPROMTxPowerLevelOFDM24G[i+1]);
                        }
-                       *((u16*)(&priv->EEPROMTxPowerLevelOFDM24G[i])) = usValue;
-                       RT_TRACE(COMP_INIT, "OFDM 2.4G Tx Power Level, Index %d = 0x%02x\n", i, priv->EEPROMTxPowerLevelOFDM24G[i]);
-                       RT_TRACE(COMP_INIT, "OFDM 2.4G Tx Power Level, Index %d = 0x%02x\n", i+1, priv->EEPROMTxPowerLevelOFDM24G[i+1]);
-               }
-               }
-               else if (priv->epromtype== EEPROM_93C56)
-               {
-
                }
-               if (priv->epromtype == EEPROM_93C46)
-               {
-                       for (i=0; i<14; i++)
-                       {
-                               priv->TxPowerLevelCCK[i] = priv->EEPROMTxPowerLevelCCK[i];
-                               priv->TxPowerLevelOFDM24G[i] = priv->EEPROMTxPowerLevelOFDM24G[i];
+               if (priv->epromtype == EEPROM_93C46) {
+                       for (i = 0; i < 14; i++) {
+                               priv->TxPowerLevelCCK[i] =
+                                        priv->EEPROMTxPowerLevelCCK[i];
+                               priv->TxPowerLevelOFDM24G[i] =
+                                        priv->EEPROMTxPowerLevelOFDM24G[i];
                        }
-                       priv->LegacyHTTxPowerDiff = priv->EEPROMLegacyHTTxPowerDiff;
-                       priv->AntennaTxPwDiff[0] = (priv->EEPROMAntPwDiff & 0xf);
-                       priv->AntennaTxPwDiff[1] = ((priv->EEPROMAntPwDiff & 0xf0)>>4);
-                       priv->AntennaTxPwDiff[2] = ((priv->EEPROMAntPwDiff & 0xf00)>>8);
+                       priv->LegacyHTTxPowerDiff =
+                                        priv->EEPROMLegacyHTTxPowerDiff;
+                       priv->AntennaTxPwDiff[0] = (priv->EEPROMAntPwDiff &
+                                                   0xf);
+                       priv->AntennaTxPwDiff[1] = ((priv->EEPROMAntPwDiff &
+                                                   0xf0)>>4);
+                       priv->AntennaTxPwDiff[2] = ((priv->EEPROMAntPwDiff &
+                                                   0xf00)>>8);
                        priv->CrystalCap = priv->EEPROMCrystalCap;
-                       priv->ThermalMeter[0] = (priv->EEPROMThermalMeter & 0xf);
-                       priv->ThermalMeter[1] = ((priv->EEPROMThermalMeter & 0xf0)>>4);
-               }
-               else if (priv->epromtype == EEPROM_93C56)
-               {
-
-                       for (i=0; i<3; i++)
-                       {
-                               priv->TxPowerLevelCCK_A[i]  = priv->EEPROMRfACCKChnl1TxPwLevel[0];
-                               priv->TxPowerLevelOFDM24G_A[i] = priv->EEPROMRfAOfdmChnlTxPwLevel[0];
-                               priv->TxPowerLevelCCK_C[i] =  priv->EEPROMRfCCCKChnl1TxPwLevel[0];
-                               priv->TxPowerLevelOFDM24G_C[i] = priv->EEPROMRfCOfdmChnlTxPwLevel[0];
+                       priv->ThermalMeter[0] = (priv->EEPROMThermalMeter &
+                                                0xf);
+                       priv->ThermalMeter[1] = ((priv->EEPROMThermalMeter &
+                                                0xf0)>>4);
+               } else if (priv->epromtype == EEPROM_93C56) {
+
+                       for (i = 0; i < 3; i++) {
+                               priv->TxPowerLevelCCK_A[i] =
+                                        priv->EEPROMRfACCKChnl1TxPwLevel[0];
+                               priv->TxPowerLevelOFDM24G_A[i] =
+                                        priv->EEPROMRfAOfdmChnlTxPwLevel[0];
+                               priv->TxPowerLevelCCK_C[i] =
+                                        priv->EEPROMRfCCCKChnl1TxPwLevel[0];
+                               priv->TxPowerLevelOFDM24G_C[i] =
+                                        priv->EEPROMRfCOfdmChnlTxPwLevel[0];
                        }
-                       for (i=3; i<9; i++)
-                       {
-                               priv->TxPowerLevelCCK_A[i]  = priv->EEPROMRfACCKChnl1TxPwLevel[1];
-                               priv->TxPowerLevelOFDM24G_A[i] = priv->EEPROMRfAOfdmChnlTxPwLevel[1];
-                               priv->TxPowerLevelCCK_C[i] =  priv->EEPROMRfCCCKChnl1TxPwLevel[1];
-                               priv->TxPowerLevelOFDM24G_C[i] = priv->EEPROMRfCOfdmChnlTxPwLevel[1];
+                       for (i = 3; i < 9; i++) {
+                               priv->TxPowerLevelCCK_A[i]  =
+                                        priv->EEPROMRfACCKChnl1TxPwLevel[1];
+                               priv->TxPowerLevelOFDM24G_A[i] =
+                                        priv->EEPROMRfAOfdmChnlTxPwLevel[1];
+                               priv->TxPowerLevelCCK_C[i] =
+                                        priv->EEPROMRfCCCKChnl1TxPwLevel[1];
+                               priv->TxPowerLevelOFDM24G_C[i] =
+                                        priv->EEPROMRfCOfdmChnlTxPwLevel[1];
                        }
-                       for (i=9; i<14; i++)
-                       {
-                               priv->TxPowerLevelCCK_A[i]  = priv->EEPROMRfACCKChnl1TxPwLevel[2];
-                               priv->TxPowerLevelOFDM24G_A[i] = priv->EEPROMRfAOfdmChnlTxPwLevel[2];
-                               priv->TxPowerLevelCCK_C[i] =  priv->EEPROMRfCCCKChnl1TxPwLevel[2];
-                               priv->TxPowerLevelOFDM24G_C[i] = priv->EEPROMRfCOfdmChnlTxPwLevel[2];
+                       for (i = 9; i < 14; i++) {
+                               priv->TxPowerLevelCCK_A[i]  =
+                                        priv->EEPROMRfACCKChnl1TxPwLevel[2];
+                               priv->TxPowerLevelOFDM24G_A[i] =
+                                        priv->EEPROMRfAOfdmChnlTxPwLevel[2];
+                               priv->TxPowerLevelCCK_C[i] =
+                                        priv->EEPROMRfCCCKChnl1TxPwLevel[2];
+                               priv->TxPowerLevelOFDM24G_C[i] =
+                                        priv->EEPROMRfCOfdmChnlTxPwLevel[2];
                        }
-                       for (i=0; i<14; i++)
-                               RT_TRACE(COMP_INIT, "priv->TxPowerLevelCCK_A[%d] = 0x%x\n", i, priv->TxPowerLevelCCK_A[i]);
-                       for (i=0; i<14; i++)
-                               RT_TRACE(COMP_INIT,"priv->TxPowerLevelOFDM24G_A[%d] = 0x%x\n", i, priv->TxPowerLevelOFDM24G_A[i]);
-                       for (i=0; i<14; i++)
-                               RT_TRACE(COMP_INIT, "priv->TxPowerLevelCCK_C[%d] = 0x%x\n", i, priv->TxPowerLevelCCK_C[i]);
-                       for (i=0; i<14; i++)
-                               RT_TRACE(COMP_INIT, "priv->TxPowerLevelOFDM24G_C[%d] = 0x%x\n", i, priv->TxPowerLevelOFDM24G_C[i]);
-                       priv->LegacyHTTxPowerDiff = priv->EEPROMLegacyHTTxPowerDiff;
+                       for (i = 0; i < 14; i++)
+                               RT_TRACE(COMP_INIT, "priv->TxPowerLevelCCK_A"
+                                        "[%d] = 0x%x\n", i,
+                                        priv->TxPowerLevelCCK_A[i]);
+                       for (i = 0; i < 14; i++)
+                               RT_TRACE(COMP_INIT, "priv->TxPowerLevelOFDM"
+                                        "24G_A[%d] = 0x%x\n", i,
+                                        priv->TxPowerLevelOFDM24G_A[i]);
+                       for (i = 0; i < 14; i++)
+                               RT_TRACE(COMP_INIT, "priv->TxPowerLevelCCK_C"
+                                        "[%d] = 0x%x\n", i,
+                                        priv->TxPowerLevelCCK_C[i]);
+                       for (i = 0; i < 14; i++)
+                               RT_TRACE(COMP_INIT, "priv->TxPowerLevelOFDM"
+                                        "24G_C[%d] = 0x%x\n", i,
+                                        priv->TxPowerLevelOFDM24G_C[i]);
+                       priv->LegacyHTTxPowerDiff =
+                                priv->EEPROMLegacyHTTxPowerDiff;
                        priv->AntennaTxPwDiff[0] = 0;
                        priv->AntennaTxPwDiff[1] = 0;
                        priv->AntennaTxPwDiff[2] = 0;
                        priv->CrystalCap = priv->EEPROMCrystalCap;
-                       priv->ThermalMeter[0] = (priv->EEPROMThermalMeter & 0xf);
-                       priv->ThermalMeter[1] = ((priv->EEPROMThermalMeter & 0xf0)>>4);
+                       priv->ThermalMeter[0] = (priv->EEPROMThermalMeter &
+                                                0xf);
+                       priv->ThermalMeter[1] = ((priv->EEPROMThermalMeter &
+                                                0xf0)>>4);
                }
        }
 
-       if (priv->rf_type == RF_1T2R)
-       {
+       if (priv->rf_type == RF_1T2R) {
+               /* no matter what checkpatch says, the braces are needed */
                RT_TRACE(COMP_INIT, "\n1T2R config\n");
-       }
-       else if (priv->rf_type == RF_2T4R)
-       {
+       } else if (priv->rf_type == RF_2T4R) {
                RT_TRACE(COMP_INIT, "\n2T4R config\n");
        }
 
        init_rate_adaptive(dev);
 
-
-       priv->rf_chip= RF_8256;
+       priv->rf_chip = RF_8256;
 
        if (priv->RegChannelPlan == 0xf)
-       {
                priv->ChannelPlan = priv->eeprom_ChannelPlan;
-       }
        else
-       {
                priv->ChannelPlan = priv->RegChannelPlan;
-       }
 
-       if ( priv->eeprom_vid == 0x1186 &&  priv->eeprom_did == 0x3304 )
-       {
+       if (priv->eeprom_vid == 0x1186 &&  priv->eeprom_did == 0x3304)
                priv->CustomerID =  RT_CID_DLINK;
-       }
-
-       switch (priv->eeprom_CustomerID)
-       {
-               case EEPROM_CID_DEFAULT:
-                       priv->CustomerID = RT_CID_DEFAULT;
-                       break;
-               case EEPROM_CID_CAMEO:
-                       priv->CustomerID = RT_CID_819x_CAMEO;
-                       break;
-               case  EEPROM_CID_RUNTOP:
-                       priv->CustomerID = RT_CID_819x_RUNTOP;
-                       break;
-               case EEPROM_CID_NetCore:
-                       priv->CustomerID = RT_CID_819x_Netcore;
-                       break;
-               case EEPROM_CID_TOSHIBA:
-                       priv->CustomerID = RT_CID_TOSHIBA;
-                       if (priv->eeprom_ChannelPlan&0x80)
-                               priv->ChannelPlan = priv->eeprom_ChannelPlan&0x7f;
-                       else
-                               priv->ChannelPlan = 0x0;
-                       RT_TRACE(COMP_INIT, "Toshiba ChannelPlan = 0x%x\n",
-                               priv->ChannelPlan);
-                       break;
-               case EEPROM_CID_Nettronix:
-                       priv->ScanDelay = 100;
-                       priv->CustomerID = RT_CID_Nettronix;
-                       break;
-               case EEPROM_CID_Pronet:
-                       priv->CustomerID = RT_CID_PRONET;
-                       break;
-               case EEPROM_CID_DLINK:
-                       priv->CustomerID = RT_CID_DLINK;
-                       break;
-
-               case EEPROM_CID_WHQL:
-
 
+       switch (priv->eeprom_CustomerID) {
+       case EEPROM_CID_DEFAULT:
+               priv->CustomerID = RT_CID_DEFAULT;
+               break;
+       case EEPROM_CID_CAMEO:
+               priv->CustomerID = RT_CID_819x_CAMEO;
+               break;
+       case  EEPROM_CID_RUNTOP:
+               priv->CustomerID = RT_CID_819x_RUNTOP;
+               break;
+       case EEPROM_CID_NetCore:
+               priv->CustomerID = RT_CID_819x_Netcore;
+               break;
+       case EEPROM_CID_TOSHIBA:
+               priv->CustomerID = RT_CID_TOSHIBA;
+               if (priv->eeprom_ChannelPlan&0x80)
+                       priv->ChannelPlan = priv->eeprom_ChannelPlan&0x7f;
+               else
+                       priv->ChannelPlan = 0x0;
+               RT_TRACE(COMP_INIT, "Toshiba ChannelPlan = 0x%x\n",
+                       priv->ChannelPlan);
+               break;
+       case EEPROM_CID_Nettronix:
+               priv->ScanDelay = 100;
+               priv->CustomerID = RT_CID_Nettronix;
+               break;
+       case EEPROM_CID_Pronet:
+               priv->CustomerID = RT_CID_PRONET;
+               break;
+       case EEPROM_CID_DLINK:
+               priv->CustomerID = RT_CID_DLINK;
+               break;
 
-                       break;
-               default:
-                       break;
+       case EEPROM_CID_WHQL:
+               break;
+       default:
+               break;
        }
 
        if (priv->ChannelPlan > CHANNEL_PLAN_LEN - 1)
                priv->ChannelPlan = 0;
        priv->ChannelPlan = COUNTRY_CODE_WORLD_WIDE_13;
 
-       if ( priv->eeprom_vid == 0x1186 &&  priv->eeprom_did == 0x3304)
+       if (priv->eeprom_vid == 0x1186 &&  priv->eeprom_did == 0x3304)
                priv->rtllib->bSupportRemoteWakeUp = true;
        else
                priv->rtllib->bSupportRemoteWakeUp = false;
 
        RT_TRACE(COMP_INIT, "RegChannelPlan(%d)\n", priv->RegChannelPlan);
-       RT_TRACE(COMP_INIT, "ChannelPlan = %d \n", priv->ChannelPlan);
+       RT_TRACE(COMP_INIT, "ChannelPlan = %d\n", priv->ChannelPlan);
        RT_TRACE(COMP_TRACE, "<==== ReadAdapterInfo\n");
-
-       return ;
 }
 
-void rtl8192_get_eeprom_size(struct net_devicedev)
+void rtl8192_get_eeprom_size(struct net_device *dev)
 {
-       u16 curCR = 0;
+       u16 curCR;
        struct r8192_priv *priv = rtllib_priv(dev);
+
        RT_TRACE(COMP_INIT, "===========>%s()\n", __func__);
        curCR = read_nic_dword(dev, EPROM_CMD);
-       RT_TRACE(COMP_INIT, "read from Reg Cmd9346CR(%x):%x\n", EPROM_CMD, curCR);
-       priv->epromtype = (curCR & EPROM_CMD_9356SEL) ? EEPROM_93C56 : EEPROM_93C46;
-       RT_TRACE(COMP_INIT, "<===========%s(), epromtype:%d\n", __func__, priv->epromtype);
+       RT_TRACE(COMP_INIT, "read from Reg Cmd9346CR(%x):%x\n", EPROM_CMD,
+                curCR);
+       priv->epromtype = (curCR & EPROM_CMD_9356SEL) ? EEPROM_93C56 :
+                         EEPROM_93C46;
+       RT_TRACE(COMP_INIT, "<===========%s(), epromtype:%d\n", __func__,
+                priv->epromtype);
        rtl8192_read_eeprom_info(dev);
 }
 
-static void rtl8192_hwconfig(struct net_devicedev)
+static void rtl8192_hwconfig(struct net_device *dev)
 {
        u32 regRATR = 0, regRRSR = 0;
        u8 regBwOpMode = 0, regTmp = 0;
        struct r8192_priv *priv = rtllib_priv(dev);
 
-       switch (priv->rtllib->mode)
-       {
+       switch (priv->rtllib->mode) {
        case WIRELESS_MODE_B:
                regBwOpMode = BW_OPMODE_20MHZ;
                regRATR = RATE_ALL_CCK;
                regRRSR = RATE_ALL_CCK;
                break;
        case WIRELESS_MODE_A:
-               regBwOpMode = BW_OPMODE_5G |BW_OPMODE_20MHZ;
+               regBwOpMode = BW_OPMODE_5G | BW_OPMODE_20MHZ;
                regRATR = RATE_ALL_OFDM_AG;
                regRRSR = RATE_ALL_OFDM_AG;
                break;
@@ -661,12 +661,14 @@ static void rtl8192_hwconfig(struct net_device* dev)
        case WIRELESS_MODE_AUTO:
        case WIRELESS_MODE_N_24G:
                regBwOpMode = BW_OPMODE_20MHZ;
-                       regRATR = RATE_ALL_CCK | RATE_ALL_OFDM_AG | RATE_ALL_OFDM_1SS | RATE_ALL_OFDM_2SS;
+                       regRATR = RATE_ALL_CCK | RATE_ALL_OFDM_AG |
+                                 RATE_ALL_OFDM_1SS | RATE_ALL_OFDM_2SS;
                        regRRSR = RATE_ALL_CCK | RATE_ALL_OFDM_AG;
                break;
        case WIRELESS_MODE_N_5G:
                regBwOpMode = BW_OPMODE_5G;
-               regRATR = RATE_ALL_OFDM_AG | RATE_ALL_OFDM_1SS | RATE_ALL_OFDM_2SS;
+               regRATR = RATE_ALL_OFDM_AG | RATE_ALL_OFDM_1SS |
+                         RATE_ALL_OFDM_2SS;
                regRRSR = RATE_ALL_OFDM_AG;
                break;
        default:
@@ -681,9 +683,7 @@ static void rtl8192_hwconfig(struct net_device* dev)
                u32 ratr_value = 0;
                ratr_value = regRATR;
                if (priv->rf_type == RF_1T2R)
-               {
                        ratr_value &= ~(RATE_ALL_OFDM_2SS);
-               }
                write_nic_dword(dev, RATR0, ratr_value);
                write_nic_byte(dev, UFWP, 1);
        }
@@ -692,11 +692,8 @@ static void rtl8192_hwconfig(struct net_device* dev)
        write_nic_dword(dev, RRSR, regRRSR);
 
        write_nic_word(dev, RETRY_LIMIT,
-                       priv->ShortRetryLimit << RETRY_LIMIT_SHORT_SHIFT | \
+                       priv->ShortRetryLimit << RETRY_LIMIT_SHORT_SHIFT |
                        priv->LongRetryLimit << RETRY_LIMIT_LONG_SHIFT);
-
-
-
 }
 
 bool rtl8192_adapter_start(struct net_device *dev)
@@ -705,7 +702,7 @@ bool rtl8192_adapter_start(struct net_device *dev)
        u32 ulRegRead;
        bool rtStatus = true;
        u8 tmpvalue;
-       u8 ICVersion,SwitchingRegulatorOutput;
+       u8 ICVersion, SwitchingRegulatorOutput;
        bool bfirmwareok = true;
        u32 tmpRegA, tmpRegC, TempCCk;
        int i = 0;
@@ -715,13 +712,12 @@ bool rtl8192_adapter_start(struct net_device *dev)
        priv->being_init_adapter = true;
 
 start:
-        rtl8192_pci_resetdescring(dev);
+       rtl8192_pci_resetdescring(dev);
        priv->Rf_Mode = RF_OP_By_SW_3wire;
-        if (priv->ResetProgress == RESET_TYPE_NORESET)
-        {
-            write_nic_byte(dev, ANAPAR, 0x37);
-            mdelay(500);
-        }
+       if (priv->ResetProgress == RESET_TYPE_NORESET) {
+               write_nic_byte(dev, ANAPAR, 0x37);
+               mdelay(500);
+       }
        priv->pFirmware->firmware_status = FW_STATUS_0_INIT;
 
        if (priv->RegRfOff == true)
@@ -729,23 +725,19 @@ start:
 
        ulRegRead = read_nic_dword(dev, CPU_GEN);
        if (priv->pFirmware->firmware_status == FW_STATUS_0_INIT)
-       {
                ulRegRead |= CPU_GEN_SYSTEM_RESET;
-       }else if (priv->pFirmware->firmware_status == FW_STATUS_5_READY)
+       else if (priv->pFirmware->firmware_status == FW_STATUS_5_READY)
                ulRegRead |= CPU_GEN_FIRMWARE_RESET;
        else
-               RT_TRACE(COMP_ERR, "ERROR in %s(): undefined firmware state(%d)\n", __func__,   priv->pFirmware->firmware_status);
-
+               RT_TRACE(COMP_ERR, "ERROR in %s(): undefined firmware state(%d)"
+                        "\n", __func__,   priv->pFirmware->firmware_status);
 
        write_nic_dword(dev, CPU_GEN, ulRegRead);
 
-
        ICVersion = read_nic_byte(dev, IC_VERRSION);
-       if (ICVersion >= 0x4)
-       {
+       if (ICVersion >= 0x4) {
                SwitchingRegulatorOutput = read_nic_byte(dev, SWREGULATOR);
-               if (SwitchingRegulatorOutput  != 0xb8)
-               {
+               if (SwitchingRegulatorOutput  != 0xb8) {
                        write_nic_byte(dev, SWREGULATOR, 0xa8);
                        mdelay(1);
                        write_nic_byte(dev, SWREGULATOR, 0xb8);
@@ -753,64 +745,64 @@ start:
        }
        RT_TRACE(COMP_INIT, "BB Config Start!\n");
        rtStatus = rtl8192_BBConfig(dev);
-       if (rtStatus != true)
-       {
+       if (rtStatus != true) {
                RT_TRACE(COMP_ERR, "BB Config failed\n");
                return rtStatus;
        }
-       RT_TRACE(COMP_INIT,"BB Config Finished!\n");
+       RT_TRACE(COMP_INIT, "BB Config Finished!\n");
 
        priv->LoopbackMode = RTL819X_NO_LOOPBACK;
-       if (priv->ResetProgress == RESET_TYPE_NORESET)
-       {
-       ulRegRead = read_nic_dword(dev, CPU_GEN);
-       if (priv->LoopbackMode == RTL819X_NO_LOOPBACK)
-       {
-               ulRegRead = ((ulRegRead & CPU_GEN_NO_LOOPBACK_MSK) | CPU_GEN_NO_LOOPBACK_SET);
-       }
-       else if (priv->LoopbackMode == RTL819X_MAC_LOOPBACK )
-       {
-               ulRegRead |= CPU_CCK_LOOPBACK;
-       }
-       else
-       {
-               RT_TRACE(COMP_ERR,"Serious error: wrong loopback mode setting\n");
-       }
+       if (priv->ResetProgress == RESET_TYPE_NORESET) {
+               ulRegRead = read_nic_dword(dev, CPU_GEN);
+               if (priv->LoopbackMode == RTL819X_NO_LOOPBACK)
+                       ulRegRead = ((ulRegRead & CPU_GEN_NO_LOOPBACK_MSK) |
+                                    CPU_GEN_NO_LOOPBACK_SET);
+               else if (priv->LoopbackMode == RTL819X_MAC_LOOPBACK)
+                       ulRegRead |= CPU_CCK_LOOPBACK;
+               else
+                       RT_TRACE(COMP_ERR, "Serious error: wrong loopback"
+                                " mode setting\n");
 
-       write_nic_dword(dev, CPU_GEN, ulRegRead);
+               write_nic_dword(dev, CPU_GEN, ulRegRead);
 
-       udelay(500);
+               udelay(500);
        }
        rtl8192_hwconfig(dev);
-       write_nic_byte(dev, CMDR, CR_RE|CR_TE);
+       write_nic_byte(dev, CMDR, CR_RE | CR_TE);
 
-       write_nic_byte(dev, PCIF, ((MXDMA2_NoLimit<<MXDMA2_RX_SHIFT) |\
-                               (MXDMA2_NoLimit<<MXDMA2_TX_SHIFT) ));
-       write_nic_dword(dev, MAC0, ((u32*)dev->dev_addr)[0]);
-       write_nic_word(dev, MAC4, ((u16*)(dev->dev_addr + 4))[0]);
+       write_nic_byte(dev, PCIF, ((MXDMA2_NoLimit<<MXDMA2_RX_SHIFT) |
+                      (MXDMA2_NoLimit<<MXDMA2_TX_SHIFT)));
+       write_nic_dword(dev, MAC0, ((u32 *)dev->dev_addr)[0]);
+       write_nic_word(dev, MAC4, ((u16 *)(dev->dev_addr + 4))[0]);
        write_nic_dword(dev, RCR, priv->ReceiveConfig);
 
-       {
-               write_nic_dword(dev, RQPN1,  NUM_OF_PAGE_IN_FW_QUEUE_BK << RSVD_FW_QUEUE_PAGE_BK_SHIFT |\
-                                       NUM_OF_PAGE_IN_FW_QUEUE_BE << RSVD_FW_QUEUE_PAGE_BE_SHIFT | \
-                                       NUM_OF_PAGE_IN_FW_QUEUE_VI << RSVD_FW_QUEUE_PAGE_VI_SHIFT | \
-                                       NUM_OF_PAGE_IN_FW_QUEUE_VO <<RSVD_FW_QUEUE_PAGE_VO_SHIFT);
-               write_nic_dword(dev, RQPN2, NUM_OF_PAGE_IN_FW_QUEUE_MGNT << RSVD_FW_QUEUE_PAGE_MGNT_SHIFT);
-               write_nic_dword(dev, RQPN3, APPLIED_RESERVED_QUEUE_IN_FW| \
-                                       NUM_OF_PAGE_IN_FW_QUEUE_BCN<<RSVD_FW_QUEUE_PAGE_BCN_SHIFT|\
-                                       NUM_OF_PAGE_IN_FW_QUEUE_PUB<<RSVD_FW_QUEUE_PAGE_PUB_SHIFT);
-       }
+       write_nic_dword(dev, RQPN1,  NUM_OF_PAGE_IN_FW_QUEUE_BK <<
+                       RSVD_FW_QUEUE_PAGE_BK_SHIFT |
+                       NUM_OF_PAGE_IN_FW_QUEUE_BE <<
+                       RSVD_FW_QUEUE_PAGE_BE_SHIFT |
+                       NUM_OF_PAGE_IN_FW_QUEUE_VI <<
+                       RSVD_FW_QUEUE_PAGE_VI_SHIFT |
+                       NUM_OF_PAGE_IN_FW_QUEUE_VO <<
+                       RSVD_FW_QUEUE_PAGE_VO_SHIFT);
+       write_nic_dword(dev, RQPN2, NUM_OF_PAGE_IN_FW_QUEUE_MGNT <<
+                       RSVD_FW_QUEUE_PAGE_MGNT_SHIFT);
+       write_nic_dword(dev, RQPN3, APPLIED_RESERVED_QUEUE_IN_FW |
+                       NUM_OF_PAGE_IN_FW_QUEUE_BCN <<
+                       RSVD_FW_QUEUE_PAGE_BCN_SHIFT|
+                       NUM_OF_PAGE_IN_FW_QUEUE_PUB <<
+                       RSVD_FW_QUEUE_PAGE_PUB_SHIFT);
 
        rtl8192_tx_enable(dev);
        rtl8192_rx_enable(dev);
-       ulRegRead = (0xFFF00000 & read_nic_dword(dev, RRSR))  | RATE_ALL_OFDM_AG | RATE_ALL_CCK;
+       ulRegRead = (0xFFF00000 & read_nic_dword(dev, RRSR))  |
+                    RATE_ALL_OFDM_AG | RATE_ALL_CCK;
        write_nic_dword(dev, RRSR, ulRegRead);
        write_nic_dword(dev, RATR0+4*7, (RATE_ALL_OFDM_AG | RATE_ALL_CCK));
 
        write_nic_byte(dev, ACK_TIMEOUT, 0x30);
 
        if (priv->ResetProgress == RESET_TYPE_NORESET)
-       rtl8192_SetWirelessMode(dev, priv->rtllib->mode);
+               rtl8192_SetWirelessMode(dev, priv->rtllib->mode);
        CamResetAllEntry(dev);
        {
                u8 SECR_value = 0x0;
@@ -823,8 +815,8 @@ start:
        write_nic_word(dev, BCN_INTERVAL, 100);
        {
                int i;
-               for (i=0; i<QOS_QUEUE_NUM; i++)
-               write_nic_dword(dev, WDCAPARA_ADD[i], 0x005e4332);
+               for (i = 0; i < QOS_QUEUE_NUM; i++)
+                       write_nic_dword(dev, WDCAPARA_ADD[i], 0x005e4332);
        }
        write_nic_byte(dev, 0xbe, 0xc0);
 
@@ -836,13 +828,13 @@ start:
        }
 
        tmpvalue = read_nic_byte(dev, IC_VERRSION);
-       priv->IC_Cut= tmpvalue;
+       priv->IC_Cut = tmpvalue;
        RT_TRACE(COMP_INIT, "priv->IC_Cut= 0x%x\n", priv->IC_Cut);
-       if (priv->IC_Cut>= IC_VersionCut_D)
-       {
-               if (priv->IC_Cut== IC_VersionCut_D) {
+       if (priv->IC_Cut >= IC_VersionCut_D) {
+               if (priv->IC_Cut == IC_VersionCut_D) {
+                       /* no matter what checkpatch says, braces are needed */
                        RT_TRACE(COMP_INIT, "D-cut\n");
-               } else if (priv->IC_Cut== IC_VersionCut_E) {
+               } else if (priv->IC_Cut == IC_VersionCut_E) {
                        RT_TRACE(COMP_INIT, "E-cut\n");
                }
        } else {
@@ -878,20 +870,27 @@ start:
        write_nic_byte(dev, 0x87, 0x0);
 
        if (priv->RegRfOff == true) {
-               RT_TRACE((COMP_INIT|COMP_RF|COMP_POWER), "%s(): Turn off RF for RegRfOff ----------\n",__func__);
-               MgntActSet_RF_State(dev, eRfOff, RF_CHANGE_BY_SW,true);
+               RT_TRACE((COMP_INIT | COMP_RF | COMP_POWER),
+                         "%s(): Turn off RF for RegRfOff ----------\n",
+                         __func__);
+               MgntActSet_RF_State(dev, eRfOff, RF_CHANGE_BY_SW, true);
        } else if (priv->rtllib->RfOffReason > RF_CHANGE_BY_PS) {
-               RT_TRACE((COMP_INIT|COMP_RF|COMP_POWER), "%s(): Turn off RF for RfOffReason(%d) ----------\n", __func__,priv->rtllib->RfOffReason);
-               MgntActSet_RF_State(dev, eRfOff, priv->rtllib->RfOffReason,true);
+               RT_TRACE((COMP_INIT|COMP_RF|COMP_POWER), "%s(): Turn off RF for"
+                        " RfOffReason(%d) ----------\n", __func__,
+                        priv->rtllib->RfOffReason);
+               MgntActSet_RF_State(dev, eRfOff, priv->rtllib->RfOffReason,
+                                   true);
        } else if (priv->rtllib->RfOffReason >= RF_CHANGE_BY_IPS) {
-               RT_TRACE((COMP_INIT|COMP_RF|COMP_POWER), "%s(): Turn off RF for RfOffReason(%d) ----------\n", __func__,priv->rtllib->RfOffReason);
-               MgntActSet_RF_State(dev, eRfOff, priv->rtllib->RfOffReason,true);
+               RT_TRACE((COMP_INIT|COMP_RF|COMP_POWER), "%s(): Turn off RF for"
+                        " RfOffReason(%d) ----------\n", __func__,
+                        priv->rtllib->RfOffReason);
+               MgntActSet_RF_State(dev, eRfOff, priv->rtllib->RfOffReason,
+                                   true);
        } else {
-               RT_TRACE((COMP_INIT|COMP_RF|COMP_POWER), "%s(): RF-ON \n",__func__);
+               RT_TRACE((COMP_INIT|COMP_RF|COMP_POWER), "%s(): RF-ON\n",
+                         __func__);
                priv->rtllib->eRFPowerState = eRfOn;
                priv->rtllib->RfOffReason = 0;
-
-
        }
 
        if (priv->rtllib->FwRWRF)
@@ -899,37 +898,51 @@ start:
        else
                priv->Rf_Mode = RF_OP_By_SW_3wire;
 
-       if (priv->ResetProgress == RESET_TYPE_NORESET)
-       {
+       if (priv->ResetProgress == RESET_TYPE_NORESET) {
                dm_initialize_txpower_tracking(dev);
 
-               if (priv->IC_Cut>= IC_VersionCut_D) {
-                       tmpRegA= rtl8192_QueryBBReg(dev,rOFDM0_XATxIQImbalance,bMaskDWord);
-                       tmpRegC= rtl8192_QueryBBReg(dev,rOFDM0_XCTxIQImbalance,bMaskDWord);
-                       for (i = 0; i<TxBBGainTableLength; i++) {
-                               if (tmpRegA == priv->txbbgain_table[i].txbbgain_value) {
-                                       priv->rfa_txpowertrackingindex= (u8)i;
-                                       priv->rfa_txpowertrackingindex_real= (u8)i;
-                                       priv->rfa_txpowertracking_default = priv->rfa_txpowertrackingindex;
+               if (priv->IC_Cut >= IC_VersionCut_D) {
+                       tmpRegA = rtl8192_QueryBBReg(dev,
+                                 rOFDM0_XATxIQImbalance, bMaskDWord);
+                       tmpRegC = rtl8192_QueryBBReg(dev,
+                                 rOFDM0_XCTxIQImbalance, bMaskDWord);
+                       for (i = 0; i < TxBBGainTableLength; i++) {
+                               if (tmpRegA ==
+                                   priv->txbbgain_table[i].txbbgain_value) {
+                                       priv->rfa_txpowertrackingindex = (u8)i;
+                                       priv->rfa_txpowertrackingindex_real =
+                                                (u8)i;
+                                       priv->rfa_txpowertracking_default =
+                                                priv->rfa_txpowertrackingindex;
                                        break;
                                }
                        }
 
-                       TempCCk = rtl8192_QueryBBReg(dev, rCCK0_TxFilter1, bMaskByte2);
+                       TempCCk = rtl8192_QueryBBReg(dev,
+                                 rCCK0_TxFilter1, bMaskByte2);
 
                        for (i = 0; i < CCKTxBBGainTableLength; i++) {
                                if (TempCCk == priv->cck_txbbgain_table[i].ccktxbb_valuearray[0]) {
-                                       priv->CCKPresentAttentuation_20Mdefault =(u8) i;
+                                       priv->CCKPresentAttentuation_20Mdefault = (u8)i;
                                        break;
                                }
                        }
                        priv->CCKPresentAttentuation_40Mdefault = 0;
                        priv->CCKPresentAttentuation_difference = 0;
-                       priv->CCKPresentAttentuation = priv->CCKPresentAttentuation_20Mdefault;
-                       RT_TRACE(COMP_POWER_TRACKING, "priv->rfa_txpowertrackingindex_initial = %d\n", priv->rfa_txpowertrackingindex);
-                       RT_TRACE(COMP_POWER_TRACKING, "priv->rfa_txpowertrackingindex_real__initial = %d\n", priv->rfa_txpowertrackingindex_real);
-                       RT_TRACE(COMP_POWER_TRACKING, "priv->CCKPresentAttentuation_difference_initial = %d\n", priv->CCKPresentAttentuation_difference);
-                       RT_TRACE(COMP_POWER_TRACKING, "priv->CCKPresentAttentuation_initial = %d\n", priv->CCKPresentAttentuation);
+                       priv->CCKPresentAttentuation =
+                                 priv->CCKPresentAttentuation_20Mdefault;
+                       RT_TRACE(COMP_POWER_TRACKING, "priv->rfa_txpower"
+                                "trackingindex_initial = %d\n",
+                                priv->rfa_txpowertrackingindex);
+                       RT_TRACE(COMP_POWER_TRACKING, "priv->rfa_txpower"
+                                "trackingindex_real__initial = %d\n",
+                                priv->rfa_txpowertrackingindex_real);
+                       RT_TRACE(COMP_POWER_TRACKING, "priv->CCKPresent"
+                                "Attentuation_difference_initial = %d\n",
+                                 priv->CCKPresentAttentuation_difference);
+                       RT_TRACE(COMP_POWER_TRACKING, "priv->CCKPresent"
+                                "Attentuation_initial = %d\n",
+                                priv->CCKPresentAttentuation);
                        priv->btxpower_tracking = false;
                }
        }
@@ -951,8 +964,8 @@ void rtl8192_net_update(struct net_device *dev)
        rtl8192_config_rate(dev, &rate_config);
        priv->dot11CurrentPreambleMode = PREAMBLE_AUTO;
         priv->basic_rate = rate_config &= 0x15f;
-       write_nic_dword(dev,BSSIDR,((u32*)net->bssid)[0]);
-       write_nic_word(dev,BSSIDR+4,((u16*)net->bssid)[2]);
+       write_nic_dword(dev, BSSIDR, ((u32 *)net->bssid)[0]);
+       write_nic_word(dev, BSSIDR+4, ((u16 *)net->bssid)[2]);
 
        if (priv->rtllib->iw_mode == IW_MODE_ADHOC) {
                write_nic_word(dev, ATIMWND, 2);
@@ -971,15 +984,16 @@ void rtl8192_net_update(struct net_device *dev)
 void rtl8192_link_change(struct net_device *dev)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
-       struct rtllib_deviceieee = priv->rtllib;
+       struct rtllib_device *ieee = priv->rtllib;
 
        if (!priv->up)
-                return;
+               return;
 
        if (ieee->state == RTLLIB_LINKED) {
                rtl8192_net_update(dev);
                priv->ops->update_ratr_table(dev);
-               if ((KEY_TYPE_WEP40 == ieee->pairwise_key_type) || (KEY_TYPE_WEP104 == ieee->pairwise_key_type))
+               if ((KEY_TYPE_WEP40 == ieee->pairwise_key_type) ||
+                   (KEY_TYPE_WEP104 == ieee->pairwise_key_type))
                        EnableHWSecurityConfig8192(dev);
        } else {
                write_nic_byte(dev, 0x173, 0);
@@ -991,8 +1005,8 @@ void rtl8192_link_change(struct net_device *dev)
                reg = read_nic_dword(dev, RCR);
                if (priv->rtllib->state == RTLLIB_LINKED) {
                        if (ieee->IntelPromiscuousModeInfo.bPromiscuousOn)
-                               ;
-                       else
+                               ;
+                       else
                                priv->ReceiveConfig = reg |= RCR_CBSSID;
                } else
                        priv->ReceiveConfig = reg &= ~RCR_CBSSID;
@@ -1001,21 +1015,20 @@ void rtl8192_link_change(struct net_device *dev)
        }
 }
 
-void rtl8192_AllowAllDestAddr(struct net_devicedev,
-                        bool bAllowAllDA, bool WriteIntoReg)
+void rtl8192_AllowAllDestAddr(struct net_device *dev,
+                             bool bAllowAllDA, bool WriteIntoReg)
 {
-        struct r8192_priv * priv = rtllib_priv(dev);
+       struct r8192_priv *priv = rtllib_priv(dev);
 
-        if (bAllowAllDA)
-                priv->ReceiveConfig |= RCR_AAP;
-        else
-                priv->ReceiveConfig &= ~RCR_AAP;
+       if (bAllowAllDA)
+               priv->ReceiveConfig |= RCR_AAP;
+       else
+               priv->ReceiveConfig &= ~RCR_AAP;
 
-        if (WriteIntoReg)
-                write_nic_dword( dev, RCR, priv->ReceiveConfig );
+       if (WriteIntoReg)
+               write_nic_dword(dev, RCR, priv->ReceiveConfig);
 }
 
-
 static u8 MRateToHwRate8190Pci(u8 rate)
 {
        u8  ret = DESC90_RATE1M;
@@ -1148,138 +1161,144 @@ u8 rtl8192_MapHwQueueToFirmwareQueue(u8 QueueID, u8 priority)
                break;
        default:
                RT_TRACE(COMP_ERR, "TransmitTCB(): Impossible Queue Selection:"
-                        " %d \n", QueueID);
+                        " %d\n", QueueID);
                break;
        }
        return QueueSelect;
 }
 
-
-void  rtl8192_tx_fill_desc(struct net_device* dev, struct tx_desc * pdesc, struct cb_desc *cb_desc, struct sk_buff* skb)
+void  rtl8192_tx_fill_desc(struct net_device *dev, struct tx_desc *pdesc,
+                          struct cb_desc *cb_desc, struct sk_buff *skb)
 {
-    struct r8192_priv *priv = rtllib_priv(dev);
-    dma_addr_t mapping = pci_map_single(priv->pdev, skb->data, skb->len, PCI_DMA_TODEVICE);
-    struct tx_fwinfo_8190pci *pTxFwInfo = NULL;
-    pTxFwInfo = (struct tx_fwinfo_8190pci *)skb->data;
-    memset(pTxFwInfo,0,sizeof(struct tx_fwinfo_8190pci));
-    pTxFwInfo->TxHT = (cb_desc->data_rate&0x80)?1:0;
-    pTxFwInfo->TxRate = MRateToHwRate8190Pci((u8)cb_desc->data_rate);
-    pTxFwInfo->EnableCPUDur = cb_desc->bTxEnableFwCalcDur;
-    pTxFwInfo->Short   = rtl8192_QueryIsShort(pTxFwInfo->TxHT, pTxFwInfo->TxRate, cb_desc);
-
-    if (cb_desc->bAMPDUEnable) {
-        pTxFwInfo->AllowAggregation = 1;
-        pTxFwInfo->RxMF = cb_desc->ampdu_factor;
-        pTxFwInfo->RxAMD = cb_desc->ampdu_density;
-    } else {
-        pTxFwInfo->AllowAggregation = 0;
-        pTxFwInfo->RxMF = 0;
-        pTxFwInfo->RxAMD = 0;
-    }
-
-    pTxFwInfo->RtsEnable =     (cb_desc->bRTSEnable)?1:0;
-    pTxFwInfo->CtsEnable =     (cb_desc->bCTSEnable)?1:0;
-    pTxFwInfo->RtsSTBC =       (cb_desc->bRTSSTBC)?1:0;
-    pTxFwInfo->RtsHT=          (cb_desc->rts_rate&0x80)?1:0;
-    pTxFwInfo->RtsRate =               MRateToHwRate8190Pci((u8)cb_desc->rts_rate);
-    pTxFwInfo->RtsBandwidth = 0;
-    pTxFwInfo->RtsSubcarrier = cb_desc->RTSSC;
-    pTxFwInfo->RtsShort =      (pTxFwInfo->RtsHT==0)?(cb_desc->bRTSUseShortPreamble?1:0):(cb_desc->bRTSUseShortGI?1:0);
-    if (priv->CurrentChannelBW == HT_CHANNEL_WIDTH_20_40)
-    {
-        if (cb_desc->bPacketBW)
-        {
-            pTxFwInfo->TxBandwidth = 1;
-            pTxFwInfo->TxSubCarrier = 0;
-        }
-        else
-        {
-            pTxFwInfo->TxBandwidth = 0;
-            pTxFwInfo->TxSubCarrier = priv->nCur40MhzPrimeSC;
-        }
-    } else {
-        pTxFwInfo->TxBandwidth = 0;
-        pTxFwInfo->TxSubCarrier = 0;
-    }
-
-    memset((u8*)pdesc,0,12);
-    pdesc->LINIP = 0;
-    pdesc->CmdInit = 1;
-    pdesc->Offset = sizeof(struct tx_fwinfo_8190pci) + 8;
-    pdesc->PktSize = (u16)skb->len-sizeof(struct tx_fwinfo_8190pci);
-
-    pdesc->SecCAMID= 0;
-    pdesc->RATid = cb_desc->RATRIndex;
-
-
-    pdesc->NoEnc = 1;
-    pdesc->SecType = 0x0;
-    if (cb_desc->bHwSec) {
-        static u8 tmp =0;
-        if (!tmp) {
-            RT_TRACE(COMP_DBG, "==>================hw sec\n");
-            tmp = 1;
-        }
-        switch (priv->rtllib->pairwise_key_type) {
-            case KEY_TYPE_WEP40:
-            case KEY_TYPE_WEP104:
-                pdesc->SecType = 0x1;
-                pdesc->NoEnc = 0;
-                break;
-            case KEY_TYPE_TKIP:
-                pdesc->SecType = 0x2;
-                pdesc->NoEnc = 0;
-                break;
-            case KEY_TYPE_CCMP:
-                pdesc->SecType = 0x3;
-                pdesc->NoEnc = 0;
-                break;
-            case KEY_TYPE_NA:
-                pdesc->SecType = 0x0;
-                pdesc->NoEnc = 1;
-                break;
-        }
-    }
-
-    pdesc->PktId = 0x0;
-
-    pdesc->QueueSelect = rtl8192_MapHwQueueToFirmwareQueue(cb_desc->queue_index, cb_desc->priority);
-    pdesc->TxFWInfoSize = sizeof(struct tx_fwinfo_8190pci);
-
-    pdesc->DISFB = cb_desc->bTxDisableRateFallBack;
-    pdesc->USERATE = cb_desc->bTxUseDriverAssingedRate;
-
-    pdesc->FirstSeg =1;
-    pdesc->LastSeg = 1;
-    pdesc->TxBufferSize = skb->len;
-
-    pdesc->TxBuffAddr = cpu_to_le32(mapping);
+       struct r8192_priv *priv = rtllib_priv(dev);
+       dma_addr_t mapping = pci_map_single(priv->pdev, skb->data, skb->len,
+                        PCI_DMA_TODEVICE);
+       struct tx_fwinfo_8190pci *pTxFwInfo = NULL;
+       pTxFwInfo = (struct tx_fwinfo_8190pci *)skb->data;
+       memset(pTxFwInfo, 0, sizeof(struct tx_fwinfo_8190pci));
+       pTxFwInfo->TxHT = (cb_desc->data_rate & 0x80) ? 1 : 0;
+       pTxFwInfo->TxRate = MRateToHwRate8190Pci((u8)cb_desc->data_rate);
+       pTxFwInfo->EnableCPUDur = cb_desc->bTxEnableFwCalcDur;
+       pTxFwInfo->Short = rtl8192_QueryIsShort(pTxFwInfo->TxHT,
+                                               pTxFwInfo->TxRate,
+                                               cb_desc);
+
+       if (cb_desc->bAMPDUEnable) {
+               pTxFwInfo->AllowAggregation = 1;
+               pTxFwInfo->RxMF = cb_desc->ampdu_factor;
+               pTxFwInfo->RxAMD = cb_desc->ampdu_density;
+       } else {
+               pTxFwInfo->AllowAggregation = 0;
+               pTxFwInfo->RxMF = 0;
+               pTxFwInfo->RxAMD = 0;
+       }
+
+       pTxFwInfo->RtsEnable =  (cb_desc->bRTSEnable) ? 1 : 0;
+       pTxFwInfo->CtsEnable = (cb_desc->bCTSEnable) ? 1 : 0;
+       pTxFwInfo->RtsSTBC = (cb_desc->bRTSSTBC) ? 1 : 0;
+       pTxFwInfo->RtsHT = (cb_desc->rts_rate&0x80) ? 1 : 0;
+       pTxFwInfo->RtsRate = MRateToHwRate8190Pci((u8)cb_desc->rts_rate);
+       pTxFwInfo->RtsBandwidth = 0;
+       pTxFwInfo->RtsSubcarrier = cb_desc->RTSSC;
+       pTxFwInfo->RtsShort = (pTxFwInfo->RtsHT == 0) ?
+                         (cb_desc->bRTSUseShortPreamble ? 1 : 0) :
+                         (cb_desc->bRTSUseShortGI ? 1 : 0);
+       if (priv->CurrentChannelBW == HT_CHANNEL_WIDTH_20_40) {
+               if (cb_desc->bPacketBW) {
+                       pTxFwInfo->TxBandwidth = 1;
+                       pTxFwInfo->TxSubCarrier = 0;
+               } else {
+                       pTxFwInfo->TxBandwidth = 0;
+                       pTxFwInfo->TxSubCarrier = priv->nCur40MhzPrimeSC;
+               }
+       } else {
+               pTxFwInfo->TxBandwidth = 0;
+               pTxFwInfo->TxSubCarrier = 0;
+       }
+
+       memset((u8 *)pdesc, 0, 12);
+       pdesc->LINIP = 0;
+       pdesc->CmdInit = 1;
+       pdesc->Offset = sizeof(struct tx_fwinfo_8190pci) + 8;
+       pdesc->PktSize = (u16)skb->len-sizeof(struct tx_fwinfo_8190pci);
+
+       pdesc->SecCAMID = 0;
+       pdesc->RATid = cb_desc->RATRIndex;
+
+
+       pdesc->NoEnc = 1;
+       pdesc->SecType = 0x0;
+       if (cb_desc->bHwSec) {
+               static u8 tmp;
+               if (!tmp) {
+                       RT_TRACE(COMP_DBG, "==>================hw sec\n");
+                       tmp = 1;
+               }
+               switch (priv->rtllib->pairwise_key_type) {
+               case KEY_TYPE_WEP40:
+               case KEY_TYPE_WEP104:
+                       pdesc->SecType = 0x1;
+                       pdesc->NoEnc = 0;
+                       break;
+               case KEY_TYPE_TKIP:
+                       pdesc->SecType = 0x2;
+                       pdesc->NoEnc = 0;
+                       break;
+               case KEY_TYPE_CCMP:
+                       pdesc->SecType = 0x3;
+                       pdesc->NoEnc = 0;
+                       break;
+               case KEY_TYPE_NA:
+                       pdesc->SecType = 0x0;
+                       pdesc->NoEnc = 1;
+                       break;
+               }
+       }
+
+       pdesc->PktId = 0x0;
+
+       pdesc->QueueSelect = rtl8192_MapHwQueueToFirmwareQueue(
+                                               cb_desc->queue_index,
+                                               cb_desc->priority);
+       pdesc->TxFWInfoSize = sizeof(struct tx_fwinfo_8190pci);
+
+       pdesc->DISFB = cb_desc->bTxDisableRateFallBack;
+       pdesc->USERATE = cb_desc->bTxUseDriverAssingedRate;
+
+       pdesc->FirstSeg = 1;
+       pdesc->LastSeg = 1;
+       pdesc->TxBufferSize = skb->len;
+
+       pdesc->TxBuffAddr = cpu_to_le32(mapping);
 }
 
-void  rtl8192_tx_fill_cmd_desc(struct net_device* dev, struct tx_desc_cmd * entry,
-               struct cb_desc *cb_desc, struct sk_buff* skb)
+void  rtl8192_tx_fill_cmd_desc(struct net_device *dev,
+                              struct tx_desc_cmd *entry,
+                              struct cb_desc *cb_desc, struct sk_buff* skb)
 {
-    struct r8192_priv *priv = rtllib_priv(dev);
-    dma_addr_t mapping = pci_map_single(priv->pdev, skb->data, skb->len, PCI_DMA_TODEVICE);
-
-    memset(entry,0,12);
-    entry->LINIP = cb_desc->bLastIniPkt;
-    entry->FirstSeg = 1;
-    entry->LastSeg = 1;
-    if (cb_desc->bCmdOrInit == DESC_PACKET_TYPE_INIT) {
-        entry->CmdInit = DESC_PACKET_TYPE_INIT;
-    } else {
-       struct tx_desc * entry_tmp = (struct tx_desc *)entry;
-        entry_tmp->CmdInit = DESC_PACKET_TYPE_NORMAL;
-        entry_tmp->Offset = sizeof(struct tx_fwinfo_8190pci) + 8;
-        entry_tmp->PktSize = (u16)(cb_desc->pkt_size + entry_tmp->Offset);
-        entry_tmp->QueueSelect = QSLT_CMD;
-        entry_tmp->TxFWInfoSize = 0x08;
-        entry_tmp->RATid = (u8)DESC_PACKET_TYPE_INIT;
-    }
-    entry->TxBufferSize = skb->len;
-    entry->TxBuffAddr = cpu_to_le32(mapping);
-    entry->OWN = 1;
+       struct r8192_priv *priv = rtllib_priv(dev);
+       dma_addr_t mapping = pci_map_single(priv->pdev, skb->data, skb->len,
+                        PCI_DMA_TODEVICE);
+
+       memset(entry, 0, 12);
+       entry->LINIP = cb_desc->bLastIniPkt;
+       entry->FirstSeg = 1;
+       entry->LastSeg = 1;
+       if (cb_desc->bCmdOrInit == DESC_PACKET_TYPE_INIT) {
+               entry->CmdInit = DESC_PACKET_TYPE_INIT;
+       } else {
+               struct tx_desc * entry_tmp = (struct tx_desc *)entry;
+               entry_tmp->CmdInit = DESC_PACKET_TYPE_NORMAL;
+               entry_tmp->Offset = sizeof(struct tx_fwinfo_8190pci) + 8;
+               entry_tmp->PktSize = (u16)(cb_desc->pkt_size +
+                                     entry_tmp->Offset);
+               entry_tmp->QueueSelect = QSLT_CMD;
+               entry_tmp->TxFWInfoSize = 0x08;
+               entry_tmp->RATid = (u8)DESC_PACKET_TYPE_INIT;
+       }
+       entry->TxBufferSize = skb->len;
+       entry->TxBuffAddr = cpu_to_le32(mapping);
+       entry->OWN = 1;
 }
 
 u8 HwRateToMRate90(bool bIsHT, u8 rate)
@@ -1288,156 +1307,193 @@ u8 HwRateToMRate90(bool bIsHT, u8 rate)
 
        if (!bIsHT) {
                switch (rate) {
-                       case DESC90_RATE1M:   ret_rate = MGN_1M;         break;
-                       case DESC90_RATE2M:   ret_rate = MGN_2M;         break;
-                       case DESC90_RATE5_5M: ret_rate = MGN_5_5M;       break;
-                       case DESC90_RATE11M:  ret_rate = MGN_11M;        break;
-                       case DESC90_RATE6M:   ret_rate = MGN_6M;         break;
-                       case DESC90_RATE9M:   ret_rate = MGN_9M;         break;
-                       case DESC90_RATE12M:  ret_rate = MGN_12M;        break;
-                       case DESC90_RATE18M:  ret_rate = MGN_18M;        break;
-                       case DESC90_RATE24M:  ret_rate = MGN_24M;        break;
-                       case DESC90_RATE36M:  ret_rate = MGN_36M;        break;
-                       case DESC90_RATE48M:  ret_rate = MGN_48M;        break;
-                       case DESC90_RATE54M:  ret_rate = MGN_54M;        break;
+               case DESC90_RATE1M:
+                       ret_rate = MGN_1M;
+                       break;
+               case DESC90_RATE2M:
+                       ret_rate = MGN_2M;
+                       break;
+               case DESC90_RATE5_5M:
+                       ret_rate = MGN_5_5M;
+                       break;
+               case DESC90_RATE11M:
+                       ret_rate = MGN_11M;
+                       break;
+               case DESC90_RATE6M:
+                       ret_rate = MGN_6M;
+                       break;
+               case DESC90_RATE9M:
+                       ret_rate = MGN_9M;
+                       break;
+               case DESC90_RATE12M:
+                       ret_rate = MGN_12M;
+                       break;
+               case DESC90_RATE18M:
+                       ret_rate = MGN_18M;
+                       break;
+               case DESC90_RATE24M:
+                       ret_rate = MGN_24M;
+                       break;
+               case DESC90_RATE36M:
+                       ret_rate = MGN_36M;
+                       break;
+               case DESC90_RATE48M:
+                       ret_rate = MGN_48M;
+                       break;
+               case DESC90_RATE54M:
+                       ret_rate = MGN_54M;
+                       break;
 
-                       default:
-                                             RT_TRACE(COMP_RECV, "HwRateToMRate90(): Non supported Rate [%x], bIsHT = %d!!!\n", rate, bIsHT);
-                                             break;
+               default:
+                       RT_TRACE(COMP_RECV, "HwRateToMRate90(): Non supported"
+                                "Rate [%x], bIsHT = %d!!!\n", rate, bIsHT);
+                                                 break;
                }
 
        } else {
                switch (rate) {
-                       case DESC90_RATEMCS0:   ret_rate = MGN_MCS0;    break;
-                       case DESC90_RATEMCS1:   ret_rate = MGN_MCS1;    break;
-                       case DESC90_RATEMCS2:   ret_rate = MGN_MCS2;    break;
-                       case DESC90_RATEMCS3:   ret_rate = MGN_MCS3;    break;
-                       case DESC90_RATEMCS4:   ret_rate = MGN_MCS4;    break;
-                       case DESC90_RATEMCS5:   ret_rate = MGN_MCS5;    break;
-                       case DESC90_RATEMCS6:   ret_rate = MGN_MCS6;    break;
-                       case DESC90_RATEMCS7:   ret_rate = MGN_MCS7;    break;
-                       case DESC90_RATEMCS8:   ret_rate = MGN_MCS8;    break;
-                       case DESC90_RATEMCS9:   ret_rate = MGN_MCS9;    break;
-                       case DESC90_RATEMCS10:  ret_rate = MGN_MCS10;   break;
-                       case DESC90_RATEMCS11:  ret_rate = MGN_MCS11;   break;
-                       case DESC90_RATEMCS12:  ret_rate = MGN_MCS12;   break;
-                       case DESC90_RATEMCS13:  ret_rate = MGN_MCS13;   break;
-                       case DESC90_RATEMCS14:  ret_rate = MGN_MCS14;   break;
-                       case DESC90_RATEMCS15:  ret_rate = MGN_MCS15;   break;
-                       case DESC90_RATEMCS32:  ret_rate = (0x80|0x20); break;
+               case DESC90_RATEMCS0:
+                       ret_rate = MGN_MCS0;
+                       break;
+               case DESC90_RATEMCS1:
+                       ret_rate = MGN_MCS1;
+                       break;
+               case DESC90_RATEMCS2:
+                       ret_rate = MGN_MCS2;
+                       break;
+               case DESC90_RATEMCS3:
+                       ret_rate = MGN_MCS3;
+                       break;
+               case DESC90_RATEMCS4:
+                       ret_rate = MGN_MCS4;
+                       break;
+               case DESC90_RATEMCS5:
+                       ret_rate = MGN_MCS5;
+                       break;
+               case DESC90_RATEMCS6:
+                       ret_rate = MGN_MCS6;
+                       break;
+               case DESC90_RATEMCS7:
+                       ret_rate = MGN_MCS7;
+                       break;
+               case DESC90_RATEMCS8:
+                       ret_rate = MGN_MCS8;
+                       break;
+               case DESC90_RATEMCS9:
+                       ret_rate = MGN_MCS9;
+                       break;
+               case DESC90_RATEMCS10:
+                       ret_rate = MGN_MCS10;
+                       break;
+               case DESC90_RATEMCS11:
+                       ret_rate = MGN_MCS11;
+                       break;
+               case DESC90_RATEMCS12:
+                       ret_rate = MGN_MCS12;
+                       break;
+               case DESC90_RATEMCS13:
+                       ret_rate = MGN_MCS13;
+                       break;
+               case DESC90_RATEMCS14:
+                       ret_rate = MGN_MCS14;
+                       break;
+               case DESC90_RATEMCS15:
+                       ret_rate = MGN_MCS15;
+                       break;
+               case DESC90_RATEMCS32:
+                       ret_rate = (0x80|0x20);
+                       break;
 
-                       default:
-                                               RT_TRACE(COMP_RECV, "HwRateToMRate90(): Non supported Rate [%x], bIsHT = %d!!!\n",rate, bIsHT);
-                                               break;
+               default:
+                       RT_TRACE(COMP_RECV, "HwRateToMRate90(): Non supported "
+                                "Rate [%x], bIsHT = %d!!!\n", rate, bIsHT);
+                       break;
                }
        }
 
        return ret_rate;
 }
 
-long
-rtl8192_signal_scale_mapping(struct r8192_priv * priv,
-       long currsig
-       )
+long rtl8192_signal_scale_mapping(struct r8192_priv *priv, long currsig)
 {
        long retsig;
 
        if (currsig >= 61 && currsig <= 100)
-       {
                retsig = 90 + ((currsig - 60) / 4);
-       }
        else if (currsig >= 41 && currsig <= 60)
-       {
                retsig = 78 + ((currsig - 40) / 2);
-       }
        else if (currsig >= 31 && currsig <= 40)
-       {
                retsig = 66 + (currsig - 30);
-       }
        else if (currsig >= 21 && currsig <= 30)
-       {
                retsig = 54 + (currsig - 20);
-       }
        else if (currsig >= 5 && currsig <= 20)
-       {
                retsig = 42 + (((currsig - 5) * 2) / 3);
-       }
        else if (currsig == 4)
-       {
                retsig = 36;
-       }
        else if (currsig == 3)
-       {
                retsig = 27;
-       }
        else if (currsig == 2)
-       {
                retsig = 18;
-       }
        else if (currsig == 1)
-       {
                retsig = 9;
-       }
        else
-       {
                retsig = currsig;
-       }
 
        return retsig;
 }
 
 
-#define                rx_hal_is_cck_rate(_pdrvinfo)\
-                       (_pdrvinfo->RxRate == DESC90_RATE1M ||\
+#define         rx_hal_is_cck_rate(_pdrvinfo)\
+                       ((_pdrvinfo->RxRate == DESC90_RATE1M ||\
                        _pdrvinfo->RxRate == DESC90_RATE2M ||\
                        _pdrvinfo->RxRate == DESC90_RATE5_5M ||\
                        _pdrvinfo->RxRate == DESC90_RATE11M) &&\
-                       !_pdrvinfo->RxHT
+                       !_pdrvinfo->RxHT)
+
 void rtl8192_query_rxphystatus(
-       struct r8192_priv * priv,
-       struct rtllib_rx_stats * pstats,
+       struct r8192_priv *priv,
+       struct rtllib_rx_stats *pstats,
        struct rx_desc  *pdesc,
        struct rx_fwinfo   *pdrvinfo,
-       struct rtllib_rx_stats * precord_stats,
+       struct rtllib_rx_stats *precord_stats,
        bool bpacket_match_bssid,
        bool bpacket_toself,
        bool bPacketBeacon,
        bool bToSelfBA
        )
 {
-       struct phy_sts_ofdm_819xpci* pofdm_buf;
-       struct phy_sts_cck_819xpci *    pcck_buf;
-       struct phy_ofdm_rx_status_rxsc_sgien_exintfflag * prxsc;
-       u8                              *prxpkt;
-       u8                              i,max_spatial_stream, tmp_rxsnr, tmp_rxevm, rxsc_sgien_exflg;
-       char                            rx_pwr[4], rx_pwr_all=0;
-       char                            rx_snrX, rx_evmX;
-       u8                              evm, pwdb_all;
-       u32                     RSSI, total_rssi=0;
-       u8                              is_cck_rate=0;
-       u8                              rf_rx_num = 0;
-
-       static  u8              check_reg824 = 0;
-       static  u32             reg824_bit9 = 0;
+       struct phy_sts_ofdm_819xpci *pofdm_buf;
+       struct phy_sts_cck_819xpci *pcck_buf;
+       struct phy_ofdm_rx_status_rxsc_sgien_exintfflag *prxsc;
+       u8 *prxpkt;
+       u8 i, max_spatial_stream, tmp_rxsnr, tmp_rxevm, rxsc_sgien_exflg;
+       char rx_pwr[4], rx_pwr_all = 0;
+       char rx_snrX, rx_evmX;
+       u8 evm, pwdb_all;
+       u32 RSSI, total_rssi = 0;
+       u8 is_cck_rate = 0;
+       u8 rf_rx_num = 0;
+       static  u8 check_reg824;
+       static  u32 reg824_bit9;
 
        priv->stats.numqry_phystatus++;
 
-
        is_cck_rate = rx_hal_is_cck_rate(pdrvinfo);
        memset(precord_stats, 0, sizeof(struct rtllib_rx_stats));
-       pstats->bPacketMatchBSSID = precord_stats->bPacketMatchBSSID = bpacket_match_bssid;
+       pstats->bPacketMatchBSSID = precord_stats->bPacketMatchBSSID =
+                                   bpacket_match_bssid;
        pstats->bPacketToSelf = precord_stats->bPacketToSelf = bpacket_toself;
        pstats->bIsCCK = precord_stats->bIsCCK = is_cck_rate;
        pstats->bPacketBeacon = precord_stats->bPacketBeacon = bPacketBeacon;
        pstats->bToSelfBA = precord_stats->bToSelfBA = bToSelfBA;
-       if (check_reg824 == 0)
-       {
-               reg824_bit9 = rtl8192_QueryBBReg(priv->rtllib->dev, rFPGA0_XA_HSSIParameter2, 0x200);
+       if (check_reg824 == 0) {
+               reg824_bit9 = rtl8192_QueryBBReg(priv->rtllib->dev,
+                             rFPGA0_XA_HSSIParameter2, 0x200);
                check_reg824 = 1;
        }
 
 
-       prxpkt = (u8*)pdrvinfo;
+       prxpkt = (u8 *)pdrvinfo;
 
        prxpkt += sizeof(struct rx_fwinfo);
 
@@ -1449,50 +1505,54 @@ void rtl8192_query_rxphystatus(
        precord_stats->RxMIMOSignalQuality[0] = -1;
        precord_stats->RxMIMOSignalQuality[1] = -1;
 
-       if (is_cck_rate)
-       {
-
+       if (is_cck_rate) {
                u8 report;
 
                priv->stats.numqry_phystatusCCK++;
-               if (!reg824_bit9)
-               {
+               if (!reg824_bit9) {
                        report = pcck_buf->cck_agc_rpt & 0xc0;
                        report = report>>6;
-                       switch (report)
-                       {
-                               case 0x3:
-                                       rx_pwr_all = -35 - (pcck_buf->cck_agc_rpt & 0x3e);
-                                       break;
-                               case 0x2:
-                                       rx_pwr_all = -23 - (pcck_buf->cck_agc_rpt & 0x3e);
-                                       break;
-                               case 0x1:
-                                       rx_pwr_all = -11 - (pcck_buf->cck_agc_rpt & 0x3e);
-                                       break;
-                               case 0x0:
-                                       rx_pwr_all = 8 - (pcck_buf->cck_agc_rpt & 0x3e);
-                                       break;
+                       switch (report) {
+                       case 0x3:
+                               rx_pwr_all = -35 - (pcck_buf->cck_agc_rpt &
+                                            0x3e);
+                               break;
+                       case 0x2:
+                               rx_pwr_all = -23 - (pcck_buf->cck_agc_rpt &
+                                            0x3e);
+                               break;
+                       case 0x1:
+                               rx_pwr_all = -11 - (pcck_buf->cck_agc_rpt &
+                                            0x3e);
+                               break;
+                       case 0x0:
+                               rx_pwr_all = 8 - (pcck_buf->cck_agc_rpt & 0x3e);
+                               break;
                        }
-               }
-               else
-               {
+               } else {
                        report = pcck_buf->cck_agc_rpt & 0x60;
                        report = report>>5;
-                       switch (report)
-                       {
-                               case 0x3:
-                                       rx_pwr_all = -35 - ((pcck_buf->cck_agc_rpt & 0x1f)<<1) ;
-                                       break;
-                               case 0x2:
-                                       rx_pwr_all = -23 - ((pcck_buf->cck_agc_rpt & 0x1f)<<1);
-                                       break;
-                               case 0x1:
-                                       rx_pwr_all = -11 - ((pcck_buf->cck_agc_rpt & 0x1f)<<1) ;
-                                       break;
-                               case 0x0:
-                                       rx_pwr_all = -8 - ((pcck_buf->cck_agc_rpt & 0x1f)<<1) ;
-                                       break;
+                       switch (report) {
+                       case 0x3:
+                               rx_pwr_all = -35 -
+                                       ((pcck_buf->cck_agc_rpt &
+                                       0x1f) << 1);
+                               break;
+                       case 0x2:
+                               rx_pwr_all = -23 -
+                                       ((pcck_buf->cck_agc_rpt &
+                                        0x1f) << 1);
+                               break;
+                       case 0x1:
+                               rx_pwr_all = -11 -
+                                        ((pcck_buf->cck_agc_rpt &
+                                        0x1f) << 1);
+                               break;
+                       case 0x0:
+                               rx_pwr_all = -8 -
+                                        ((pcck_buf->cck_agc_rpt &
+                                        0x1f) << 1);
+                               break;
                        }
                }
 
@@ -1500,15 +1560,12 @@ void rtl8192_query_rxphystatus(
                pstats->RxPWDBAll = precord_stats->RxPWDBAll = pwdb_all;
                pstats->RecvSignalPower = rx_pwr_all;
 
-               if (bpacket_match_bssid)
-               {
+               if (bpacket_match_bssid) {
                        u8      sq;
 
-                       if (pstats->RxPWDBAll > 40)
-                       {
+                       if (pstats->RxPWDBAll > 40) {
                                sq = 100;
-                       }else
-                       {
+                       } else {
                                sq = pcck_buf->sq_rpt;
 
                                if (pcck_buf->sq_rpt > 64)
@@ -1518,20 +1575,21 @@ void rtl8192_query_rxphystatus(
                                else
                                        sq = ((64-sq) * 100) / 44;
                        }
-                       pstats->SignalQuality = precord_stats->SignalQuality = sq;
-                       pstats->RxMIMOSignalQuality[0] = precord_stats->RxMIMOSignalQuality[0] = sq;
-                       pstats->RxMIMOSignalQuality[1] = precord_stats->RxMIMOSignalQuality[1] = -1;
+                       pstats->SignalQuality = sq;
+                       precord_stats->SignalQuality = sq;
+                       pstats->RxMIMOSignalQuality[0] = sq;
+                       precord_stats->RxMIMOSignalQuality[0] = sq;
+                       pstats->RxMIMOSignalQuality[1] = -1;
+                       precord_stats->RxMIMOSignalQuality[1] = -1;
                }
-       }
-       else
-       {
+       } else {
                priv->stats.numqry_phystatusHT++;
-               for (i=RF90_PATH_A; i<RF90_PATH_MAX; i++)
-               {
+               for (i = RF90_PATH_A; i < RF90_PATH_MAX; i++) {
                        if (priv->brfpath_rxenable[i])
                                rf_rx_num++;
 
-                       rx_pwr[i] = ((pofdm_buf->trsw_gain_X[i]&0x3F)*2) - 110;
+                       rx_pwr[i] = ((pofdm_buf->trsw_gain_X[i] & 0x3F) *
+                                    2) - 110;
 
                        tmp_rxsnr = pofdm_buf->rxsnr_X[i];
                        rx_snrX = (char)(tmp_rxsnr);
@@ -1542,284 +1600,294 @@ void rtl8192_query_rxphystatus(
                        if (priv->brfpath_rxenable[i])
                                total_rssi += RSSI;
 
-                       if (bpacket_match_bssid)
-                       {
-                               pstats->RxMIMOSignalStrength[i] =(u8) RSSI;
-                               precord_stats->RxMIMOSignalStrength[i] =(u8) RSSI;
+                       if (bpacket_match_bssid) {
+                               pstats->RxMIMOSignalStrength[i] = (u8) RSSI;
+                               precord_stats->RxMIMOSignalStrength[i] =
+                                                               (u8) RSSI;
                        }
                }
 
 
-               rx_pwr_all = (((pofdm_buf->pwdb_all ) >> 1 )& 0x7f) -106;
+               rx_pwr_all = (((pofdm_buf->pwdb_all) >> 1) & 0x7f) - 106;
                pwdb_all = rtl819x_query_rxpwrpercentage(rx_pwr_all);
 
                pstats->RxPWDBAll = precord_stats->RxPWDBAll = pwdb_all;
                pstats->RxPower = precord_stats->RxPower =      rx_pwr_all;
                pstats->RecvSignalPower = rx_pwr_all;
-               if (pdrvinfo->RxHT && pdrvinfo->RxRate>=DESC90_RATEMCS8 &&
-                       pdrvinfo->RxRate<=DESC90_RATEMCS15)
+               if (pdrvinfo->RxHT && pdrvinfo->RxRate >= DESC90_RATEMCS8 &&
+                   pdrvinfo->RxRate <= DESC90_RATEMCS15)
                        max_spatial_stream = 2;
                else
                        max_spatial_stream = 1;
 
-               for (i=0; i<max_spatial_stream; i++)
-               {
+               for (i = 0; i < max_spatial_stream; i++) {
                        tmp_rxevm = pofdm_buf->rxevm_X[i];
                        rx_evmX = (char)(tmp_rxevm);
 
                        rx_evmX /= 2;
 
                        evm = rtl819x_evm_dbtopercentage(rx_evmX);
-                       if (bpacket_match_bssid)
-                       {
-                               if (i==0)
-                                       pstats->SignalQuality = precord_stats->SignalQuality = (u8)(evm & 0xff);
-                               pstats->RxMIMOSignalQuality[i] = precord_stats->RxMIMOSignalQuality[i] = (u8)(evm & 0xff);
+                       if (bpacket_match_bssid) {
+                               if (i == 0) {
+                                       pstats->SignalQuality = (u8)(evm &
+                                                                0xff);
+                                       precord_stats->SignalQuality = (u8)(evm
+                                                                       & 0xff);
+                               }
+                               pstats->RxMIMOSignalQuality[i] = (u8)(evm &
+                                                                0xff);
+                               precord_stats->RxMIMOSignalQuality[i] = (u8)(evm
+                                                                       & 0xff);
                        }
                }
 
 
                rxsc_sgien_exflg = pofdm_buf->rxsc_sgien_exflg;
-               prxsc = (struct phy_ofdm_rx_status_rxsc_sgien_exintfflag *)&rxsc_sgien_exflg;
+               prxsc = (struct phy_ofdm_rx_status_rxsc_sgien_exintfflag *)
+                       &rxsc_sgien_exflg;
                if (pdrvinfo->BW)
                        priv->stats.received_bwtype[1+prxsc->rxsc]++;
                else
                        priv->stats.received_bwtype[0]++;
        }
 
-       if (is_cck_rate)
-       {
-               pstats->SignalStrength = precord_stats->SignalStrength = (u8)(rtl8192_signal_scale_mapping(priv,(long)pwdb_all));
+       if (is_cck_rate) {
+               pstats->SignalStrength = precord_stats->SignalStrength =
+                                        (u8)(rtl8192_signal_scale_mapping(priv,
+                                        (long)pwdb_all));
 
-       }
-       else
-       {
+       } else {
                if (rf_rx_num != 0)
-                       pstats->SignalStrength = precord_stats->SignalStrength = (u8)(rtl8192_signal_scale_mapping(priv,(long)(total_rssi/=rf_rx_num)));
+                       pstats->SignalStrength = precord_stats->SignalStrength =
+                                        (u8)(rtl8192_signal_scale_mapping(priv,
+                                        (long)(total_rssi /= rf_rx_num)));
        }
 }
 
-void rtl8192_process_phyinfo(struct r8192_priv * priv, u8 *buffer,struct rtllib_rx_stats * pprevious_stats, struct rtllib_rx_stats * pcurrent_stats)
+void rtl8192_process_phyinfo(struct r8192_priv *priv, u8 *buffer,
+                            struct rtllib_rx_stats *prev_st,
+                            struct rtllib_rx_stats *curr_st)
 {
        bool bcheck = false;
        u8      rfpath;
-       u32 nspatial_stream, tmp_val;
-       static u32 slide_rssi_index=0, slide_rssi_statistics=0;
-       static u32 slide_evm_index=0, slide_evm_statistics=0;
-       static u32 last_rssi=0, last_evm=0;
-       static u32 slide_beacon_adc_pwdb_index=0, slide_beacon_adc_pwdb_statistics=0;
-       static u32 last_beacon_adc_pwdb=0;
-
+       u32 ij, tmp_val;
+       static u32 slide_rssi_index, slide_rssi_statistics;
+       static u32 slide_evm_index, slide_evm_statistics;
+       static u32 last_rssi, last_evm;
+       static u32 slide_beacon_adc_pwdb_index;
+       static u32 slide_beacon_adc_pwdb_statistics;
+       static u32 last_beacon_adc_pwdb;
        struct rtllib_hdr_3addr *hdr;
-       u16 sc ;
-       unsigned int frag,seq;
+       u16 sc;
+       unsigned int frag, seq;
+
        hdr = (struct rtllib_hdr_3addr *)buffer;
        sc = le16_to_cpu(hdr->seq_ctl);
        frag = WLAN_GET_SEQ_FRAG(sc);
        seq = WLAN_GET_SEQ_SEQ(sc);
-       pcurrent_stats->Seq_Num = seq;
-       if (!pprevious_stats->bIsAMPDU)
+       curr_st->Seq_Num = seq;
+       if (!prev_st->bIsAMPDU)
                bcheck = true;
 
-       if (slide_rssi_statistics++ >= PHY_RSSI_SLID_WIN_MAX)
-       {
+       if (slide_rssi_statistics++ >= PHY_RSSI_SLID_WIN_MAX) {
                slide_rssi_statistics = PHY_RSSI_SLID_WIN_MAX;
                last_rssi = priv->stats.slide_signal_strength[slide_rssi_index];
                priv->stats.slide_rssi_total -= last_rssi;
        }
-       priv->stats.slide_rssi_total += pprevious_stats->SignalStrength;
+       priv->stats.slide_rssi_total += prev_st->SignalStrength;
 
-       priv->stats.slide_signal_strength[slide_rssi_index++] = pprevious_stats->SignalStrength;
+       priv->stats.slide_signal_strength[slide_rssi_index++] =
+                                        prev_st->SignalStrength;
        if (slide_rssi_index >= PHY_RSSI_SLID_WIN_MAX)
                slide_rssi_index = 0;
 
        tmp_val = priv->stats.slide_rssi_total/slide_rssi_statistics;
-       priv->stats.signal_strength = rtl819x_translate_todbm(priv, (u8)tmp_val);
-       pcurrent_stats->rssi = priv->stats.signal_strength;
-       if (!pprevious_stats->bPacketMatchBSSID)
-       {
-               if (!pprevious_stats->bToSelfBA)
+       priv->stats.signal_strength = rtl819x_translate_todbm(priv,
+                                     (u8)tmp_val);
+       curr_st->rssi = priv->stats.signal_strength;
+       if (!prev_st->bPacketMatchBSSID) {
+               if (!prev_st->bToSelfBA)
                        return;
        }
 
        if (!bcheck)
                return;
 
-       rtl819x_process_cck_rxpathsel(priv,pprevious_stats);
+       rtl819x_process_cck_rxpathsel(priv, prev_st);
 
        priv->stats.num_process_phyinfo++;
-       if (!pprevious_stats->bIsCCK && pprevious_stats->bPacketToSelf)
-       {
-               for (rfpath = RF90_PATH_A; rfpath < RF90_PATH_C; rfpath++)
-               {
-                       if (!rtl8192_phy_CheckIsLegalRFPath(priv->rtllib->dev, rfpath))
+       if (!prev_st->bIsCCK && prev_st->bPacketToSelf) {
+               for (rfpath = RF90_PATH_A; rfpath < RF90_PATH_C; rfpath++) {
+                       if (!rtl8192_phy_CheckIsLegalRFPath(priv->rtllib->dev,
+                           rfpath))
                                continue;
-                       RT_TRACE(COMP_DBG,"Jacken -> pPreviousstats->RxMIMOSignalStrength[rfpath]  = %d \n" ,pprevious_stats->RxMIMOSignalStrength[rfpath] );
-                       if (priv->stats.rx_rssi_percentage[rfpath] == 0)
-                       {
-                               priv->stats.rx_rssi_percentage[rfpath] = pprevious_stats->RxMIMOSignalStrength[rfpath];
-                       }
-                       if (pprevious_stats->RxMIMOSignalStrength[rfpath]  > priv->stats.rx_rssi_percentage[rfpath])
-                       {
+                       RT_TRACE(COMP_DBG, "Jacken -> pPreviousstats->RxMIMO"
+                                "SignalStrength[rfpath]  = %d\n",
+                                prev_st->RxMIMOSignalStrength[rfpath]);
+                       if (priv->stats.rx_rssi_percentage[rfpath] == 0) {
                                priv->stats.rx_rssi_percentage[rfpath] =
-                                       ( (priv->stats.rx_rssi_percentage[rfpath]*(RX_SMOOTH-1)) +
-                                       (pprevious_stats->RxMIMOSignalStrength[rfpath])) /(RX_SMOOTH);
-                               priv->stats.rx_rssi_percentage[rfpath] = priv->stats.rx_rssi_percentage[rfpath]  + 1;
+                                        prev_st->RxMIMOSignalStrength[rfpath];
                        }
-                       else
-                       {
+                       if (prev_st->RxMIMOSignalStrength[rfpath]  >
+                           priv->stats.rx_rssi_percentage[rfpath]) {
+                               priv->stats.rx_rssi_percentage[rfpath] =
+                                       ((priv->stats.rx_rssi_percentage[rfpath]
+                                       * (RX_SMOOTH - 1)) +
+                                       (prev_st->RxMIMOSignalStrength
+                                       [rfpath])) / (RX_SMOOTH);
                                priv->stats.rx_rssi_percentage[rfpath] =
-                                       ( (priv->stats.rx_rssi_percentage[rfpath]*(RX_SMOOTH-1)) +
-                                       (pprevious_stats->RxMIMOSignalStrength[rfpath])) /(RX_SMOOTH);
+                                        priv->stats.rx_rssi_percentage[rfpath]
+                                        + 1;
+                       } else {
+                               priv->stats.rx_rssi_percentage[rfpath] =
+                                  ((priv->stats.rx_rssi_percentage[rfpath] *
+                                  (RX_SMOOTH-1)) +
+                                  (prev_st->RxMIMOSignalStrength[rfpath])) /
+                                  (RX_SMOOTH);
                        }
-                       RT_TRACE(COMP_DBG,"Jacken -> priv->RxStats.RxRSSIPercentage[rfPath]  = %d \n" ,priv->stats.rx_rssi_percentage[rfpath] );
+                       RT_TRACE(COMP_DBG, "Jacken -> priv->RxStats.RxRSSI"
+                                "Percentage[rfPath]  = %d\n",
+                                priv->stats.rx_rssi_percentage[rfpath]);
                }
        }
 
 
-       if (pprevious_stats->bPacketBeacon)
-       {
-               if (slide_beacon_adc_pwdb_statistics++ >= PHY_Beacon_RSSI_SLID_WIN_MAX)
-               {
-                       slide_beacon_adc_pwdb_statistics = PHY_Beacon_RSSI_SLID_WIN_MAX;
-                       last_beacon_adc_pwdb = priv->stats.Slide_Beacon_pwdb[slide_beacon_adc_pwdb_index];
+       if (prev_st->bPacketBeacon) {
+               if (slide_beacon_adc_pwdb_statistics++ >=
+                   PHY_Beacon_RSSI_SLID_WIN_MAX) {
+                       slide_beacon_adc_pwdb_statistics =
+                                        PHY_Beacon_RSSI_SLID_WIN_MAX;
+                       last_beacon_adc_pwdb = priv->stats.Slide_Beacon_pwdb
+                                              [slide_beacon_adc_pwdb_index];
                        priv->stats.Slide_Beacon_Total -= last_beacon_adc_pwdb;
                }
-               priv->stats.Slide_Beacon_Total += pprevious_stats->RxPWDBAll;
-               priv->stats.Slide_Beacon_pwdb[slide_beacon_adc_pwdb_index] = pprevious_stats->RxPWDBAll;
+               priv->stats.Slide_Beacon_Total += prev_st->RxPWDBAll;
+               priv->stats.Slide_Beacon_pwdb[slide_beacon_adc_pwdb_index] =
+                                                        prev_st->RxPWDBAll;
                slide_beacon_adc_pwdb_index++;
                if (slide_beacon_adc_pwdb_index >= PHY_Beacon_RSSI_SLID_WIN_MAX)
                        slide_beacon_adc_pwdb_index = 0;
-               pprevious_stats->RxPWDBAll = priv->stats.Slide_Beacon_Total/slide_beacon_adc_pwdb_statistics;
-               if (pprevious_stats->RxPWDBAll >= 3)
-                       pprevious_stats->RxPWDBAll -= 3;
+               prev_st->RxPWDBAll = priv->stats.Slide_Beacon_Total /
+                                    slide_beacon_adc_pwdb_statistics;
+               if (prev_st->RxPWDBAll >= 3)
+                       prev_st->RxPWDBAll -= 3;
        }
 
        RT_TRACE(COMP_RXDESC, "Smooth %s PWDB = %d\n",
-                               pprevious_stats->bIsCCK? "CCK": "OFDM",
-                               pprevious_stats->RxPWDBAll);
+                               prev_st->bIsCCK ? "CCK" : "OFDM",
+                               prev_st->RxPWDBAll);
 
-       if (pprevious_stats->bPacketToSelf || pprevious_stats->bPacketBeacon || pprevious_stats->bToSelfBA)
-       {
+       if (prev_st->bPacketToSelf || prev_st->bPacketBeacon ||
+           prev_st->bToSelfBA) {
                if (priv->undecorated_smoothed_pwdb < 0)
-               {
-                       priv->undecorated_smoothed_pwdb = pprevious_stats->RxPWDBAll;
-               }
-               if (pprevious_stats->RxPWDBAll > (u32)priv->undecorated_smoothed_pwdb)
-               {
+                       priv->undecorated_smoothed_pwdb = prev_st->RxPWDBAll;
+               if (prev_st->RxPWDBAll > (u32)priv->undecorated_smoothed_pwdb) {
                        priv->undecorated_smoothed_pwdb =
-                                       ( ((priv->undecorated_smoothed_pwdb)*(RX_SMOOTH-1)) +
-                                       (pprevious_stats->RxPWDBAll)) /(RX_SMOOTH);
-                       priv->undecorated_smoothed_pwdb = priv->undecorated_smoothed_pwdb + 1;
-               }
-               else
-               {
+                                       (((priv->undecorated_smoothed_pwdb) *
+                                       (RX_SMOOTH-1)) +
+                                       (prev_st->RxPWDBAll)) / (RX_SMOOTH);
+                       priv->undecorated_smoothed_pwdb =
+                                        priv->undecorated_smoothed_pwdb + 1;
+               } else {
                        priv->undecorated_smoothed_pwdb =
-                                       ( ((priv->undecorated_smoothed_pwdb)*(RX_SMOOTH-1)) +
-                                       (pprevious_stats->RxPWDBAll)) /(RX_SMOOTH);
+                                       (((priv->undecorated_smoothed_pwdb) *
+                                       (RX_SMOOTH-1)) +
+                                       (prev_st->RxPWDBAll)) / (RX_SMOOTH);
                }
-               rtl819x_update_rxsignalstatistics8190pci(priv,pprevious_stats);
+               rtl819x_update_rxsignalstatistics8190pci(priv, prev_st);
        }
 
-       if (pprevious_stats->SignalQuality == 0)
-       {
-       }
-       else
-       {
-               if (pprevious_stats->bPacketToSelf || pprevious_stats->bPacketBeacon || pprevious_stats->bToSelfBA){
-                       if (slide_evm_statistics++ >= PHY_RSSI_SLID_WIN_MAX){
+       if (prev_st->SignalQuality != 0) {
+               if (prev_st->bPacketToSelf || prev_st->bPacketBeacon ||
+                   prev_st->bToSelfBA) {
+                       if (slide_evm_statistics++ >= PHY_RSSI_SLID_WIN_MAX) {
                                slide_evm_statistics = PHY_RSSI_SLID_WIN_MAX;
-                               last_evm = priv->stats.slide_evm[slide_evm_index];
+                               last_evm =
+                                        priv->stats.slide_evm[slide_evm_index];
                                priv->stats.slide_evm_total -= last_evm;
                        }
 
-                       priv->stats.slide_evm_total += pprevious_stats->SignalQuality;
+                       priv->stats.slide_evm_total += prev_st->SignalQuality;
 
-                       priv->stats.slide_evm[slide_evm_index++] = pprevious_stats->SignalQuality;
+                       priv->stats.slide_evm[slide_evm_index++] =
+                                                prev_st->SignalQuality;
                        if (slide_evm_index >= PHY_RSSI_SLID_WIN_MAX)
                                slide_evm_index = 0;
 
-                       tmp_val = priv->stats.slide_evm_total/slide_evm_statistics;
+                       tmp_val = priv->stats.slide_evm_total /
+                                 slide_evm_statistics;
                        priv->stats.signal_quality = tmp_val;
                        priv->stats.last_signal_strength_inpercent = tmp_val;
                }
 
-               if (pprevious_stats->bPacketToSelf || pprevious_stats->bPacketBeacon || pprevious_stats->bToSelfBA)
-               {
-                       for (nspatial_stream = 0; nspatial_stream<2 ; nspatial_stream++)
-                       {
-                               if (pprevious_stats->RxMIMOSignalQuality[nspatial_stream] != -1)
-                               {
-                                       if (priv->stats.rx_evm_percentage[nspatial_stream] == 0)
-                                       {
-                                               priv->stats.rx_evm_percentage[nspatial_stream] = pprevious_stats->RxMIMOSignalQuality[nspatial_stream];
-                                       }
-                                       priv->stats.rx_evm_percentage[nspatial_stream] =
-                                               ( (priv->stats.rx_evm_percentage[nspatial_stream]* (RX_SMOOTH-1)) +
-                                               (pprevious_stats->RxMIMOSignalQuality[nspatial_stream]* 1)) / (RX_SMOOTH);
+               if (prev_st->bPacketToSelf ||
+                   prev_st->bPacketBeacon ||
+                   prev_st->bToSelfBA) {
+                       for (ij = 0; ij < 2; ij++) {
+                               if (prev_st->RxMIMOSignalQuality[ij] != -1) {
+                                       if (priv->stats.rx_evm_percentage[ij] == 0)
+                                               priv->stats.rx_evm_percentage[ij] =
+                                                  prev_st->RxMIMOSignalQuality[ij];
+                                       priv->stats.rx_evm_percentage[ij] =
+                                         ((priv->stats.rx_evm_percentage[ij] *
+                                         (RX_SMOOTH - 1)) +
+                                         (prev_st->RxMIMOSignalQuality[ij])) /
+                                         (RX_SMOOTH);
                                }
                        }
                }
        }
-
 }
 
-
-void rtl8192_TranslateRxSignalStuff(struct net_device *dev,
-        struct sk_buff *skb,
-        struct rtllib_rx_stats * pstats,
-        struct rx_desc *pdesc,
-        struct rx_fwinfo *pdrvinfo)
+void rtl8192_TranslateRxSignalStuff(struct net_device *dev, struct sk_buff *skb,
+                                       struct rtllib_rx_stats *pstats,
+                                       struct rx_desc *pdesc,
+                                       struct rx_fwinfo *pdrvinfo)
 {
-    struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
-    bool bpacket_match_bssid, bpacket_toself;
-    bool bPacketBeacon=false;
-    struct rtllib_hdr_3addr *hdr;
-    bool bToSelfBA=false;
-    static struct rtllib_rx_stats  previous_stats;
-    u16 fc,type;
-
-
-    u8* tmp_buf;
-    u8 *praddr;
-
-    tmp_buf = skb->data + pstats->RxDrvInfoSize + pstats->RxBufShift;
-
-    hdr = (struct rtllib_hdr_3addr *)tmp_buf;
-    fc = le16_to_cpu(hdr->frame_ctl);
-    type = WLAN_FC_GET_TYPE(fc);
-    praddr = hdr->addr1;
-
-    bpacket_match_bssid = ((RTLLIB_FTYPE_CTL != type) &&
-            (!compare_ether_addr(priv->rtllib->current_network.bssid,
-                      (fc & RTLLIB_FCTL_TODS)? hdr->addr1 :
-                      (fc & RTLLIB_FCTL_FROMDS )? hdr->addr2 : hdr->addr3))
-            && (!pstats->bHwError) && (!pstats->bCRC)&& (!pstats->bICV));
-    bpacket_toself =  bpacket_match_bssid & (!compare_ether_addr(praddr, priv->rtllib->dev->dev_addr));
-    if (WLAN_FC_GET_FRAMETYPE(fc)== RTLLIB_STYPE_BEACON)
-    {
-        bPacketBeacon = true;
-    }
-    if (bpacket_match_bssid)
-    {
-        priv->stats.numpacket_matchbssid++;
-    }
-    if (bpacket_toself){
-        priv->stats.numpacket_toself++;
-    }
-    rtl8192_process_phyinfo(priv, tmp_buf,&previous_stats, pstats);
-    rtl8192_query_rxphystatus(priv, pstats, pdesc, pdrvinfo, &previous_stats, bpacket_match_bssid,
-            bpacket_toself ,bPacketBeacon, bToSelfBA);
-    rtl8192_record_rxdesc_forlateruse(pstats, &previous_stats);
+       struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
+       bool bpacket_match_bssid, bpacket_toself;
+       bool bPacketBeacon = false;
+       struct rtllib_hdr_3addr *hdr;
+       bool bToSelfBA = false;
+       static struct rtllib_rx_stats  previous_stats;
+       u16 fc, type;
+       u8 *tmp_buf;
+       u8 *praddr;
+
+       tmp_buf = skb->data + pstats->RxDrvInfoSize + pstats->RxBufShift;
+
+       hdr = (struct rtllib_hdr_3addr *)tmp_buf;
+       fc = le16_to_cpu(hdr->frame_ctl);
+       type = WLAN_FC_GET_TYPE(fc);
+       praddr = hdr->addr1;
+
+       bpacket_match_bssid = ((RTLLIB_FTYPE_CTL != type) &&
+                       (!compare_ether_addr(priv->rtllib->
+                       current_network.bssid,
+                          (fc & RTLLIB_FCTL_TODS) ? hdr->addr1 :
+                          (fc & RTLLIB_FCTL_FROMDS) ? hdr->addr2 : hdr->addr3))
+               && (!pstats->bHwError) && (!pstats->bCRC) && (!pstats->bICV));
+       bpacket_toself =  bpacket_match_bssid &
+                         (!compare_ether_addr(praddr,
+                         priv->rtllib->dev->dev_addr));
+       if (WLAN_FC_GET_FRAMETYPE(fc) == RTLLIB_STYPE_BEACON)
+               bPacketBeacon = true;
+       if (bpacket_match_bssid)
+               priv->stats.numpacket_matchbssid++;
+       if (bpacket_toself)
+               priv->stats.numpacket_toself++;
+       rtl8192_process_phyinfo(priv, tmp_buf, &previous_stats, pstats);
+       rtl8192_query_rxphystatus(priv, pstats, pdesc, pdrvinfo,
+                                 &previous_stats, bpacket_match_bssid,
+                                 bpacket_toself, bPacketBeacon, bToSelfBA);
+       rtl8192_record_rxdesc_forlateruse(pstats, &previous_stats);
 }
 
-void rtl8192_UpdateReceivedRateHistogramStatistics(
-       struct net_device *dev,
-       struct rtllib_rx_stats* pstats
-       )
+void rtl8192_UpdateReceivedRateHistogramStatistics(struct net_device *dev,
+                                          struct rtllib_rx_stats *pstats)
 {
        struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
-       u32 rcvType=1;
+       u32 rcvType = 1;
        u32 rateIndex;
        u32 preamble_guardinterval;
 
@@ -1833,45 +1901,104 @@ void rtl8192_UpdateReceivedRateHistogramStatistics(
        else
                preamble_guardinterval = 0;
 
-       switch (pstats->rate)
-       {
-               case MGN_1M:    rateIndex = 0;  break;
-               case MGN_2M:    rateIndex = 1;  break;
-               case MGN_5_5M:  rateIndex = 2;  break;
-               case MGN_11M:   rateIndex = 3;  break;
-               case MGN_6M:    rateIndex = 4;  break;
-               case MGN_9M:    rateIndex = 5;  break;
-               case MGN_12M:   rateIndex = 6;  break;
-               case MGN_18M:   rateIndex = 7;  break;
-               case MGN_24M:   rateIndex = 8;  break;
-               case MGN_36M:   rateIndex = 9;  break;
-               case MGN_48M:   rateIndex = 10; break;
-               case MGN_54M:   rateIndex = 11; break;
-               case MGN_MCS0:  rateIndex = 12; break;
-               case MGN_MCS1:  rateIndex = 13; break;
-               case MGN_MCS2:  rateIndex = 14; break;
-               case MGN_MCS3:  rateIndex = 15; break;
-               case MGN_MCS4:  rateIndex = 16; break;
-               case MGN_MCS5:  rateIndex = 17; break;
-               case MGN_MCS6:  rateIndex = 18; break;
-               case MGN_MCS7:  rateIndex = 19; break;
-               case MGN_MCS8:  rateIndex = 20; break;
-               case MGN_MCS9:  rateIndex = 21; break;
-               case MGN_MCS10: rateIndex = 22; break;
-               case MGN_MCS11: rateIndex = 23; break;
-               case MGN_MCS12: rateIndex = 24; break;
-               case MGN_MCS13: rateIndex = 25; break;
-               case MGN_MCS14: rateIndex = 26; break;
-               case MGN_MCS15: rateIndex = 27; break;
-               default:        rateIndex = 28; break;
+       switch (pstats->rate) {
+       case MGN_1M:
+               rateIndex = 0;
+               break;
+       case MGN_2M:
+               rateIndex = 1;
+                break;
+       case MGN_5_5M:
+               rateIndex = 2;
+               break;
+       case MGN_11M:
+               rateIndex = 3;
+               break;
+       case MGN_6M:
+               rateIndex = 4;
+               break;
+       case MGN_9M:
+               rateIndex = 5;
+               break;
+       case MGN_12M:
+               rateIndex = 6;
+               break;
+       case MGN_18M:
+               rateIndex = 7;
+                break;
+       case MGN_24M:
+               rateIndex = 8;
+               break;
+       case MGN_36M:
+               rateIndex = 9;
+               break;
+       case MGN_48M:
+               rateIndex = 10;
+               break;
+       case MGN_54M:
+               rateIndex = 11;
+               break;
+       case MGN_MCS0:
+               rateIndex = 12;
+               break;
+       case MGN_MCS1:
+               rateIndex = 13;
+               break;
+       case MGN_MCS2:
+               rateIndex = 14;
+               break;
+       case MGN_MCS3:
+               rateIndex = 15;
+               break;
+       case MGN_MCS4:
+               rateIndex = 16;
+               break;
+       case MGN_MCS5:
+               rateIndex = 17;
+               break;
+       case MGN_MCS6:
+               rateIndex = 18;
+               break;
+       case MGN_MCS7:
+               rateIndex = 19;
+               break;
+       case MGN_MCS8:
+               rateIndex = 20;
+               break;
+       case MGN_MCS9:
+               rateIndex = 21;
+               break;
+       case MGN_MCS10:
+               rateIndex = 22;
+               break;
+       case MGN_MCS11:
+               rateIndex = 23;
+               break;
+       case MGN_MCS12:
+               rateIndex = 24;
+               break;
+       case MGN_MCS13:
+               rateIndex = 25;
+               break;
+       case MGN_MCS14:
+               rateIndex = 26;
+               break;
+       case MGN_MCS15:
+               rateIndex = 27;
+               break;
+       default:
+               rateIndex = 28;
+               break;
        }
        priv->stats.received_preamble_GI[preamble_guardinterval][rateIndex]++;
        priv->stats.received_rate_histogram[0][rateIndex]++;
        priv->stats.received_rate_histogram[rcvType][rateIndex]++;
 }
 
-bool rtl8192_rx_query_status_desc(struct net_device* dev, struct rtllib_rx_stats*  stats,
-               struct rx_desc *pdesc, struct sk_buff* skb)
+bool rtl8192_rx_query_status_desc(struct net_device *dev,
+                                 struct rtllib_rx_stats *stats,
+                                 struct rx_desc *pdesc,
+                                 struct sk_buff *skb)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
 
@@ -1887,9 +2014,9 @@ bool rtl8192_rx_query_status_desc(struct net_device* dev, struct rtllib_rx_stats
                stats->bShift = false;
 
                if (pdesc->CRC32) {
-                       if (pdesc->Length <500)
+                       if (pdesc->Length < 500)
                                priv->stats.rxcrcerrmin++;
-                       else if (pdesc->Length >1000)
+                       else if (pdesc->Length > 1000)
                                priv->stats.rxcrcerrmax++;
                        else
                                priv->stats.rxcrcerrmid++;
@@ -1903,13 +2030,15 @@ bool rtl8192_rx_query_status_desc(struct net_device* dev, struct rtllib_rx_stats
 
                pDrvInfo = (struct rx_fwinfo *)(skb->data + stats->RxBufShift);
 
-               stats->rate = HwRateToMRate90((bool)pDrvInfo->RxHT, (u8)pDrvInfo->RxRate);
+               stats->rate = HwRateToMRate90((bool)pDrvInfo->RxHT,
+                                            (u8)pDrvInfo->RxRate);
                stats->bShortPreamble = pDrvInfo->SPLCP;
 
                rtl8192_UpdateReceivedRateHistogramStatistics(dev, stats);
 
-               stats->bIsAMPDU = (pDrvInfo->PartAggr==1);
-               stats->bFirstMPDU = (pDrvInfo->PartAggr==1) && (pDrvInfo->FirstAGGR==1);
+               stats->bIsAMPDU = (pDrvInfo->PartAggr == 1);
+               stats->bFirstMPDU = (pDrvInfo->PartAggr == 1) &&
+                                   (pDrvInfo->FirstAGGR == 1);
 
                stats->TimeStampLow = pDrvInfo->TSFL;
                stats->TimeStampHigh = read_nic_dword(dev, TSFR+4);
@@ -1921,11 +2050,13 @@ bool rtl8192_rx_query_status_desc(struct net_device* dev, struct rtllib_rx_stats
 
                stats->RxIs40MHzPacket = pDrvInfo->BW;
 
-               rtl8192_TranslateRxSignalStuff(dev,skb, stats, pdesc, pDrvInfo);
+               rtl8192_TranslateRxSignalStuff(dev, skb, stats, pdesc,
+                                              pDrvInfo);
 
-               if (pDrvInfo->FirstAGGR==1 || pDrvInfo->PartAggr == 1)
-                       RT_TRACE(COMP_RXDESC, "pDrvInfo->FirstAGGR = %d, pDrvInfo->PartAggr = %d\n",
-                                       pDrvInfo->FirstAGGR, pDrvInfo->PartAggr);
+               if (pDrvInfo->FirstAGGR == 1 || pDrvInfo->PartAggr == 1)
+                       RT_TRACE(COMP_RXDESC, "pDrvInfo->FirstAGGR = %d,"
+                                " pDrvInfo->PartAggr = %d\n",
+                                pDrvInfo->FirstAGGR, pDrvInfo->PartAggr);
                skb_trim(skb, skb->len - 4/*sCrcLng*/);
 
 
@@ -1948,36 +2079,24 @@ void rtl8192_halt_adapter(struct net_device *dev, bool reset)
        OpMode = RT_OP_MODE_NO_LINK;
        priv->rtllib->SetHwRegHandler(dev, HW_VAR_MEDIA_STATUS, &OpMode);
 
-#if 1
-       if (!priv->rtllib->bSupportRemoteWakeUp)
-       {
+       if (!priv->rtllib->bSupportRemoteWakeUp) {
                u1bTmp = 0x0;
                write_nic_byte(dev, CMDR, u1bTmp);
        }
-#else
-       cmd=read_nic_byte(dev,CMDR);
-       write_nic_byte(dev, CMDR, cmd &~ (CR_TE|CR_RE));
-#endif
 
        mdelay(20);
 
-       if (!reset)
-       {
+       if (!reset) {
                mdelay(150);
 
                priv->bHwRfOffAction = 2;
 
-               if (!priv->rtllib->bSupportRemoteWakeUp)
-               {
-                       {
-                               PHY_SetRtl8192eRfOff(dev);
-                       }
-                       ulRegRead = read_nic_dword(dev,CPU_GEN);
-                       ulRegRead|=CPU_GEN_SYSTEM_RESET;
-                       write_nic_dword(dev,CPU_GEN, ulRegRead);
-               }
-               else
-               {
+               if (!priv->rtllib->bSupportRemoteWakeUp) {
+                       PHY_SetRtl8192eRfOff(dev);
+                       ulRegRead = read_nic_dword(dev, CPU_GEN);
+                       ulRegRead |= CPU_GEN_SYSTEM_RESET;
+                       write_nic_dword(dev, CPU_GEN, ulRegRead);
+               } else {
                        write_nic_dword(dev, WFCRC0, 0xffffffff);
                        write_nic_dword(dev, WFCRC1, 0xffffffff);
                        write_nic_dword(dev, WFCRC2, 0xffffffff);
@@ -1988,59 +2107,57 @@ void rtl8192_halt_adapter(struct net_device *dev, bool reset)
                }
        }
 
-       for (i = 0; i < MAX_QUEUE_SIZE; i++) {
-               skb_queue_purge(&priv->rtllib->skb_waitQ [i]);
-       }
-       for (i = 0; i < MAX_QUEUE_SIZE; i++) {
-               skb_queue_purge(&priv->rtllib->skb_aggQ [i]);
-       }
+       for (i = 0; i < MAX_QUEUE_SIZE; i++)
+               skb_queue_purge(&priv->rtllib->skb_waitQ[i]);
+       for (i = 0; i < MAX_QUEUE_SIZE; i++)
+               skb_queue_purge(&priv->rtllib->skb_aggQ[i]);
 
        skb_queue_purge(&priv->skb_queue);
        return;
 }
 
-void rtl8192_update_ratr_table(struct net_devicedev)
+void rtl8192_update_ratr_table(struct net_device *dev)
 {
-       struct r8192_priv * priv = rtllib_priv(dev);
-       struct rtllib_deviceieee = priv->rtllib;
-       u8pMcsRate = ieee->dot11HTOperationalRateSet;
+       struct r8192_priv *priv = rtllib_priv(dev);
+       struct rtllib_device *ieee = priv->rtllib;
+       u8 *pMcsRate = ieee->dot11HTOperationalRateSet;
        u32 ratr_value = 0;
        u8 rate_index = 0;
 
-       rtl8192_config_rate(dev, (u16*)(&ratr_value));
-       ratr_value |= (*(u16*)(pMcsRate)) << 12;
-       switch (ieee->mode)
-       {
-               case IEEE_A:
-                       ratr_value &= 0x00000FF0;
-                       break;
-               case IEEE_B:
-                       ratr_value &= 0x0000000F;
-                       break;
-               case IEEE_G:
-               case IEEE_G|IEEE_B:
-                       ratr_value &= 0x00000FF7;
-                       break;
-               case IEEE_N_24G:
-               case IEEE_N_5G:
-                       if (ieee->pHTInfo->PeerMimoPs == 0)
-                               ratr_value &= 0x0007F007;
-                       else{
-                               if (priv->rf_type == RF_1T2R)
-                                       ratr_value &= 0x000FF007;
-                               else
-                                       ratr_value &= 0x0F81F007;
-                       }
-                       break;
-               default:
-                       break;
+       rtl8192_config_rate(dev, (u16 *)(&ratr_value));
+       ratr_value |= (*(u16 *)(pMcsRate)) << 12;
+       switch (ieee->mode) {
+       case IEEE_A:
+               ratr_value &= 0x00000FF0;
+               break;
+       case IEEE_B:
+               ratr_value &= 0x0000000F;
+               break;
+       case IEEE_G:
+       case IEEE_G|IEEE_B:
+               ratr_value &= 0x00000FF7;
+               break;
+       case IEEE_N_24G:
+       case IEEE_N_5G:
+               if (ieee->pHTInfo->PeerMimoPs == 0) {
+                       ratr_value &= 0x0007F007;
+               } else {
+                       if (priv->rf_type == RF_1T2R)
+                               ratr_value &= 0x000FF007;
+                       else
+                               ratr_value &= 0x0F81F007;
+               }
+               break;
+       default:
+               break;
        }
        ratr_value &= 0x0FFFFFFF;
-       if (ieee->pHTInfo->bCurTxBW40MHz && ieee->pHTInfo->bCurShortGI40MHz){
+       if (ieee->pHTInfo->bCurTxBW40MHz &&
+           ieee->pHTInfo->bCurShortGI40MHz)
                ratr_value |= 0x80000000;
-       }else if (!ieee->pHTInfo->bCurTxBW40MHz && ieee->pHTInfo->bCurShortGI20MHz){
+       else if (!ieee->pHTInfo->bCurTxBW40MHz &&
+                 ieee->pHTInfo->bCurShortGI20MHz)
                ratr_value |= 0x80000000;
-       }
        write_nic_dword(dev, RATR0+rate_index*4, ratr_value);
        write_nic_byte(dev, UFWP, 1);
 }
@@ -2077,17 +2194,19 @@ rtl8192_InitializeVariables(struct net_device  *dev)
                RCR_AAP | ((u32)7<<RCR_MXDMA_OFFSET) |
                ((u32)7 << RCR_FIFO_OFFSET) | RCR_ONLYERLPKT;
 
-       priv->irq_mask[0] =     (u32)(IMR_ROK | IMR_VODOK | IMR_VIDOK | IMR_BEDOK | IMR_BKDOK |\
-                               IMR_HCCADOK | IMR_MGNTDOK | IMR_COMDOK | IMR_HIGHDOK |\
-                               IMR_BDOK | IMR_RXCMDOK | IMR_TIMEOUT0 | IMR_RDU | IMR_RXFOVW    |\
-                               IMR_TXFOVW | IMR_BcnInt | IMR_TBDOK | IMR_TBDER);
+       priv->irq_mask[0] = (u32)(IMR_ROK | IMR_VODOK | IMR_VIDOK |
+                           IMR_BEDOK | IMR_BKDOK | IMR_HCCADOK |
+                           IMR_MGNTDOK | IMR_COMDOK | IMR_HIGHDOK |
+                           IMR_BDOK | IMR_RXCMDOK | IMR_TIMEOUT0 |
+                           IMR_RDU | IMR_RXFOVW | IMR_TXFOVW |
+                           IMR_BcnInt | IMR_TBDOK | IMR_TBDER);
 
 
        priv->MidHighPwrTHR_L1 = 0x3B;
        priv->MidHighPwrTHR_L2 = 0x40;
        priv->PwrDomainProtect = false;
 
-        priv->bfirst_after_down = 0;
+       priv->bfirst_after_down = 0;
 }
 
 void rtl8192_EnableInterrupt(struct net_device *dev)
@@ -2095,7 +2214,7 @@ void rtl8192_EnableInterrupt(struct net_device *dev)
        struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
        priv->irq_enabled = 1;
 
-       write_nic_dword(dev,INTA_MASK, priv->irq_mask[0]);
+       write_nic_dword(dev, INTA_MASK, priv->irq_mask[0]);
 
 }
 
@@ -2103,7 +2222,7 @@ void rtl8192_DisableInterrupt(struct net_device *dev)
 {
        struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
 
-       write_nic_dword(dev,INTA_MASK,0);
+       write_nic_dword(dev, INTA_MASK, 0);
 
        priv->irq_enabled = 0;
 }
@@ -2118,18 +2237,21 @@ void rtl8192_ClearInterrupt(struct net_device *dev)
 
 void rtl8192_enable_rx(struct net_device *dev)
 {
-    struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
-    write_nic_dword(dev, RDQDA,priv->rx_ring_dma[RX_MPDU_QUEUE]);
+       struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
+       write_nic_dword(dev, RDQDA, priv->rx_ring_dma[RX_MPDU_QUEUE]);
 }
 
-u32 TX_DESC_BASE[] = {BKQDA, BEQDA, VIQDA, VOQDA, HCCAQDA, CQDA, MQDA, HQDA, BQDA};
+static const u32 TX_DESC_BASE[] = {
+       BKQDA, BEQDA, VIQDA, VOQDA, HCCAQDA, CQDA, MQDA, HQDA, BQDA
+};
+
 void rtl8192_enable_tx(struct net_device *dev)
 {
-    struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
-    u32 i;
+       struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
+       u32 i;
 
-    for (i = 0; i < MAX_TX_QUEUE_COUNT; i++)
-        write_nic_dword(dev, TX_DESC_BASE[i], priv->tx_ring[i].dma);
+       for (i = 0; i < MAX_TX_QUEUE_COUNT; i++)
+               write_nic_dword(dev, TX_DESC_BASE[i], priv->tx_ring[i].dma);
 }
 
 
@@ -2138,16 +2260,17 @@ void rtl8192_beacon_disable(struct net_device *dev)
        struct r8192_priv *priv = (struct r8192_priv *)rtllib_priv(dev);
        u32 reg;
 
-       reg = read_nic_dword(priv->rtllib->dev,INTA_MASK);
+       reg = read_nic_dword(priv->rtllib->dev, INTA_MASK);
 
        reg &= ~(IMR_BcnInt | IMR_BcnInt | IMR_TBDOK | IMR_TBDER);
        write_nic_dword(priv->rtllib->dev, INTA_MASK, reg);
 }
 
-void rtl8192_interrupt_recognized(struct net_device *dev, u32 *p_inta, u32 *p_intb)
+void rtl8192_interrupt_recognized(struct net_device *dev, u32 *p_inta,
+                                 u32 *p_intb)
 {
-       *p_inta = read_nic_dword(dev, ISR) ;
-       write_nic_dword(dev,ISR,*p_inta);
+       *p_inta = read_nic_dword(dev, ISR);
+       write_nic_dword(dev, ISR, *p_inta);
 }
 
 bool rtl8192_HalRxCheckStuck(struct net_device *dev)
@@ -2155,61 +2278,56 @@ bool rtl8192_HalRxCheckStuck(struct net_device *dev)
        struct r8192_priv *priv = rtllib_priv(dev);
        u16               RegRxCounter = read_nic_word(dev, 0x130);
        bool              bStuck = false;
-       static u8         rx_chk_cnt = 0;
+       static u8         rx_chk_cnt;
        u32             SlotIndex = 0, TotalRxStuckCount = 0;
        u8              i;
        u8              SilentResetRxSoltNum = 4;
 
-       RT_TRACE(COMP_RESET,"%s(): RegRxCounter is %d,RxCounter is %d\n",
-                       __func__, RegRxCounter,priv->RxCounter);
+       RT_TRACE(COMP_RESET, "%s(): RegRxCounter is %d, RxCounter is %d\n",
+                __func__, RegRxCounter, priv->RxCounter);
 
        rx_chk_cnt++;
-       if (priv->undecorated_smoothed_pwdb >= (RateAdaptiveTH_High+5))
-       {
+       if (priv->undecorated_smoothed_pwdb >= (RateAdaptiveTH_High+5)) {
                rx_chk_cnt = 0;
-       } else if ((priv->undecorated_smoothed_pwdb < (RateAdaptiveTH_High+5)) &&
-               (((priv->CurrentChannelBW != HT_CHANNEL_WIDTH_20) &&
-                 (priv->undecorated_smoothed_pwdb >= RateAdaptiveTH_Low_40M)) ||
-               ((priv->CurrentChannelBW == HT_CHANNEL_WIDTH_20) &&
-                (priv->undecorated_smoothed_pwdb>=RateAdaptiveTH_Low_20M)))) {
-               if (rx_chk_cnt < 2) {
+       } else if ((priv->undecorated_smoothed_pwdb < (RateAdaptiveTH_High + 5))
+         && (((priv->CurrentChannelBW != HT_CHANNEL_WIDTH_20) &&
+         (priv->undecorated_smoothed_pwdb >= RateAdaptiveTH_Low_40M))
+         || ((priv->CurrentChannelBW == HT_CHANNEL_WIDTH_20) &&
+         (priv->undecorated_smoothed_pwdb >= RateAdaptiveTH_Low_20M)))) {
+               if (rx_chk_cnt < 2)
                        return bStuck;
-               } else {
+               else
                        rx_chk_cnt = 0;
-               }
        } else if ((((priv->CurrentChannelBW != HT_CHANNEL_WIDTH_20) &&
                  (priv->undecorated_smoothed_pwdb < RateAdaptiveTH_Low_40M)) ||
                ((priv->CurrentChannelBW == HT_CHANNEL_WIDTH_20) &&
                 (priv->undecorated_smoothed_pwdb < RateAdaptiveTH_Low_20M))) &&
                priv->undecorated_smoothed_pwdb >= VeryLowRSSI) {
-               if (rx_chk_cnt < 4) {
+               if (rx_chk_cnt < 4)
                        return bStuck;
-               } else {
+               else
                        rx_chk_cnt = 0;
-               }
        } else {
-               if (rx_chk_cnt < 8) {
+               if (rx_chk_cnt < 8)
                        return bStuck;
-               } else {
+               else
                        rx_chk_cnt = 0;
-               }
        }
 
 
        SlotIndex = (priv->SilentResetRxSlotIndex++)%SilentResetRxSoltNum;
 
-       if (priv->RxCounter==RegRxCounter)
-       {
+       if (priv->RxCounter == RegRxCounter) {
                priv->SilentResetRxStuckEvent[SlotIndex] = 1;
 
-               for ( i = 0; i < SilentResetRxSoltNum ; i++ )
+               for (i = 0; i < SilentResetRxSoltNum; i++)
                        TotalRxStuckCount += priv->SilentResetRxStuckEvent[i];
 
-               if (TotalRxStuckCount  == SilentResetRxSoltNum)
-               {
-               bStuck = true;
-                       for ( i = 0; i < SilentResetRxSoltNum ; i++ )
-                               TotalRxStuckCount += priv->SilentResetRxStuckEvent[i];
+               if (TotalRxStuckCount == SilentResetRxSoltNum) {
+                       bStuck = true;
+                       for (i = 0; i < SilentResetRxSoltNum; i++)
+                               TotalRxStuckCount +=
+                                        priv->SilentResetRxStuckEvent[i];
                }
 
 
@@ -2226,10 +2344,10 @@ bool rtl8192_HalTxCheckStuck(struct net_device *dev)
 {
        struct r8192_priv *priv = rtllib_priv(dev);
        bool    bStuck = false;
-       u16    RegTxCounter = read_nic_word(dev, 0x128);
+       u16     RegTxCounter = read_nic_word(dev, 0x128);
 
        RT_TRACE(COMP_RESET, "%s():RegTxCounter is %d,TxCounter is %d\n",
-                       __func__,RegTxCounter,priv->TxCounter);
+                __func__, RegTxCounter, priv->TxCounter);
 
        if (priv->TxCounter == RegTxCounter)
                bStuck = true;
@@ -2244,18 +2362,19 @@ bool rtl8192_GetNmodeSupportBySecCfg(struct net_device *dev)
        struct r8192_priv *priv = rtllib_priv(dev);
        struct rtllib_device *ieee = priv->rtllib;
        if (ieee->rtllib_ap_sec_type &&
-          (ieee->rtllib_ap_sec_type(priv->rtllib)&(SEC_ALG_WEP|SEC_ALG_TKIP))) {
+          (ieee->rtllib_ap_sec_type(priv->rtllib)&(SEC_ALG_WEP |
+                                    SEC_ALG_TKIP))) {
                return false;
        } else {
                return true;
        }
 }
 
-bool rtl8192_GetHalfNmodeSupportByAPs(struct net_devicedev)
+bool rtl8192_GetHalfNmodeSupportByAPs(struct net_device *dev)
 {
-       bool                    Reval;
-       struct r8192_priv * priv = rtllib_priv(dev);
-       struct rtllib_deviceieee = priv->rtllib;
+       bool Reval;
+       struct r8192_priv *priv = rtllib_priv(dev);
+       struct rtllib_device *ieee = priv->rtllib;
 
        if (ieee->bHalfWirelessN24GMode == true)
                Reval = true;
@@ -2269,8 +2388,9 @@ u8 rtl8192_QueryIsShort(u8 TxHT, u8 TxRate, struct cb_desc *tcb_desc)
 {
        u8   tmp_Short;
 
-       tmp_Short = (TxHT==1)?((tcb_desc->bUseShortGI)?1:0):((tcb_desc->bUseShortPreamble)?1:0);
-       if (TxHT==1 && TxRate != DESC90_RATEMCS15)
+       tmp_Short = (TxHT == 1) ? ((tcb_desc->bUseShortGI) ? 1 : 0) :
+                       ((tcb_desc->bUseShortPreamble) ? 1 : 0);
+       if (TxHT == 1 && TxRate != DESC90_RATEMCS15)
                tmp_Short = 0;
 
        return tmp_Short;
@@ -2278,12 +2398,12 @@ u8 rtl8192_QueryIsShort(u8 TxHT, u8 TxRate, struct cb_desc *tcb_desc)
 
 void
 ActUpdateChannelAccessSetting(
-       struct net_device*                      dev,
+       struct net_device *dev,
        enum wireless_mode WirelessMode,
        struct channel_access_setting *ChnlAccessSetting
        )
 {
-               struct r8192_priv * priv = rtllib_priv(dev);
+               struct r8192_priv *priv = rtllib_priv(dev);
 
                return;
 
@@ -2295,7 +2415,8 @@ ActUpdateChannelAccessSetting(
                        else
                                 SIFS_Timer = priv->SifsTime;
 
-                       priv->rtllib->SetHwRegHandler( dev, HW_VAR_SIFS,  (u8*)&SIFS_Timer);
+                       priv->rtllib->SetHwRegHandler(dev, HW_VAR_SIFS,
+                                                    (u8 *)&SIFS_Timer);
                }
 
 }