diff mbox

[OPW,kernel,06/11] staging: vt6656: indented all if-else statement blocks

Message ID 1384208208-12564-6-git-send-email-nandu.hgowda@gmail.com
State New, archived
Headers show

Commit Message

nandini h Nov. 11, 2013, 10:16 p.m. UTC
indented all if-else statement blocks to remove checkpatch
warnings and errors like indent code wherever possible and
no spaces at the start of line

Signed-off-by: Nandini Hanumanthagowda <nandu.hgowda@gmail.com>
---
 drivers/staging/vt6656/wcmd.c | 1274 ++++++++++++++++++++---------------------
 1 file changed, 633 insertions(+), 641 deletions(-)

Comments

Andrew Grover Nov. 11, 2013, 10:32 p.m. UTC | #1
On Mon, Nov 11, 2013 at 2:16 PM, Nandini Hanumanthagowda <
nandu.hgowda@gmail.com> wrote:

> indented all if-else statement blocks to remove checkpatch
> warnings and errors like indent code wherever possible and
> no spaces at the start of line
>
> Signed-off-by: Nandini Hanumanthagowda <nandu.hgowda@gmail.com>
> ---
>  drivers/staging/vt6656/wcmd.c | 1274
> ++++++++++++++++++++---------------------
>  1 file changed, 633 insertions(+), 641 deletions(-)
>
> diff --git a/drivers/staging/vt6656/wcmd.c b/drivers/staging/vt6656/wcmd.c
> index 903111b..a91e762 100644
> --- a/drivers/staging/vt6656/wcmd.c
> +++ b/drivers/staging/vt6656/wcmd.c
> @@ -99,21 +99,21 @@ static void vAdHocBeaconStop(struct vnt_private
> *pDevice)
>       *      (3.2) AdHoc channel is in A mode
>       */
>      bStop = false;
> -    if ((pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) &&
> -    (pMgmt->eCurrState >= WMAC_STATE_STARTED)) {
> -        if ((pMgmt->uIBSSChannel <=  CB_MAX_CHANNEL_24G) &&
> -             (pMgmt->uScanChannel > CB_MAX_CHANNEL_24G)) {
> -            bStop = true;
> -        }
> -        if (pMgmt->uIBSSChannel >  CB_MAX_CHANNEL_24G)
> -            bStop = true;
> -    }
> -
> -    if (bStop) {
> -        //PMESG(("STOP_BEACON: IBSSChannel = %u, ScanChannel = %u\n",
> -        //        pMgmt->uIBSSChannel, pMgmt->uScanChannel));
> -        MACvRegBitsOff(pDevice, MAC_REG_TCR, TCR_AUTOBCNTX);
> -    }
> +       if ((pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) &&
> +           (pMgmt->eCurrState >= WMAC_STATE_STARTED)) {
> +               if ((pMgmt->uIBSSChannel <=  CB_MAX_CHANNEL_24G) &&
> +                   (pMgmt->uScanChannel > CB_MAX_CHANNEL_24G)) {
> +                       bStop = true;
> +               }
> +               if (pMgmt->uIBSSChannel >  CB_MAX_CHANNEL_24G)
> +                       bStop = true;
> +       }
> +
> +       if (bStop) {
> +               //PMESG(("STOP_BEACON: IBSSChannel = %u, ScanChannel =
> %u\n",
> +               //        pMgmt->uIBSSChannel, pMgmt->uScanChannel));
> +               MACvRegBitsOff(pDevice, MAC_REG_TCR, TCR_AUTOBCNTX);
> +       }
>
>  } /* vAdHocBeaconStop */
>
> @@ -140,11 +140,11 @@ static void vAdHocBeaconRestart(struct vnt_private
> *pDevice)
>       *  (1) STA is in AdHoc mode
>       *  (2) VT3253 is programmed as automatic Beacon Transmitting
>       */
> -    if ((pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) &&
> -    (pMgmt->eCurrState >= WMAC_STATE_STARTED)) {
> -        //PMESG(("RESTART_BEACON\n"));
> -        MACvRegBitsOn(pDevice, MAC_REG_TCR, TCR_AUTOBCNTX);
> -    }
> +       if ((pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) &&
> +           (pMgmt->eCurrState >= WMAC_STATE_STARTED)) {
> +               //PMESG(("RESTART_BEACON\n"));
> +               MACvRegBitsOn(pDevice, MAC_REG_TCR, TCR_AUTOBCNTX);
> +       }
>
>  }
>
> @@ -194,15 +194,15 @@ static void s_vProbeChannel(struct vnt_private
> *pDevice)
>                    (PWLAN_IE_SUPP_RATES)abyCurrExtSuppRatesG
>                  );
>
> -    if (pTxPacket != NULL) {
> -        for (ii = 0; ii < 1; ii++) {
> -            if (csMgmt_xmit(pDevice, pTxPacket) != CMD_STATUS_PENDING) {
> -                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Probe request sending
> fail..\n");
> -           } else {
> -                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Probe request is
> sending..\n");
> -           }
> -        }
> -    }
> +       if (pTxPacket != NULL) {
> +               for (ii = 0; ii < 1; ii++) {
> +                       if (csMgmt_xmit(pDevice, pTxPacket) !=
> CMD_STATUS_PENDING) {
> +                               DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Probe
> request sending fail..\n");
> +                       } else {
> +                               DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Probe
> request is sending..\n");
> +                       }
> +               }
> +       }
>
>  }
>
> @@ -248,11 +248,11 @@ static struct vnt_tx_mgmt
> *s_MgrMakeProbeRequest(struct vnt_private *pDevice,
>      sFrame.len += pCurrRates->len + WLAN_IEHDR_LEN;
>      memcpy(sFrame.pSuppRates, pCurrRates, pCurrRates->len +
> WLAN_IEHDR_LEN);
>      // Copy the extension rate set
> -    if (pDevice->byBBType == BB_TYPE_11G) {
> -        sFrame.pExtSuppRates = (PWLAN_IE_SUPP_RATES)(sFrame.pBuf +
> sFrame.len);
> -        sFrame.len += pCurrExtSuppRates->len + WLAN_IEHDR_LEN;
> -        memcpy(sFrame.pExtSuppRates, pCurrExtSuppRates,
> pCurrExtSuppRates->len + WLAN_IEHDR_LEN);
> -    }
> +       if (pDevice->byBBType == BB_TYPE_11G) {
> +               sFrame.pExtSuppRates = (PWLAN_IE_SUPP_RATES)(sFrame.pBuf +
> sFrame.len);
> +               sFrame.len += pCurrExtSuppRates->len + WLAN_IEHDR_LEN;
> +               memcpy(sFrame.pExtSuppRates, pCurrExtSuppRates,
> pCurrExtSuppRates->len + WLAN_IEHDR_LEN);
> +       }
>      pTxPacket->cbMPDULen = sFrame.len;
>      pTxPacket->cbPayloadLen = sFrame.len - WLAN_HDR_ADDR3_LEN;
>
> @@ -283,10 +283,10 @@ void vRunCommand(struct work_struct *work)
>         if (pDevice->Flags & fMP_DISCONNECTED)
>                 return;
>
> -    if (pDevice->dwDiagRefCount != 0)
> -        return;
> -    if (pDevice->bCmdRunning != true)
> -        return;
> +       if (pDevice->dwDiagRefCount != 0)
> +               return;
> +       if (pDevice->bCmdRunning != true)
> +               return;
>
>      spin_lock_irq(&pDevice->lock);
>
> @@ -295,126 +295,123 @@ void vRunCommand(struct work_struct *work)
>      case WLAN_CMD_SCAN_START:
>
>                 pDevice->byReAssocCount = 0;
> -            if (pDevice->bRadioOff == true) {
> -                s_bCommandComplete(pDevice);
> -                spin_unlock_irq(&pDevice->lock);
> -                return;
> -            }
> -
> -            if (pMgmt->eCurrMode == WMAC_MODE_ESS_AP) {
> -                s_bCommandComplete(pDevice);
> -                spin_unlock_irq(&pDevice->lock);
> -                return;
> -            }
> +               if (pDevice->bRadioOff == true) {
> +                       s_bCommandComplete(pDevice);
> +                       spin_unlock_irq(&pDevice->lock);
> +                       return;
> +               }
> +
> +               if (pMgmt->eCurrMode == WMAC_MODE_ESS_AP) {
> +                       s_bCommandComplete(pDevice);
> +                       spin_unlock_irq(&pDevice->lock);
> +                       return;
> +               }
>
>              pItemSSID = (PWLAN_IE_SSID)pMgmt->abyScanSSID;
>
> -            if (pMgmt->uScanChannel == 0)
> -                pMgmt->uScanChannel = pDevice->byMinChannel;
> -            if (pMgmt->uScanChannel > pDevice->byMaxChannel) {
> -               pDevice->eCommandState = WLAN_CMD_SCAN_END;
> -                s_bCommandComplete(pDevice);
> -                spin_unlock_irq(&pDevice->lock);
> -                return;
> -
> -            } else {
> -                if (!ChannelValid(pDevice->byZoneType,
> pMgmt->uScanChannel)) {
> -                    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Invalid channel
> pMgmt->uScanChannel = %d\n", pMgmt->uScanChannel);
> +               if (pMgmt->uScanChannel == 0)
> +                       pMgmt->uScanChannel = pDevice->byMinChannel;
> +               if (pMgmt->uScanChannel > pDevice->byMaxChannel) {
> +                       pDevice->eCommandState = WLAN_CMD_SCAN_END;
> +                       s_bCommandComplete(pDevice);
> +                       spin_unlock_irq(&pDevice->lock);
> +                       return;
> +               } else {
> +                       if (!ChannelValid(pDevice->byZoneType,
> pMgmt->uScanChannel)) {
> +                               DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO
> "Invalid channel pMgmt->uScanChannel = %d\n", pMgmt->uScanChannel);
> +                               pMgmt->uScanChannel++;
> +                               s_bCommandComplete(pDevice);
> +                               spin_unlock_irq(&pDevice->lock);
> +                               return;
> +                       }
> +                       if (pMgmt->uScanChannel == pDevice->byMinChannel) {
> +                               // pMgmt->eScanType = WMAC_SCAN_ACTIVE;
>        //mike mark
> +                               pMgmt->abyScanBSSID[0] = 0xFF;
> +                               pMgmt->abyScanBSSID[1] = 0xFF;
> +                               pMgmt->abyScanBSSID[2] = 0xFF;
> +                               pMgmt->abyScanBSSID[3] = 0xFF;
> +                               pMgmt->abyScanBSSID[4] = 0xFF;
> +                               pMgmt->abyScanBSSID[5] = 0xFF;
> +                               pItemSSID->byElementID = WLAN_EID_SSID;
> +                               // clear bssid list
> +                               /* BSSvClearBSSList((void *) pDevice,
> pDevice->bLinkPass); */
> +                               pMgmt->eScanState = WMAC_IS_SCANNING;
> +                               pDevice->byScanBBType = pDevice->byBBType;
>  //lucas
> +                               pDevice->bStopDataPkt = true;
> +                               // Turn off RCR_BSSID filter every time
> +                               MACvRegBitsOff(pDevice, MAC_REG_RCR,
> RCR_BSSID);
> +                               pDevice->byRxMode &= ~RCR_BSSID;
> +                       }
> +                       //lucas
> +                       vAdHocBeaconStop(pDevice);
> +                       if ((pDevice->byBBType != BB_TYPE_11A) &&
> +                           (pMgmt->uScanChannel > CB_MAX_CHANNEL_24G)) {
> +                               pDevice->byBBType = BB_TYPE_11A;
> +                               CARDvSetBSSMode(pDevice);
> +                       } else if ((pDevice->byBBType == BB_TYPE_11A) &&
> +                                  (pMgmt->uScanChannel <=
> CB_MAX_CHANNEL_24G)) {
> +                               pDevice->byBBType = BB_TYPE_11G;
> +                               CARDvSetBSSMode(pDevice);
> +                       }
> +                       DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Scanning....
>  channel: [%d]\n", pMgmt->uScanChannel);
> +                       // Set channel
> +                       CARDbSetMediaChannel(pDevice, pMgmt->uScanChannel);
> +                       // Set Baseband to be more sensitive.
> +
> +                       if (pDevice->bUpdateBBVGA) {
> +                               BBvSetShortSlotTime(pDevice);
> +                               BBvSetVGAGainOffset(pDevice,
> pDevice->abyBBVGA[0]);
> +                               BBvUpdatePreEDThreshold(pDevice, true);
> +                       }
>                         pMgmt->uScanChannel++;
> -                    s_bCommandComplete(pDevice);
> -                    spin_unlock_irq(&pDevice->lock);
> -                    return;
> -                }
> -                if (pMgmt->uScanChannel == pDevice->byMinChannel) {
> -                   // pMgmt->eScanType = WMAC_SCAN_ACTIVE;
>  //mike mark
> -                    pMgmt->abyScanBSSID[0] = 0xFF;
> -                    pMgmt->abyScanBSSID[1] = 0xFF;
> -                    pMgmt->abyScanBSSID[2] = 0xFF;
> -                    pMgmt->abyScanBSSID[3] = 0xFF;
> -                    pMgmt->abyScanBSSID[4] = 0xFF;
> -                    pMgmt->abyScanBSSID[5] = 0xFF;
> -                    pItemSSID->byElementID = WLAN_EID_SSID;
> -                    // clear bssid list
> -                   /* BSSvClearBSSList((void *) pDevice,
> -                      pDevice->bLinkPass); */
> -                    pMgmt->eScanState = WMAC_IS_SCANNING;
> -                    pDevice->byScanBBType = pDevice->byBBType;  //lucas
> -                    pDevice->bStopDataPkt = true;
> -                    // Turn off RCR_BSSID filter every time
> -                    MACvRegBitsOff(pDevice, MAC_REG_RCR, RCR_BSSID);
> -                    pDevice->byRxMode &= ~RCR_BSSID;
> -
> -                }
> -                //lucas
> -                vAdHocBeaconStop(pDevice);
> -                if ((pDevice->byBBType != BB_TYPE_11A) &&
> (pMgmt->uScanChannel > CB_MAX_CHANNEL_24G)) {
> -                    pDevice->byBBType = BB_TYPE_11A;
> -                    CARDvSetBSSMode(pDevice);
> -                } else if ((pDevice->byBBType == BB_TYPE_11A) &&
> (pMgmt->uScanChannel <= CB_MAX_CHANNEL_24G)) {
> -                    pDevice->byBBType = BB_TYPE_11G;
> -                    CARDvSetBSSMode(pDevice);
> -                }
> -                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Scanning....
>  channel: [%d]\n", pMgmt->uScanChannel);
> -                // Set channel
> -                CARDbSetMediaChannel(pDevice, pMgmt->uScanChannel);
> -                // Set Baseband to be more sensitive.
> -
> -                if (pDevice->bUpdateBBVGA) {
> -                    BBvSetShortSlotTime(pDevice);
> -                    BBvSetVGAGainOffset(pDevice, pDevice->abyBBVGA[0]);
> -                    BBvUpdatePreEDThreshold(pDevice, true);
> -                }
> -                pMgmt->uScanChannel++;
> -
> -                while (!ChannelValid(pDevice->byZoneType,
> pMgmt->uScanChannel) &&
> -                        pMgmt->uScanChannel <= pDevice->byMaxChannel){
> -                    pMgmt->uScanChannel++;
> -                }
> -
> -                if (pMgmt->uScanChannel > pDevice->byMaxChannel) {
> -                    // Set Baseband to be not sensitive and rescan
> -                    pDevice->eCommandState = WLAN_CMD_SCAN_END;
> -
> -                }
> -                if ((pMgmt->b11hEnable == false) ||
> -                    (pMgmt->uScanChannel < CB_MAX_CHANNEL_24G)) {
> -                    s_vProbeChannel(pDevice);
> -                    spin_unlock_irq(&pDevice->lock);
> -                    vCommandTimerWait((void *) pDevice, 100);
> -                    return;
> -                } else {
> -                    spin_unlock_irq(&pDevice->lock);
> -                   vCommandTimerWait((void *) pDevice,
> WCMD_PASSIVE_SCAN_TIME);
> -                    return;
> -                }
> -
> -            }
> +
> +                       while (!ChannelValid(pDevice->byZoneType,
> pMgmt->uScanChannel) &&
> +                               pMgmt->uScanChannel <=
> pDevice->byMaxChannel){
> +                               pMgmt->uScanChannel++;
> +                       }
> +
> +                       if (pMgmt->uScanChannel > pDevice->byMaxChannel) {
> +                               // Set Baseband to be not sensitive and
> rescan
> +                               pDevice->eCommandState = WLAN_CMD_SCAN_END;
> +                       }
> +                       if ((pMgmt->b11hEnable == false) ||
> +                           (pMgmt->uScanChannel < CB_MAX_CHANNEL_24G)) {
> +                               s_vProbeChannel(pDevice);
> +                               spin_unlock_irq(&pDevice->lock);
> +                               vCommandTimerWait((void *) pDevice, 100);
> +                               return;
> +                       } else {
> +                               spin_unlock_irq(&pDevice->lock);
> +                               vCommandTimerWait((void *) pDevice,
> WCMD_PASSIVE_SCAN_TIME);
> +                               return;
> +                       }
> +               }
>
>              break;
>
>      case WLAN_CMD_SCAN_END:
>
>              // Set Baseband's sensitivity back.
> -            if (pDevice->byBBType != pDevice->byScanBBType) {
> -                pDevice->byBBType = pDevice->byScanBBType;
> -                CARDvSetBSSMode(pDevice);
> -            }
> +               if (pDevice->byBBType != pDevice->byScanBBType) {
> +                       pDevice->byBBType = pDevice->byScanBBType;
> +                       CARDvSetBSSMode(pDevice);
> +               }
>
> -            if (pDevice->bUpdateBBVGA) {
> -                BBvSetShortSlotTime(pDevice);
> -                BBvSetVGAGainOffset(pDevice, pDevice->byBBVGACurrent);
> -                BBvUpdatePreEDThreshold(pDevice, false);
> -            }
> +               if (pDevice->bUpdateBBVGA) {
> +                       BBvSetShortSlotTime(pDevice);
> +                       BBvSetVGAGainOffset(pDevice,
> pDevice->byBBVGACurrent);
> +                       BBvUpdatePreEDThreshold(pDevice, false);
> +               }
>
>              // Set channel back
>              vAdHocBeaconRestart(pDevice);
>              // Set channel back
>              CARDbSetMediaChannel(pDevice, pMgmt->uCurrChannel);
>              // Set Filter
> -            if (pMgmt->bCurrBSSIDFilterOn) {
> -                MACvRegBitsOn(pDevice, MAC_REG_RCR, RCR_BSSID);
> -                pDevice->byRxMode |= RCR_BSSID;
> -            }
> +               if (pMgmt->bCurrBSSIDFilterOn) {
> +                       MACvRegBitsOn(pDevice, MAC_REG_RCR, RCR_BSSID);
> +                       pDevice->byRxMode |= RCR_BSSID;
> +               }
>              DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Scanning, set back to
> channel: [%d]\n", pMgmt->uCurrChannel);
>                 pMgmt->uScanChannel = 0;
>              pMgmt->eScanState = WMAC_NO_SCANNING;
> @@ -430,37 +427,36 @@ void vRunCommand(struct work_struct *work)
>
>      case WLAN_CMD_DISASSOCIATE_START:
>                 pDevice->byReAssocCount = 0;
> -            if ((pMgmt->eCurrMode == WMAC_MODE_ESS_STA) &&
> -                (pMgmt->eCurrState != WMAC_STATE_ASSOC)) {
> -                s_bCommandComplete(pDevice);
> -                spin_unlock_irq(&pDevice->lock);
> -                return;
> -            } else {
> -
> -                     pDevice->bwextstep0 = false;
> -                        pDevice->bwextstep1 = false;
> -                        pDevice->bwextstep2 = false;
> -                        pDevice->bwextstep3 = false;
> -                  pDevice->bWPASuppWextEnabled = false;
> -                   pDevice->fWPA_Authened = false;
> -
> -                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Send Disassociation
> Packet..\n");
> -                // reason = 8 : disassoc because sta has left
> -               vMgrDisassocBeginSta((void *) pDevice,
> -                                    pMgmt,
> -                                    pMgmt->abyCurrBSSID,
> -                                    (8),
> -                                    &Status);
> -                pDevice->bLinkPass = false;
> -                ControlvMaskByte(pDevice,MESSAGE_REQUEST_MACREG,
> MAC_REG_PAPEDELAY, LEDSTS_STS, LEDSTS_SLOW);
> -                // unlock command busy
> -                pItemSSID = (PWLAN_IE_SSID)pMgmt->abyCurrSSID;
> -                pItemSSID->len = 0;
> -                memset(pItemSSID->abySSID, 0, WLAN_SSID_MAXLEN);
> -                pMgmt->eCurrState = WMAC_STATE_IDLE;
> -                pMgmt->sNodeDBTable[0].bActive = false;
> -//                pDevice->bBeaconBufReady = false;
> -            }
> +               if ((pMgmt->eCurrMode == WMAC_MODE_ESS_STA) &&
> +                   (pMgmt->eCurrState != WMAC_STATE_ASSOC)) {
> +                       s_bCommandComplete(pDevice);
> +                       spin_unlock_irq(&pDevice->lock);
> +                       return;
> +               } else {
> +                       pDevice->bwextstep0 = false;
> +                       pDevice->bwextstep1 = false;
> +                       pDevice->bwextstep2 = false;
> +                       pDevice->bwextstep3 = false;
> +                       pDevice->bWPASuppWextEnabled = false;
> +                       pDevice->fWPA_Authened = false;
> +
> +                       DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Send
> Disassociation Packet..\n");
> +                       // reason = 8 : disassoc because sta has left
> +                       vMgrDisassocBeginSta((void *) pDevice,
> +                                            pMgmt,
> +                                            pMgmt->abyCurrBSSID,
> +                                            (8),
> +                                            &Status);
> +                       pDevice->bLinkPass = false;
> +                       ControlvMaskByte(pDevice,MESSAGE_REQUEST_MACREG,
> MAC_REG_PAPEDELAY, LEDSTS_STS, LEDSTS_SLOW);
> +                       // unlock command busy
> +                       pItemSSID = (PWLAN_IE_SSID)pMgmt->abyCurrSSID;
> +                       pItemSSID->len = 0;
> +                       memset(pItemSSID->abySSID, 0, WLAN_SSID_MAXLEN);
> +                       pMgmt->eCurrState = WMAC_STATE_IDLE;
> +                       pMgmt->sNodeDBTable[0].bActive = false;
> +//                     pDevice->bBeaconBufReady = false;
> +               }
>              netif_stop_queue(pDevice->dev);
>              if (pDevice->bNeedRadioOFF == true)
>                  CARDbRadioPowerOff(pDevice);
> @@ -470,11 +466,11 @@ void vRunCommand(struct work_struct *work)
>      case WLAN_CMD_SSID_START:
>
>                 pDevice->byReAssocCount = 0;
> -            if (pDevice->bRadioOff == true) {
> -                s_bCommandComplete(pDevice);
> -                spin_unlock_irq(&pDevice->lock);
> -                return;
> -            }
> +               if (pDevice->bRadioOff == true) {
> +                       s_bCommandComplete(pDevice);
> +                       spin_unlock_irq(&pDevice->lock);
> +                       return;
> +               }
>
>              memcpy(pMgmt->abyAdHocSSID, pMgmt->abyDesireSSID,
>                                ((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->len
> + WLAN_IEHDR_LEN);
> @@ -484,28 +480,27 @@ void vRunCommand(struct work_struct *work)
>              DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" cmd: desire ssid = %s\n",
> pItemSSID->abySSID);
>              DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" cmd: curr ssid = %s\n",
> pItemSSIDCurr->abySSID);
>
> -            if (pMgmt->eCurrState == WMAC_STATE_ASSOC) {
> -                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" Cmd pMgmt->eCurrState
> == WMAC_STATE_ASSOC\n");
> -                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" pItemSSID->len
> =%d\n", pItemSSID->len);
> -                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" pItemSSIDCurr->len =
> %d\n", pItemSSIDCurr->len);
> -                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" desire ssid = %s\n",
> pItemSSID->abySSID);
> -                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" curr ssid = %s\n",
> pItemSSIDCurr->abySSID);
> -            }
> -
> -            if ((pMgmt->eCurrState == WMAC_STATE_ASSOC) ||
> -                ((pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) &&
> (pMgmt->eCurrState == WMAC_STATE_JOINTED))) {
> -
> -                if (pItemSSID->len == pItemSSIDCurr->len) {
> -                    if (memcmp(pItemSSID->abySSID,
> pItemSSIDCurr->abySSID, pItemSSID->len) == 0) {
> -                        s_bCommandComplete(pDevice);
> -                        spin_unlock_irq(&pDevice->lock);
> -                        return;
> -                    }
> -                }
> -                netif_stop_queue(pDevice->dev);
> -                pDevice->bLinkPass = false;
> -                ControlvMaskByte(pDevice, MESSAGE_REQUEST_MACREG,
> MAC_REG_PAPEDELAY, LEDSTS_STS, LEDSTS_SLOW);
> -            }
> +               if (pMgmt->eCurrState == WMAC_STATE_ASSOC) {
> +                       DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" Cmd
> pMgmt->eCurrState == WMAC_STATE_ASSOC\n");
> +                       DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" pItemSSID->len
> =%d\n", pItemSSID->len);
> +                       DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"
> pItemSSIDCurr->len = %d\n", pItemSSIDCurr->len);
> +                       DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" desire ssid =
> %s\n", pItemSSID->abySSID);
> +                       DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" curr ssid =
> %s\n", pItemSSIDCurr->abySSID);
> +               }
> +
> +               if ((pMgmt->eCurrState == WMAC_STATE_ASSOC) ||
> +                   ((pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) &&
> (pMgmt->eCurrState == WMAC_STATE_JOINTED))) {
> +                       if (pItemSSID->len == pItemSSIDCurr->len) {
> +                               if (memcmp(pItemSSID->abySSID,
> pItemSSIDCurr->abySSID, pItemSSID->len) == 0) {
> +                                       s_bCommandComplete(pDevice);
> +                                       spin_unlock_irq(&pDevice->lock);
> +                                       return;
> +                               }
> +                       }
> +                       netif_stop_queue(pDevice->dev);
> +                       pDevice->bLinkPass = false;
> +                       ControlvMaskByte(pDevice, MESSAGE_REQUEST_MACREG,
> MAC_REG_PAPEDELAY, LEDSTS_STS, LEDSTS_SLOW);
> +               }
>              // set initial state
>              pMgmt->eCurrState = WMAC_STATE_IDLE;
>              pMgmt->eCurrMode = WMAC_MODE_STANDBY;
> @@ -513,145 +508,144 @@ void vRunCommand(struct work_struct *work)
>              BSSvClearNodeDBTable(pDevice, 0);
>             vMgrJoinBSSBegin((void *) pDevice, &Status);
>              // if Infra mode
> -            if ((pMgmt->eCurrMode == WMAC_MODE_ESS_STA) &&
> (pMgmt->eCurrState == WMAC_STATE_JOINTED)) {
> -                // Call mgr to begin the deauthentication
> -                // reason = (3) because sta has left ESS
> -             if (pMgmt->eCurrState >= WMAC_STATE_AUTH) {
> -               vMgrDeAuthenBeginSta((void *)pDevice,
> -                                    pMgmt,
> -                                    pMgmt->abyCurrBSSID,
> -                                    (3),
> -                                    &Status);
> -             }
> -                // Call mgr to begin the authentication
> -               vMgrAuthenBeginSta((void *) pDevice, pMgmt, &Status);
> -                if (Status == CMD_STATUS_SUCCESS) {
> -                  pDevice->byLinkWaitCount = 0;
> -                    pDevice->eCommandState = WLAN_AUTHENTICATE_WAIT;
> -                   vCommandTimerWait((void *) pDevice,
> AUTHENTICATE_TIMEOUT);
> -                    spin_unlock_irq(&pDevice->lock);
> -                    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" Set eCommandState
> = WLAN_AUTHENTICATE_WAIT\n");
> -                    return;
> -                }
> -            }
> -            // if Adhoc mode
> -            else if (pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) {
> -                if (pMgmt->eCurrState == WMAC_STATE_JOINTED) {
> -                    if (netif_queue_stopped(pDevice->dev))
> -                        netif_wake_queue(pDevice->dev);
> -                    pDevice->bLinkPass = true;
> -                    ControlvMaskByte(pDevice, MESSAGE_REQUEST_MACREG,
> MAC_REG_PAPEDELAY, LEDSTS_STS, LEDSTS_INTER);
> -                    pMgmt->sNodeDBTable[0].bActive = true;
> -                    pMgmt->sNodeDBTable[0].uInActiveCount = 0;
> -                } else {
> -                    // start own IBSS
> -                   DBG_PRT(MSG_LEVEL_DEBUG,
> -                           KERN_INFO "CreateOwn IBSS by CurrMode =
> IBSS_STA\n");
> -                   vMgrCreateOwnIBSS((void *) pDevice, &Status);
> -                    if (Status != CMD_STATUS_SUCCESS) {
> -                       DBG_PRT(MSG_LEVEL_DEBUG,
> -                               KERN_INFO "WLAN_CMD_IBSS_CREATE fail!\n");
> -                    }
> -                    BSSvAddMulticastNode(pDevice);
> -                }
> -                s_bClearBSSID_SCAN(pDevice);
> -            }
> -            // if SSID not found
> -            else if (pMgmt->eCurrMode == WMAC_MODE_STANDBY) {
> -                if (pMgmt->eConfigMode == WMAC_CONFIG_IBSS_STA ||
> -                    pMgmt->eConfigMode == WMAC_CONFIG_AUTO) {
> -                    // start own IBSS
> -                       DBG_PRT(MSG_LEVEL_DEBUG,
> -                               KERN_INFO "CreateOwn IBSS by CurrMode =
> STANDBY\n");
> -                   vMgrCreateOwnIBSS((void *) pDevice, &Status);
> -                    if (Status != CMD_STATUS_SUCCESS) {
> -                       DBG_PRT(MSG_LEVEL_DEBUG,
> -                               KERN_INFO "WLAN_CMD_IBSS_CREATE fail!\n");
> -                    }
> -                    BSSvAddMulticastNode(pDevice);
> -                    s_bClearBSSID_SCAN(pDevice);
> +               if ((pMgmt->eCurrMode == WMAC_MODE_ESS_STA) &&
> (pMgmt->eCurrState == WMAC_STATE_JOINTED)) {
> +                       // Call mgr to begin the deauthentication
> +                       // reason = (3) because sta has left ESS
> +                       if (pMgmt->eCurrState >= WMAC_STATE_AUTH) {
> +                               vMgrDeAuthenBeginSta((void *)pDevice,
> +                                                    pMgmt,
> +                                                    pMgmt->abyCurrBSSID,
> +                                                    (3),
> +                                                    &Status);
> +                       }
> +                       // Call mgr to begin the authentication
> +                       vMgrAuthenBeginSta((void *) pDevice, pMgmt,
> &Status);
> +                       if (Status == CMD_STATUS_SUCCESS) {
> +                               pDevice->byLinkWaitCount = 0;
> +                               pDevice->eCommandState =
> WLAN_AUTHENTICATE_WAIT;
> +                               vCommandTimerWait((void *) pDevice,
> AUTHENTICATE_TIMEOUT);
> +                               spin_unlock_irq(&pDevice->lock);
> +                               DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" Set
> eCommandState = WLAN_AUTHENTICATE_WAIT\n");
> +                               return;
> +                       }
> +               }
> +               // if Adhoc mode
> +               else if (pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) {
> +                       if (pMgmt->eCurrState == WMAC_STATE_JOINTED) {
> +                               if (netif_queue_stopped(pDevice->dev))
> +                                       netif_wake_queue(pDevice->dev);
> +                               pDevice->bLinkPass = true;
> +                               ControlvMaskByte(pDevice,
> MESSAGE_REQUEST_MACREG, MAC_REG_PAPEDELAY, LEDSTS_STS, LEDSTS_INTER);
> +                               pMgmt->sNodeDBTable[0].bActive = true;
> +                               pMgmt->sNodeDBTable[0].uInActiveCount = 0;
> +                       } else {
> +                               // start own IBSS
> +                               DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO
> "CreateOwn IBSS by CurrMode = IBSS_STA\n");
> +                               vMgrCreateOwnIBSS((void *) pDevice,
> &Status);
> +                               if (Status != CMD_STATUS_SUCCESS) {
> +                                       DBG_PRT(MSG_LEVEL_DEBUG,
> +                                               KERN_INFO
> "WLAN_CMD_IBSS_CREATE fail!\n");
> +                               }
> +                               BSSvAddMulticastNode(pDevice);
> +                       }
> +                       s_bClearBSSID_SCAN(pDevice);
> +               }
> +               // if SSID not found
> +               else if (pMgmt->eCurrMode == WMAC_MODE_STANDBY) {
> +                       if (pMgmt->eConfigMode == WMAC_CONFIG_IBSS_STA ||
> +                           pMgmt->eConfigMode == WMAC_CONFIG_AUTO) {
> +                               // start own IBSS
> +                               DBG_PRT(MSG_LEVEL_DEBUG,
> +                                       KERN_INFO "CreateOwn IBSS by
> CurrMode = STANDBY\n");
> +                               vMgrCreateOwnIBSS((void *) pDevice,
> &Status);
> +                               if (Status != CMD_STATUS_SUCCESS) {
> +                                       DBG_PRT(MSG_LEVEL_DEBUG,
> +                                               KERN_INFO
> "WLAN_CMD_IBSS_CREATE fail!\n");
> +                               }
> +                               BSSvAddMulticastNode(pDevice);
> +                               s_bClearBSSID_SCAN(pDevice);
>  /*
> -                    pDevice->bLinkPass = true;
> -
>  ControlvMaskByte(pDevice,MESSAGE_REQUEST_MACREG,MAC_REG_PAPEDELAY,LEDSTS_STS,LEDSTS_INTER);
> -                    if (netif_queue_stopped(pDevice->dev)){
> -                        netif_wake_queue(pDevice->dev);
> -                    }
> -                    s_bClearBSSID_SCAN(pDevice);
> +                               pDevice->bLinkPass = true;
> +
> ControlvMaskByte(pDevice,MESSAGE_REQUEST_MACREG,MAC_REG_PAPEDELAY,LEDSTS_STS,LEDSTS_INTER);
> +                               if (netif_queue_stopped(pDevice->dev)){
> +                                       netif_wake_queue(pDevice->dev);
> +                               }
> +                               s_bClearBSSID_SCAN(pDevice);
>  */
> -                } else {
> -                    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Disconnect SSID
> none\n");
> -                    // if(pDevice->bWPASuppWextEnabled == true)
> -                        {
> -                       union iwreq_data  wrqu;
> -                       memset(&wrqu, 0, sizeof(wrqu));
> -                          wrqu.ap_addr.sa_family = ARPHRD_ETHER;
> -
> PRINT_K("wireless_send_event--->SIOCGIWAP(disassociated:vMgrJoinBSSBegin
> Fail !!)\n");
> -                       wireless_send_event(pDevice->dev, SIOCGIWAP,
> &wrqu, NULL);
> -                       }
> -                }
> -            }
> +                       } else {
> +                               DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO
> "Disconnect SSID none\n");
> +                               // if(pDevice->bWPASuppWextEnabled == true)
> +                               {
> +                                       union iwreq_data  wrqu;
> +                                       memset(&wrqu, 0, sizeof(wrqu));
> +                                       wrqu.ap_addr.sa_family =
> ARPHRD_ETHER;
> +
> PRINT_K("wireless_send_event--->SIOCGIWAP(disassociated:vMgrJoinBSSBegin
> Fail !!)\n");
> +                                       wireless_send_event(pDevice->dev,
> SIOCGIWAP, &wrqu, NULL);
> +                               }
> +                       }
> +               }
>              s_bCommandComplete(pDevice);
>              break;
>
>      case WLAN_AUTHENTICATE_WAIT:
>              DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"eCommandState ==
> WLAN_AUTHENTICATE_WAIT\n");
> -            if (pMgmt->eCurrState == WMAC_STATE_AUTH) {
> -               pDevice->byLinkWaitCount = 0;
> -                // Call mgr to begin the association
> -                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"eCurrState ==
> WMAC_STATE_AUTH\n");
> -               vMgrAssocBeginSta((void *) pDevice, pMgmt, &Status);
> -                if (Status == CMD_STATUS_SUCCESS) {
> -                    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"eCommandState =
> WLAN_ASSOCIATE_WAIT\n");
> -                 pDevice->byLinkWaitCount = 0;
> -                    pDevice->eCommandState = WLAN_ASSOCIATE_WAIT;
> -                   vCommandTimerWait((void *) pDevice, ASSOCIATE_TIMEOUT);
> -                    spin_unlock_irq(&pDevice->lock);
> -                    return;
> -                }
> -            } else if (pMgmt->eCurrState < WMAC_STATE_AUTHPENDING) {
> -               printk("WLAN_AUTHENTICATE_WAIT:Authen Fail???\n");
> -          } else if (pDevice->byLinkWaitCount <= 4) {    //mike add:wait
> another 2 sec if authenticated_frame delay!
> -                pDevice->byLinkWaitCount++;
> -              printk("WLAN_AUTHENTICATE_WAIT:wait %d times!!\n",
> pDevice->byLinkWaitCount);
> -              spin_unlock_irq(&pDevice->lock);
> -              vCommandTimerWait((void *) pDevice, AUTHENTICATE_TIMEOUT/2);
> -              return;
> -          }
> +               if (pMgmt->eCurrState == WMAC_STATE_AUTH) {
> +                       pDevice->byLinkWaitCount = 0;
> +                       // Call mgr to begin the association
> +                       DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"eCurrState ==
> WMAC_STATE_AUTH\n");
> +                       vMgrAssocBeginSta((void *) pDevice, pMgmt,
> &Status);
> +                       if (Status == CMD_STATUS_SUCCESS) {
> +                               DBG_PRT(MSG_LEVEL_DEBUG,
> KERN_INFO"eCommandState = WLAN_ASSOCIATE_WAIT\n");
> +                               pDevice->byLinkWaitCount = 0;
> +                               pDevice->eCommandState =
> WLAN_ASSOCIATE_WAIT;
> +                               vCommandTimerWait((void *) pDevice,
> ASSOCIATE_TIMEOUT);
> +                               spin_unlock_irq(&pDevice->lock);
> +                               return;
> +                       }
> +               } else if (pMgmt->eCurrState < WMAC_STATE_AUTHPENDING) {
> +                       printk("WLAN_AUTHENTICATE_WAIT:Authen Fail???\n");
> +               } else if (pDevice->byLinkWaitCount <= 4) {    //mike
> add:wait another 2 sec if authenticated_frame delay!
> +                       pDevice->byLinkWaitCount++;
> +                       printk("WLAN_AUTHENTICATE_WAIT:wait %d times!!\n",
> pDevice->byLinkWaitCount);
> +                       spin_unlock_irq(&pDevice->lock);
> +                       vCommandTimerWait((void *) pDevice,
> AUTHENTICATE_TIMEOUT/2);
> +                       return;
> +               }
>                   pDevice->byLinkWaitCount = 0;
>
>              s_bCommandComplete(pDevice);
>              break;
>
>      case WLAN_ASSOCIATE_WAIT:
> -            if (pMgmt->eCurrState == WMAC_STATE_ASSOC) {
> -                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"eCurrState ==
> WMAC_STATE_ASSOC\n");
> -                if (pDevice->ePSMode != WMAC_POWER_CAM) {
> -                       PSvEnablePowerSaving((void *) pDevice,
> -                                            pMgmt->wListenInterval);
> -                }
> +               if (pMgmt->eCurrState == WMAC_STATE_ASSOC) {
> +                       DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"eCurrState ==
> WMAC_STATE_ASSOC\n");
> +                       if (pDevice->ePSMode != WMAC_POWER_CAM) {
> +                               PSvEnablePowerSaving((void *) pDevice,
> +                                               pMgmt->wListenInterval);
> +                       }
>  /*
> -                if (pMgmt->eAuthenMode >= WMAC_AUTH_WPA) {
> -                    KeybRemoveAllKey(pDevice, &(pDevice->sKey),
> pDevice->abyBSSID);
> -                }
> +                       if (pMgmt->eAuthenMode >= WMAC_AUTH_WPA) {
> +                               KeybRemoveAllKey(pDevice,
> &(pDevice->sKey), pDevice->abyBSSID);
> +                       }
>  */
> -                pDevice->byLinkWaitCount = 0;
> -                pDevice->byReAssocCount = 0;
> -                pDevice->bLinkPass = true;
> -                ControlvMaskByte(pDevice, MESSAGE_REQUEST_MACREG,
> MAC_REG_PAPEDELAY, LEDSTS_STS, LEDSTS_INTER);
> -                s_bClearBSSID_SCAN(pDevice);
> -
> -                if (netif_queue_stopped(pDevice->dev))
> -                    netif_wake_queue(pDevice->dev);
> -
> -            } else if (pMgmt->eCurrState < WMAC_STATE_ASSOCPENDING) {
> -               printk("WLAN_ASSOCIATE_WAIT:Association Fail???\n");
> -          } else if (pDevice->byLinkWaitCount <= 4) {    //mike add:wait
> another 2 sec if associated_frame delay!
> -                pDevice->byLinkWaitCount++;
> -              printk("WLAN_ASSOCIATE_WAIT:wait %d times!!\n",
> pDevice->byLinkWaitCount);
> -              spin_unlock_irq(&pDevice->lock);
> -              vCommandTimerWait((void *) pDevice, ASSOCIATE_TIMEOUT/2);
> -              return;
> -          }
> +                       pDevice->byLinkWaitCount = 0;
> +                       pDevice->byReAssocCount = 0;
> +                       pDevice->bLinkPass = true;
> +                       ControlvMaskByte(pDevice, MESSAGE_REQUEST_MACREG,
> MAC_REG_PAPEDELAY, LEDSTS_STS, LEDSTS_INTER);
> +                       s_bClearBSSID_SCAN(pDevice);
> +
> +                       if (netif_queue_stopped(pDevice->dev))
> +                               netif_wake_queue(pDevice->dev);
> +
> +               } else if (pMgmt->eCurrState < WMAC_STATE_ASSOCPENDING) {
> +                       printk("WLAN_ASSOCIATE_WAIT:Association
> Fail???\n");
> +               } else if (pDevice->byLinkWaitCount <= 4) {    //mike
> add:wait another 2 sec if associated_frame delay!
> +                       pDevice->byLinkWaitCount++;
> +                       printk("WLAN_ASSOCIATE_WAIT:wait %d times!!\n",
> pDevice->byLinkWaitCount);
> +                       spin_unlock_irq(&pDevice->lock);
> +                       vCommandTimerWait((void *) pDevice,
> ASSOCIATE_TIMEOUT/2);
> +                       return;
> +               }
>
>              s_bCommandComplete(pDevice);
>              break;
> @@ -659,91 +653,91 @@ void vRunCommand(struct work_struct *work)
>      case WLAN_CMD_AP_MODE_START:
>              DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"eCommandState ==
> WLAN_CMD_AP_MODE_START\n");
>
> -            if (pMgmt->eConfigMode == WMAC_CONFIG_AP) {
> -               cancel_delayed_work_sync(&pDevice->second_callback_work);
> -                pMgmt->eCurrState = WMAC_STATE_IDLE;
> -                pMgmt->eCurrMode = WMAC_MODE_STANDBY;
> -                pDevice->bLinkPass = false;
> -                ControlvMaskByte(pDevice, MESSAGE_REQUEST_MACREG,
> MAC_REG_PAPEDELAY, LEDSTS_STS, LEDSTS_SLOW);
> -                if (pDevice->bEnableHostWEP == true)
> -                    BSSvClearNodeDBTable(pDevice, 1);
> -                else
> -                    BSSvClearNodeDBTable(pDevice, 0);
> -                pDevice->uAssocCount = 0;
> -                pMgmt->eCurrState = WMAC_STATE_IDLE;
> -                pDevice->bFixRate = false;
> -
> -               vMgrCreateOwnIBSS((void *) pDevice, &Status);
> -               if (Status != CMD_STATUS_SUCCESS) {
> -                       DBG_PRT(MSG_LEVEL_DEBUG,
> -                               KERN_INFO "vMgrCreateOwnIBSS fail!\n");
> -                }
> -                // always turn off unicast bit
> -                MACvRegBitsOff(pDevice, MAC_REG_RCR, RCR_UNICAST);
> -                pDevice->byRxMode &= ~RCR_UNICAST;
> -                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "wcmd: rx_mode =
> %x\n", pDevice->byRxMode);
> -                BSSvAddMulticastNode(pDevice);
> -                if (netif_queue_stopped(pDevice->dev))
> -                    netif_wake_queue(pDevice->dev);
> -                pDevice->bLinkPass = true;
> -                ControlvMaskByte(pDevice, MESSAGE_REQUEST_MACREG,
> MAC_REG_PAPEDELAY, LEDSTS_STS, LEDSTS_INTER);
> -               schedule_delayed_work(&pDevice->second_callback_work, HZ);
> -            }
> +               if (pMgmt->eConfigMode == WMAC_CONFIG_AP) {
> +
> cancel_delayed_work_sync(&pDevice->second_callback_work);
> +                       pMgmt->eCurrState = WMAC_STATE_IDLE;
> +                       pMgmt->eCurrMode = WMAC_MODE_STANDBY;
> +                       pDevice->bLinkPass = false;
> +                       ControlvMaskByte(pDevice, MESSAGE_REQUEST_MACREG,
> MAC_REG_PAPEDELAY, LEDSTS_STS, LEDSTS_SLOW);
> +                       if (pDevice->bEnableHostWEP == true)
> +                               BSSvClearNodeDBTable(pDevice, 1);
> +                       else
> +                               BSSvClearNodeDBTable(pDevice, 0);
> +                       pDevice->uAssocCount = 0;
> +                       pMgmt->eCurrState = WMAC_STATE_IDLE;
> +                       pDevice->bFixRate = false;
> +
> +                       vMgrCreateOwnIBSS((void *) pDevice, &Status);
> +                       if (Status != CMD_STATUS_SUCCESS) {
> +                               DBG_PRT(MSG_LEVEL_DEBUG,
> +                                       KERN_INFO "vMgrCreateOwnIBSS
> fail!\n");
> +                       }
> +                       // always turn off unicast bit
> +                       MACvRegBitsOff(pDevice, MAC_REG_RCR, RCR_UNICAST);
> +                       pDevice->byRxMode &= ~RCR_UNICAST;
> +                       DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "wcmd: rx_mode
> = %x\n", pDevice->byRxMode);
> +                       BSSvAddMulticastNode(pDevice);
> +                       if (netif_queue_stopped(pDevice->dev))
> +                               netif_wake_queue(pDevice->dev);
> +                       pDevice->bLinkPass = true;
> +                       ControlvMaskByte(pDevice, MESSAGE_REQUEST_MACREG,
> MAC_REG_PAPEDELAY, LEDSTS_STS, LEDSTS_INTER);
> +
> schedule_delayed_work(&pDevice->second_callback_work, HZ);
> +               }
>              s_bCommandComplete(pDevice);
>              break;
>
>      case WLAN_CMD_TX_PSPACKET_START:
>              // DTIM Multicast tx
> -            if (pMgmt->sNodeDBTable[0].bRxPSPoll) {
> -                while ((skb =
> skb_dequeue(&pMgmt->sNodeDBTable[0].sTxPSQueue)) != NULL) {
> -                    if
> (skb_queue_empty(&pMgmt->sNodeDBTable[0].sTxPSQueue)) {
> -                        pMgmt->abyPSTxMap[0] &= ~byMask[0];
> -                        pDevice->bMoreData = false;
> -                    } else {
> -                        pDevice->bMoreData = true;
> -                    }
> -
> -                    if (nsDMA_tx_packet(pDevice, TYPE_AC0DMA, skb) != 0)
> -                        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Multicast ps
> tx fail\n");
> -
> -                    pMgmt->sNodeDBTable[0].wEnQueueCnt--;
> -                }
> -            }
> +               if (pMgmt->sNodeDBTable[0].bRxPSPoll) {
> +                       while ((skb =
> skb_dequeue(&pMgmt->sNodeDBTable[0].sTxPSQueue)) != NULL) {
> +                               if
> (skb_queue_empty(&pMgmt->sNodeDBTable[0].sTxPSQueue)) {
> +                                       pMgmt->abyPSTxMap[0] &= ~byMask[0];
> +                                       pDevice->bMoreData = false;
> +                               } else {
> +                                       pDevice->bMoreData = true;
> +                               }
> +
> +                               if (nsDMA_tx_packet(pDevice, TYPE_AC0DMA,
> skb) != 0)
> +                                       DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO
> "Multicast ps tx fail\n");
> +
> +                               pMgmt->sNodeDBTable[0].wEnQueueCnt--;
> +                       }
> +               }
>
>              // PS nodes tx
> -            for (ii = 1; ii < (MAX_NODE_NUM + 1); ii++) {
> -                if (pMgmt->sNodeDBTable[ii].bActive &&
> -                    pMgmt->sNodeDBTable[ii].bRxPSPoll) {
> -                    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Index=%d Enqueu
> Cnt= %d\n",
> -                               ii, pMgmt->sNodeDBTable[ii].wEnQueueCnt);
> -                    while ((skb =
> skb_dequeue(&pMgmt->sNodeDBTable[ii].sTxPSQueue)) != NULL) {
> -                        if
> (skb_queue_empty(&pMgmt->sNodeDBTable[ii].sTxPSQueue)) {
> -                            // clear tx map
> -
>  pMgmt->abyPSTxMap[pMgmt->sNodeDBTable[ii].wAID >> 3] &=
> -                                    ~byMask[pMgmt->sNodeDBTable[ii].wAID
> & 7];
> -                            pDevice->bMoreData = false;
> -                        } else {
> -                            pDevice->bMoreData = true;
> -                        }
> -
> -                        if (nsDMA_tx_packet(pDevice, TYPE_AC0DMA, skb) !=
> 0)
> -                            DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "sta ps tx
> fail\n");
> -
> -                        pMgmt->sNodeDBTable[ii].wEnQueueCnt--;
> -                        // check if sta ps enable, wait next pspoll
> -                        // if sta ps disable, send all pending buffers.
> -                        if (pMgmt->sNodeDBTable[ii].bPSEnable)
> -                            break;
> -                    }
> -                    if
> (skb_queue_empty(&pMgmt->sNodeDBTable[ii].sTxPSQueue)) {
> -                        // clear tx map
> -                        pMgmt->abyPSTxMap[pMgmt->sNodeDBTable[ii].wAID >>
> 3] &=
> -                                    ~byMask[pMgmt->sNodeDBTable[ii].wAID
> & 7];
> -                        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Index=%d PS
> queue clear\n", ii);
> -                    }
> -                    pMgmt->sNodeDBTable[ii].bRxPSPoll = false;
> -                }
> -            }
> +               for (ii = 1; ii < (MAX_NODE_NUM + 1); ii++) {
> +                       if (pMgmt->sNodeDBTable[ii].bActive &&
> +                           pMgmt->sNodeDBTable[ii].bRxPSPoll) {
> +                               DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO
> "Index=%d Enqueu Cnt= %d\n",
> +                                               ii,
> pMgmt->sNodeDBTable[ii].wEnQueueCnt);
> +                               while ((skb =
> skb_dequeue(&pMgmt->sNodeDBTable[ii].sTxPSQueue)) != NULL) {
> +                                       if
> (skb_queue_empty(&pMgmt->sNodeDBTable[ii].sTxPSQueue)) {
> +                                               // clear tx map
> +
> pMgmt->abyPSTxMap[pMgmt->sNodeDBTable[ii].wAID >> 3] &=
> +
> ~byMask[pMgmt->sNodeDBTable[ii].wAID & 7];
> +                                               pDevice->bMoreData = false;
> +                                       } else {
> +                                               pDevice->bMoreData = true;
> +                                       }
> +
> +                                       if (nsDMA_tx_packet(pDevice,
> TYPE_AC0DMA, skb) != 0)
> +                                               DBG_PRT(MSG_LEVEL_DEBUG,
> KERN_INFO "sta ps tx fail\n");
> +
> +
> pMgmt->sNodeDBTable[ii].wEnQueueCnt--;
> +                                       // check if sta ps enable, wait
> next pspoll
> +                                       // if sta ps disable, send all
> pending buffers.
> +                                       if
> (pMgmt->sNodeDBTable[ii].bPSEnable)
> +                                               break;
> +                               }
> +                               if
> (skb_queue_empty(&pMgmt->sNodeDBTable[ii].sTxPSQueue)) {
> +                                       // clear tx map
> +
> pMgmt->abyPSTxMap[pMgmt->sNodeDBTable[ii].wAID >> 3] &=
> +
> ~byMask[pMgmt->sNodeDBTable[ii].wAID & 7];
> +                                       DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO
> "Index=%d PS queue clear\n", ii);
> +                               }
> +                               pMgmt->sNodeDBTable[ii].bRxPSPoll = false;
> +                       }
> +               }
>
>              s_bCommandComplete(pDevice);
>              break;
> @@ -751,94 +745,93 @@ void vRunCommand(struct work_struct *work)
>      case WLAN_CMD_RADIO_START:
>
>              DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"eCommandState ==
> WLAN_CMD_RADIO_START\n");
> -       //     if (pDevice->bRadioCmd == true)
> -       //         CARDbRadioPowerOn(pDevice);
> -       //     else
> -       //         CARDbRadioPowerOff(pDevice);
> -
> -       {
> -              int ntStatus = STATUS_SUCCESS;
> -        u8            byTmp;
> -
> -        ntStatus = CONTROLnsRequestIn(pDevice,
> -                                    MESSAGE_TYPE_READ,
> -                                    MAC_REG_GPIOCTL1,
> -                                    MESSAGE_REQUEST_MACREG,
> -                                    1,
> -                                    &byTmp);
> -
> -        if (ntStatus != STATUS_SUCCESS) {
> -                s_bCommandComplete(pDevice);
> -                spin_unlock_irq(&pDevice->lock);
> -                return;
> -        }
> -        if ((byTmp & GPIO3_DATA) == 0) {
> -           DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"
> WLAN_CMD_RADIO_START_OFF........................\n");
> -                // Old commands are useless.
> -                // empty command Q
> -              pDevice->cbFreeCmdQueue = CMD_Q_SIZE;
> -                pDevice->uCmdDequeueIdx = 0;
> -                pDevice->uCmdEnqueueIdx = 0;
> -                //0415pDevice->bCmdRunning = false;
> -                pDevice->bCmdClear = true;
> -                pDevice->bStopTx0Pkt = false;
> -                pDevice->bStopDataPkt = true;
> -
> -                pDevice->byKeyIndex = 0;
> -                pDevice->bTransmitKey = false;
> -           spin_unlock_irq(&pDevice->lock);
> -           KeyvInitTable(pDevice, &pDevice->sKey);
> -           spin_lock_irq(&pDevice->lock);
> -              pMgmt->byCSSPK = KEY_CTL_NONE;
> -                pMgmt->byCSSGK = KEY_CTL_NONE;
> -
> -         if (pDevice->bLinkPass == true) {
> -                // reason = 8 : disassoc because sta has left
> -               vMgrDisassocBeginSta((void *) pDevice,
> -                                    pMgmt,
> -                                    pMgmt->abyCurrBSSID,
> -                                    (8),
> -                                    &Status);
> -                       pDevice->bLinkPass = false;
> -                // unlock command busy
> -                        pMgmt->eCurrState = WMAC_STATE_IDLE;
> -                        pMgmt->sNodeDBTable[0].bActive = false;
> -                    // if(pDevice->bWPASuppWextEnabled == true)
> -                        {
> -                       union iwreq_data  wrqu;
> -                       memset(&wrqu, 0, sizeof(wrqu));
> -                          wrqu.ap_addr.sa_family = ARPHRD_ETHER;
> -
> PRINT_K("wireless_send_event--->SIOCGIWAP(disassociated)\n");
> -                       wireless_send_event(pDevice->dev, SIOCGIWAP,
> &wrqu, NULL);
> -                       }
> -               }
> -                      pDevice->bwextstep0 = false;
> -                        pDevice->bwextstep1 = false;
> -                        pDevice->bwextstep2 = false;
> -                        pDevice->bwextstep3 = false;
> -                     pDevice->bWPASuppWextEnabled = false;
> -                         //clear current SSID
> -                  pItemSSID = (PWLAN_IE_SSID)pMgmt->abyCurrSSID;
> -                  pItemSSID->len = 0;
> -                  memset(pItemSSID->abySSID, 0, WLAN_SSID_MAXLEN);
> -                //clear desired SSID
> -                pItemSSID = (PWLAN_IE_SSID)pMgmt->abyDesireSSID;
> -                pItemSSID->len = 0;
> -                memset(pItemSSID->abySSID, 0, WLAN_SSID_MAXLEN);
> -
> -           netif_stop_queue(pDevice->dev);
> -           CARDbRadioPowerOff(pDevice);
> -             MACvRegBitsOn(pDevice, MAC_REG_GPIOCTL1, GPIO3_INTMD);
> -           ControlvMaskByte(pDevice, MESSAGE_REQUEST_MACREG,
> MAC_REG_PAPEDELAY, LEDSTS_STS, LEDSTS_OFF);
> -           pDevice->bHWRadioOff = true;
> -        } else {
> -            DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"
> WLAN_CMD_RADIO_START_ON........................\n");
> -            pDevice->bHWRadioOff = false;
> -                CARDbRadioPowerOn(pDevice);
> -            MACvRegBitsOff(pDevice, MAC_REG_GPIOCTL1, GPIO3_INTMD);
> -            ControlvMaskByte(pDevice, MESSAGE_REQUEST_MACREG,
> MAC_REG_PAPEDELAY, LEDSTS_STS, LEDSTS_ON);
> -        }
> -      }
> +//             if (pDevice->bRadioCmd == true)
> +//                     CARDbRadioPowerOn(pDevice);
> +//             else
> +//                     CARDbRadioPowerOff(pDevice);
> +               {
> +                       int ntStatus = STATUS_SUCCESS;
> +                       u8            byTmp;
> +
> +                       ntStatus = CONTROLnsRequestIn(pDevice,
> +                                       MESSAGE_TYPE_READ,
> +                                       MAC_REG_GPIOCTL1,
> +                                       MESSAGE_REQUEST_MACREG,
> +                                       1,
> +                                       &byTmp);
> +
> +                       if (ntStatus != STATUS_SUCCESS) {
> +                               s_bCommandComplete(pDevice);
> +                               spin_unlock_irq(&pDevice->lock);
> +                               return;
> +                       }
> +                       if ((byTmp & GPIO3_DATA) == 0) {
> +                               DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"
> WLAN_CMD_RADIO_START_OFF........................\n");
> +                               // Old commands are useless.
> +                               // empty command Q
> +                               pDevice->cbFreeCmdQueue = CMD_Q_SIZE;
> +                               pDevice->uCmdDequeueIdx = 0;
> +                               pDevice->uCmdEnqueueIdx = 0;
> +                               //0415pDevice->bCmdRunning = false;
> +                               pDevice->bCmdClear = true;
> +                               pDevice->bStopTx0Pkt = false;
> +                               pDevice->bStopDataPkt = true;
> +
> +                               pDevice->byKeyIndex = 0;
> +                               pDevice->bTransmitKey = false;
> +                               spin_unlock_irq(&pDevice->lock);
> +                               KeyvInitTable(pDevice, &pDevice->sKey);
> +                               spin_lock_irq(&pDevice->lock);
> +                               pMgmt->byCSSPK = KEY_CTL_NONE;
> +                               pMgmt->byCSSGK = KEY_CTL_NONE;
> +
> +                               if (pDevice->bLinkPass == true) {
> +                                       // reason = 8 : disassoc because
> sta has left
> +                                       vMgrDisassocBeginSta((void *)
> pDevice,
> +                                                       pMgmt,
> +
> pMgmt->abyCurrBSSID,
> +                                                       (8),
> +                                                       &Status);
> +                                       pDevice->bLinkPass = false;
> +                                       // unlock command busy
> +                                       pMgmt->eCurrState =
> WMAC_STATE_IDLE;
> +                                       pMgmt->sNodeDBTable[0].bActive =
> false;
> +                                       // if(pDevice->bWPASuppWextEnabled
> == true)
> +                                       {
> +                                               union iwreq_data  wrqu;
> +                                               memset(&wrqu, 0,
> sizeof(wrqu));
> +                                               wrqu.ap_addr.sa_family =
> ARPHRD_ETHER;
> +
> PRINT_K("wireless_send_event--->SIOCGIWAP(disassociated)\n");
> +
> wireless_send_event(pDevice->dev, SIOCGIWAP, &wrqu, NULL);
> +                                       }
> +                               }
> +                               pDevice->bwextstep0 = false;
> +                               pDevice->bwextstep1 = false;
> +                               pDevice->bwextstep2 = false;
> +                               pDevice->bwextstep3 = false;
> +                               pDevice->bWPASuppWextEnabled = false;
> +                               //clear current SSID
> +                               pItemSSID =
> (PWLAN_IE_SSID)pMgmt->abyCurrSSID;
> +                               pItemSSID->len = 0;
> +                               memset(pItemSSID->abySSID, 0,
> WLAN_SSID_MAXLEN);
> +                               //clear desired SSID
> +                               pItemSSID =
> (PWLAN_IE_SSID)pMgmt->abyDesireSSID;
> +                               pItemSSID->len = 0;
> +                               memset(pItemSSID->abySSID, 0,
> WLAN_SSID_MAXLEN);
> +
> +                               netif_stop_queue(pDevice->dev);
> +                               CARDbRadioPowerOff(pDevice);
> +                               MACvRegBitsOn(pDevice, MAC_REG_GPIOCTL1,
> GPIO3_INTMD);
> +                               ControlvMaskByte(pDevice,
> MESSAGE_REQUEST_MACREG, MAC_REG_PAPEDELAY, LEDSTS_STS, LEDSTS_OFF);
> +                               pDevice->bHWRadioOff = true;
> +                       } else {
> +                               DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"
> WLAN_CMD_RADIO_START_ON........................\n");
> +                               pDevice->bHWRadioOff = false;
> +                               CARDbRadioPowerOn(pDevice);
> +                               MACvRegBitsOff(pDevice, MAC_REG_GPIOCTL1,
> GPIO3_INTMD);
> +                               ControlvMaskByte(pDevice,
> MESSAGE_REQUEST_MACREG, MAC_REG_PAPEDELAY, LEDSTS_STS, LEDSTS_ON);
> +                       }
> +               }
>
>              s_bCommandComplete(pDevice);
>              break;
> @@ -872,19 +865,19 @@ void vRunCommand(struct work_struct *work)
>
>      case WLAN_CMD_CHANGE_ANTENNA_START:
>              DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Change from Antenna%d to",
> (int)pDevice->dwRxAntennaSel);
> -            if (pDevice->dwRxAntennaSel == 0) {
> -                pDevice->dwRxAntennaSel = 1;
> -                if (pDevice->bTxRxAntInv == true)
> -                    BBvSetAntennaMode(pDevice, ANT_RXA);
> -                else
> -                    BBvSetAntennaMode(pDevice, ANT_RXB);
> -            } else {
> -                pDevice->dwRxAntennaSel = 0;
> -                if (pDevice->bTxRxAntInv == true)
> -                    BBvSetAntennaMode(pDevice, ANT_RXB);
> -                else
> -                    BBvSetAntennaMode(pDevice, ANT_RXA);
> -            }
> +               if (pDevice->dwRxAntennaSel == 0) {
> +                       pDevice->dwRxAntennaSel = 1;
> +                       if (pDevice->bTxRxAntInv == true)
> +                               BBvSetAntennaMode(pDevice, ANT_RXA);
> +                       else
> +                               BBvSetAntennaMode(pDevice, ANT_RXB);
> +               } else {
> +                       pDevice->dwRxAntennaSel = 0;
> +                       if (pDevice->bTxRxAntInv == true)
> +                               BBvSetAntennaMode(pDevice, ANT_RXB);
> +                       else
> +                               BBvSetAntennaMode(pDevice, ANT_RXA);
> +               }
>              s_bCommandComplete(pDevice);
>              break;
>
> @@ -895,16 +888,16 @@ void vRunCommand(struct work_struct *work)
>
>      case WLAN_CMD_MAC_DISPOWERSAVING_START:
>              ControlvReadByte(pDevice, MESSAGE_REQUEST_MACREG,
> MAC_REG_PSCTL, &byData);
> -            if ((byData & PSCTL_PS) != 0) {
> -                // disable power saving hw function
> -                CONTROLnsRequestOut(pDevice,
> -                                MESSAGE_TYPE_DISABLE_PS,
> -                                0,
> -                                0,
> -                                0,
> -                                NULL
> -                                );
> -            }
> +               if ((byData & PSCTL_PS) != 0) {
> +                       // disable power saving hw function
> +                       CONTROLnsRequestOut(pDevice,
> +                                       MESSAGE_TYPE_DISABLE_PS,
> +                                       0,
> +                                       0,
> +                                       0,
> +                                       NULL
> +                                       );
> +               }
>              s_bCommandComplete(pDevice);
>              break;
>
> @@ -933,95 +926,94 @@ static int s_bCommandComplete(struct vnt_private
> *pDevice)
>         int bForceSCAN = true;
>
>      pDevice->eCommandState = WLAN_CMD_IDLE;
> -    if (pDevice->cbFreeCmdQueue == CMD_Q_SIZE) {
> -        //Command Queue Empty
> -        pDevice->bCmdRunning = false;
> -        return true;
> -    } else {
> -        pDevice->eCommand =
> pDevice->eCmdQueue[pDevice->uCmdDequeueIdx].eCmd;
> -        pSSID =
> (PWLAN_IE_SSID)pDevice->eCmdQueue[pDevice->uCmdDequeueIdx].abyCmdDesireSSID;
> -        bRadioCmd = pDevice->eCmdQueue[pDevice->uCmdDequeueIdx].bRadioCmd;
> -        bForceSCAN =
> pDevice->eCmdQueue[pDevice->uCmdDequeueIdx].bForceSCAN;
> -        ADD_ONE_WITH_WRAP_AROUND(pDevice->uCmdDequeueIdx, CMD_Q_SIZE);
> -        pDevice->cbFreeCmdQueue++;
> -        pDevice->bCmdRunning = true;
> -        switch (pDevice->eCommand) {
> -        case WLAN_CMD_BSSID_SCAN:
> -                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"eCommandState=
> WLAN_CMD_BSSID_SCAN\n");
> -                pDevice->eCommandState = WLAN_CMD_SCAN_START;
> -                pMgmt->uScanChannel = 0;
> -                if (pSSID->len != 0)
> -                    memcpy(pMgmt->abyScanSSID, pSSID, WLAN_IEHDR_LEN +
> WLAN_SSID_MAXLEN + 1);
> -                else
> -                    memset(pMgmt->abyScanSSID, 0, WLAN_IEHDR_LEN +
> WLAN_SSID_MAXLEN + 1);
> +       if (pDevice->cbFreeCmdQueue == CMD_Q_SIZE) {
> +               //Command Queue Empty
> +               pDevice->bCmdRunning = false;
> +               return true;
> +       } else {
> +               pDevice->eCommand =
> pDevice->eCmdQueue[pDevice->uCmdDequeueIdx].eCmd;
> +               pSSID =
> (PWLAN_IE_SSID)pDevice->eCmdQueue[pDevice->uCmdDequeueIdx].abyCmdDesireSSID;
> +               bRadioCmd =
> pDevice->eCmdQueue[pDevice->uCmdDequeueIdx].bRadioCmd;
> +               bForceSCAN =
> pDevice->eCmdQueue[pDevice->uCmdDequeueIdx].bForceSCAN;
> +               ADD_ONE_WITH_WRAP_AROUND(pDevice->uCmdDequeueIdx,
> CMD_Q_SIZE);
> +               pDevice->cbFreeCmdQueue++;
> +               pDevice->bCmdRunning = true;
> +               switch (pDevice->eCommand) {
> +               case WLAN_CMD_BSSID_SCAN:
> +                       DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"eCommandState=
> WLAN_CMD_BSSID_SCAN\n");
> +                       pDevice->eCommandState = WLAN_CMD_SCAN_START;
> +                       pMgmt->uScanChannel = 0;
> +                       if (pSSID->len != 0)
> +                               memcpy(pMgmt->abyScanSSID, pSSID,
> WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1);
> +                       else
> +                               memset(pMgmt->abyScanSSID, 0,
> WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1);
>  /*
> -                if ((bForceSCAN == false) && (pDevice->bLinkPass ==
> true)) {
> -                    if ((pSSID->len ==
> ((PWLAN_IE_SSID)pMgmt->abyCurrSSID)->len) &&
> -                        ( !memcmp(pSSID->abySSID,
> ((PWLAN_IE_SSID)pMgmt->abyCurrSSID)->abySSID, pSSID->len))) {
> -                        pDevice->eCommandState = WLAN_CMD_IDLE;
> -                    }
> -                }
> +                       if ((bForceSCAN == false) && (pDevice->bLinkPass
> == true)) {
> +                               if ((pSSID->len ==
> ((PWLAN_IE_SSID)pMgmt->abyCurrSSID)->len) &&
> +                                   ( !memcmp(pSSID->abySSID,
> ((PWLAN_IE_SSID)pMgmt->abyCurrSSID)->abySSID, pSSID->len))) {
> +                                       pDevice->eCommandState =
> WLAN_CMD_IDLE;
> +                               }
> +                       }
>  */
> -                break;
> -        case WLAN_CMD_SSID:
> -                pDevice->eCommandState = WLAN_CMD_SSID_START;
> -                if (pSSID->len > WLAN_SSID_MAXLEN)
> -                    pSSID->len = WLAN_SSID_MAXLEN;
> -                if (pSSID->len != 0)
> -                    memcpy(pMgmt->abyDesireSSID, pSSID, WLAN_IEHDR_LEN +
> WLAN_SSID_MAXLEN + 1);
> -                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"eCommandState=
> WLAN_CMD_SSID_START\n");
> -                break;
> -        case WLAN_CMD_DISASSOCIATE:
> -                pDevice->eCommandState = WLAN_CMD_DISASSOCIATE_START;
> -                break;
> -        case WLAN_CMD_RX_PSPOLL:
> -                pDevice->eCommandState = WLAN_CMD_TX_PSPACKET_START;
> -                break;
> -        case WLAN_CMD_RUN_AP:
> -                pDevice->eCommandState = WLAN_CMD_AP_MODE_START;
> -                break;
> -        case WLAN_CMD_RADIO:
> -                pDevice->eCommandState = WLAN_CMD_RADIO_START;
> -                pDevice->bRadioCmd = bRadioCmd;
> -                break;
> -        case WLAN_CMD_CHANGE_BBSENSITIVITY:
> -                pDevice->eCommandState =
> WLAN_CMD_CHANGE_BBSENSITIVITY_START;
> -                break;
> -
> -        case WLAN_CMD_TBTT_WAKEUP:
> -                pDevice->eCommandState = WLAN_CMD_TBTT_WAKEUP_START;
> -                break;
> -
> -        case WLAN_CMD_BECON_SEND:
> -                pDevice->eCommandState = WLAN_CMD_BECON_SEND_START;
> -                break;
> -
> -        case WLAN_CMD_SETPOWER:
> -                pDevice->eCommandState = WLAN_CMD_SETPOWER_START;
> -                break;
> -
> -        case WLAN_CMD_CHANGE_ANTENNA:
> -                pDevice->eCommandState = WLAN_CMD_CHANGE_ANTENNA_START;
> -                break;
> -
> -        case WLAN_CMD_REMOVE_ALLKEY:
> -                pDevice->eCommandState = WLAN_CMD_REMOVE_ALLKEY_START;
> -                break;
> -
> -        case WLAN_CMD_MAC_DISPOWERSAVING:
> -                pDevice->eCommandState =
> WLAN_CMD_MAC_DISPOWERSAVING_START;
> -                break;
> -
> -        case WLAN_CMD_11H_CHSW:
> -                pDevice->eCommandState = WLAN_CMD_11H_CHSW_START;
> -                break;
> -
> -        default:
> -                break;
> -
> -        }
> -       vCommandTimerWait(pDevice, 0);
> -    }
> +                       break;
> +               case WLAN_CMD_SSID:
> +                       pDevice->eCommandState = WLAN_CMD_SSID_START;
> +                       if (pSSID->len > WLAN_SSID_MAXLEN)
> +                               pSSID->len = WLAN_SSID_MAXLEN;
> +                       if (pSSID->len != 0)
> +                               memcpy(pMgmt->abyDesireSSID, pSSID,
> WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1);
> +                       DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"eCommandState=
> WLAN_CMD_SSID_START\n");
> +                       break;
> +               case WLAN_CMD_DISASSOCIATE:
> +                       pDevice->eCommandState =
> WLAN_CMD_DISASSOCIATE_START;
> +                       break;
> +               case WLAN_CMD_RX_PSPOLL:
> +                       pDevice->eCommandState =
> WLAN_CMD_TX_PSPACKET_START;
> +                       break;
> +               case WLAN_CMD_RUN_AP:
> +                       pDevice->eCommandState = WLAN_CMD_AP_MODE_START;
> +                       break;
> +               case WLAN_CMD_RADIO:
> +                       pDevice->eCommandState = WLAN_CMD_RADIO_START;
> +                       pDevice->bRadioCmd = bRadioCmd;
> +                       break;
> +               case WLAN_CMD_CHANGE_BBSENSITIVITY:
> +                       pDevice->eCommandState =
> WLAN_CMD_CHANGE_BBSENSITIVITY_START;
> +                       break;
> +
> +               case WLAN_CMD_TBTT_WAKEUP:
> +                       pDevice->eCommandState =
> WLAN_CMD_TBTT_WAKEUP_START;
> +                       break;
> +
> +               case WLAN_CMD_BECON_SEND:
> +                       pDevice->eCommandState = WLAN_CMD_BECON_SEND_START;
> +                       break;
> +
> +               case WLAN_CMD_SETPOWER:
> +                       pDevice->eCommandState = WLAN_CMD_SETPOWER_START;
> +                       break;
> +
> +               case WLAN_CMD_CHANGE_ANTENNA:
> +                       pDevice->eCommandState =
> WLAN_CMD_CHANGE_ANTENNA_START;
> +                       break;
> +
> +               case WLAN_CMD_REMOVE_ALLKEY:
> +                       pDevice->eCommandState =
> WLAN_CMD_REMOVE_ALLKEY_START;
> +                       break;
> +
> +               case WLAN_CMD_MAC_DISPOWERSAVING:
> +                       pDevice->eCommandState =
> WLAN_CMD_MAC_DISPOWERSAVING_START;
> +                       break;
> +
> +               case WLAN_CMD_11H_CHSW:
> +                       pDevice->eCommandState = WLAN_CMD_11H_CHSW_START;
> +                       break;
> +
> +               default:
> +                       break;
> +               }
> +               vCommandTimerWait(pDevice, 0);
> +       }
>
>      return true;
>  }
> @@ -1030,47 +1022,47 @@ int bScheduleCommand(struct vnt_private *pDevice,
>                 CMD_CODE eCommand, u8 *pbyItem0)
>  {
>
> -    if (pDevice->cbFreeCmdQueue == 0)
> -        return (false);
> -    pDevice->eCmdQueue[pDevice->uCmdEnqueueIdx].eCmd = eCommand;
> -    pDevice->eCmdQueue[pDevice->uCmdEnqueueIdx].bForceSCAN = true;
> -    memset(pDevice->eCmdQueue[pDevice->uCmdEnqueueIdx].abyCmdDesireSSID,
> 0 , WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1);
> -    if (pbyItem0 != NULL) {
> -        switch (eCommand) {
> -        case WLAN_CMD_BSSID_SCAN:
> -                pDevice->eCmdQueue[pDevice->uCmdEnqueueIdx].bForceSCAN =
> false;
> -
>  memcpy(pDevice->eCmdQueue[pDevice->uCmdEnqueueIdx].abyCmdDesireSSID,
> -                         pbyItem0, WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1);
> -                break;
> -
> -        case WLAN_CMD_SSID:
> -
>  memcpy(pDevice->eCmdQueue[pDevice->uCmdEnqueueIdx].abyCmdDesireSSID,
> -                         pbyItem0, WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1);
> -                break;
> -
> -        case WLAN_CMD_DISASSOCIATE:
> -                pDevice->eCmdQueue[pDevice->uCmdEnqueueIdx].bNeedRadioOFF
> = *((int *)pbyItem0);
> -                break;
> +       if (pDevice->cbFreeCmdQueue == 0)
> +               return (false);
> +       pDevice->eCmdQueue[pDevice->uCmdEnqueueIdx].eCmd = eCommand;
> +       pDevice->eCmdQueue[pDevice->uCmdEnqueueIdx].bForceSCAN = true;
> +
> memset(pDevice->eCmdQueue[pDevice->uCmdEnqueueIdx].abyCmdDesireSSID, 0 ,
> WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1);
> +       if (pbyItem0 != NULL) {
> +               switch (eCommand) {
> +               case WLAN_CMD_BSSID_SCAN:
> +
> pDevice->eCmdQueue[pDevice->uCmdEnqueueIdx].bForceSCAN = false;
> +
> memcpy(pDevice->eCmdQueue[pDevice->uCmdEnqueueIdx].abyCmdDesireSSID,
> +                               pbyItem0, WLAN_IEHDR_LEN +
> WLAN_SSID_MAXLEN + 1);
> +                       break;
> +
> +               case WLAN_CMD_SSID:
> +
> memcpy(pDevice->eCmdQueue[pDevice->uCmdEnqueueIdx].abyCmdDesireSSID,
> +                               pbyItem0, WLAN_IEHDR_LEN +
> WLAN_SSID_MAXLEN + 1);
> +                       break;
> +
> +               case WLAN_CMD_DISASSOCIATE:
> +
> pDevice->eCmdQueue[pDevice->uCmdEnqueueIdx].bNeedRadioOFF = *((int
> *)pbyItem0);
> +                       break;
>  /*
> -        case WLAN_CMD_DEAUTH:
> -
>  pDevice->eCmdQueue[pDevice->uCmdEnqueueIdx].wDeAuthenReason = *((u16
> *)pbyItem0);
> -                break;
> +               case WLAN_CMD_DEAUTH:
> +
> pDevice->eCmdQueue[pDevice->uCmdEnqueueIdx].wDeAuthenReason = *((u16
> *)pbyItem0);
> +                       break;
>  */
>
> -        case WLAN_CMD_RADIO:
> -                pDevice->eCmdQueue[pDevice->uCmdEnqueueIdx].bRadioCmd =
> *((int *)pbyItem0);
> -                break;
> +               case WLAN_CMD_RADIO:
> +
> pDevice->eCmdQueue[pDevice->uCmdEnqueueIdx].bRadioCmd = *((int *)pbyItem0);
> +                       break;
>
> -        default:
> -                break;
> -        }
> -    }
> +               default:
> +                       break;
> +               }
> +       }
>
>      ADD_ONE_WITH_WRAP_AROUND(pDevice->uCmdEnqueueIdx, CMD_Q_SIZE);
>      pDevice->cbFreeCmdQueue--;
>
> -    if (pDevice->bCmdRunning == false)
> -        s_bCommandComplete(pDevice);
> +       if (pDevice->bCmdRunning == false)
> +               s_bCommandComplete(pDevice);
>
>      return (true);
>
> @@ -1095,15 +1087,15 @@ static int s_bClearBSSID_SCAN(struct vnt_private
> *pDevice)
>         unsigned int uCmdDequeueIdx = pDevice->uCmdDequeueIdx;
>         unsigned int ii;
>
> -    if ((pDevice->cbFreeCmdQueue < CMD_Q_SIZE) && (uCmdDequeueIdx !=
> pDevice->uCmdEnqueueIdx)) {
> -        for (ii = 0; ii < (CMD_Q_SIZE - pDevice->cbFreeCmdQueue); ii++) {
> -            if (pDevice->eCmdQueue[uCmdDequeueIdx].eCmd ==
> WLAN_CMD_BSSID_SCAN)
> -                pDevice->eCmdQueue[uCmdDequeueIdx].eCmd = WLAN_CMD_IDLE;
> -            ADD_ONE_WITH_WRAP_AROUND(uCmdDequeueIdx, CMD_Q_SIZE);
> -            if (uCmdDequeueIdx == pDevice->uCmdEnqueueIdx)
> -                break;
> -        }
> -    }
> +       if ((pDevice->cbFreeCmdQueue < CMD_Q_SIZE) && (uCmdDequeueIdx !=
> pDevice->uCmdEnqueueIdx)) {
> +               for (ii = 0; ii < (CMD_Q_SIZE - pDevice->cbFreeCmdQueue);
> ii++) {
> +                       if (pDevice->eCmdQueue[uCmdDequeueIdx].eCmd ==
> WLAN_CMD_BSSID_SCAN)
> +                               pDevice->eCmdQueue[uCmdDequeueIdx].eCmd =
> WLAN_CMD_IDLE;
> +                       ADD_ONE_WITH_WRAP_AROUND(uCmdDequeueIdx,
> CMD_Q_SIZE);
> +                       if (uCmdDequeueIdx == pDevice->uCmdEnqueueIdx)
> +                               break;
> +               }
> +       }
>      return true;
>  }
>
> --
> 1.7.9.5


Reviewed-by: Andy Grover <agrover@redhat.com>
diff mbox

Patch

diff --git a/drivers/staging/vt6656/wcmd.c b/drivers/staging/vt6656/wcmd.c
index 903111b..a91e762 100644
--- a/drivers/staging/vt6656/wcmd.c
+++ b/drivers/staging/vt6656/wcmd.c
@@ -99,21 +99,21 @@  static void vAdHocBeaconStop(struct vnt_private *pDevice)
      *      (3.2) AdHoc channel is in A mode
      */
     bStop = false;
-    if ((pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) &&
-    (pMgmt->eCurrState >= WMAC_STATE_STARTED)) {
-        if ((pMgmt->uIBSSChannel <=  CB_MAX_CHANNEL_24G) &&
-             (pMgmt->uScanChannel > CB_MAX_CHANNEL_24G)) {
-            bStop = true;
-        }
-        if (pMgmt->uIBSSChannel >  CB_MAX_CHANNEL_24G)
-            bStop = true;
-    }
-
-    if (bStop) {
-        //PMESG(("STOP_BEACON: IBSSChannel = %u, ScanChannel = %u\n",
-        //        pMgmt->uIBSSChannel, pMgmt->uScanChannel));
-        MACvRegBitsOff(pDevice, MAC_REG_TCR, TCR_AUTOBCNTX);
-    }
+	if ((pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) &&
+	    (pMgmt->eCurrState >= WMAC_STATE_STARTED)) {
+		if ((pMgmt->uIBSSChannel <=  CB_MAX_CHANNEL_24G) &&
+		    (pMgmt->uScanChannel > CB_MAX_CHANNEL_24G)) {
+			bStop = true;
+		}
+		if (pMgmt->uIBSSChannel >  CB_MAX_CHANNEL_24G)
+			bStop = true;
+	}
+
+	if (bStop) {
+		//PMESG(("STOP_BEACON: IBSSChannel = %u, ScanChannel = %u\n",
+		//        pMgmt->uIBSSChannel, pMgmt->uScanChannel));
+		MACvRegBitsOff(pDevice, MAC_REG_TCR, TCR_AUTOBCNTX);
+	}
 
 } /* vAdHocBeaconStop */
 
@@ -140,11 +140,11 @@  static void vAdHocBeaconRestart(struct vnt_private *pDevice)
      *  (1) STA is in AdHoc mode
      *  (2) VT3253 is programmed as automatic Beacon Transmitting
      */
-    if ((pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) &&
-    (pMgmt->eCurrState >= WMAC_STATE_STARTED)) {
-        //PMESG(("RESTART_BEACON\n"));
-        MACvRegBitsOn(pDevice, MAC_REG_TCR, TCR_AUTOBCNTX);
-    }
+	if ((pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) &&
+	    (pMgmt->eCurrState >= WMAC_STATE_STARTED)) {
+		//PMESG(("RESTART_BEACON\n"));
+		MACvRegBitsOn(pDevice, MAC_REG_TCR, TCR_AUTOBCNTX);
+	}
 
 }
 
@@ -194,15 +194,15 @@  static void s_vProbeChannel(struct vnt_private *pDevice)
                   (PWLAN_IE_SUPP_RATES)abyCurrExtSuppRatesG
                 );
 
-    if (pTxPacket != NULL) {
-        for (ii = 0; ii < 1; ii++) {
-            if (csMgmt_xmit(pDevice, pTxPacket) != CMD_STATUS_PENDING) {
-                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Probe request sending fail..\n");
-	    } else {
-                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Probe request is sending..\n");
-	    }	
-        }
-    }
+	if (pTxPacket != NULL) {
+		for (ii = 0; ii < 1; ii++) {
+			if (csMgmt_xmit(pDevice, pTxPacket) != CMD_STATUS_PENDING) {
+				DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Probe request sending fail..\n");
+			} else {
+				DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Probe request is sending..\n");
+			}
+		}
+	}
 
 }
 
@@ -248,11 +248,11 @@  static struct vnt_tx_mgmt *s_MgrMakeProbeRequest(struct vnt_private *pDevice,
     sFrame.len += pCurrRates->len + WLAN_IEHDR_LEN;
     memcpy(sFrame.pSuppRates, pCurrRates, pCurrRates->len + WLAN_IEHDR_LEN);
     // Copy the extension rate set
-    if (pDevice->byBBType == BB_TYPE_11G) {
-        sFrame.pExtSuppRates = (PWLAN_IE_SUPP_RATES)(sFrame.pBuf + sFrame.len);
-        sFrame.len += pCurrExtSuppRates->len + WLAN_IEHDR_LEN;
-        memcpy(sFrame.pExtSuppRates, pCurrExtSuppRates, pCurrExtSuppRates->len + WLAN_IEHDR_LEN);
-    }
+    	if (pDevice->byBBType == BB_TYPE_11G) {
+		sFrame.pExtSuppRates = (PWLAN_IE_SUPP_RATES)(sFrame.pBuf + sFrame.len);
+		sFrame.len += pCurrExtSuppRates->len + WLAN_IEHDR_LEN;
+		memcpy(sFrame.pExtSuppRates, pCurrExtSuppRates, pCurrExtSuppRates->len + WLAN_IEHDR_LEN);
+	}
     pTxPacket->cbMPDULen = sFrame.len;
     pTxPacket->cbPayloadLen = sFrame.len - WLAN_HDR_ADDR3_LEN;
 
@@ -283,10 +283,10 @@  void vRunCommand(struct work_struct *work)
 	if (pDevice->Flags & fMP_DISCONNECTED)
 		return;
 
-    if (pDevice->dwDiagRefCount != 0)
-        return;
-    if (pDevice->bCmdRunning != true)
-        return;
+	if (pDevice->dwDiagRefCount != 0)
+		return;
+	if (pDevice->bCmdRunning != true)
+		return;
 
     spin_lock_irq(&pDevice->lock);
 
@@ -295,126 +295,123 @@  void vRunCommand(struct work_struct *work)
     case WLAN_CMD_SCAN_START:
 
 		pDevice->byReAssocCount = 0;
-            if (pDevice->bRadioOff == true) {
-                s_bCommandComplete(pDevice);
-                spin_unlock_irq(&pDevice->lock);
-                return;
-            }
-
-            if (pMgmt->eCurrMode == WMAC_MODE_ESS_AP) {
-                s_bCommandComplete(pDevice);
-                spin_unlock_irq(&pDevice->lock);
-                return;
-            }
+		if (pDevice->bRadioOff == true) {
+			s_bCommandComplete(pDevice);
+			spin_unlock_irq(&pDevice->lock);
+			return;
+		}
+
+		if (pMgmt->eCurrMode == WMAC_MODE_ESS_AP) {
+			s_bCommandComplete(pDevice);
+			spin_unlock_irq(&pDevice->lock);
+			return;
+		}
 
             pItemSSID = (PWLAN_IE_SSID)pMgmt->abyScanSSID;
 
-            if (pMgmt->uScanChannel == 0)
-                pMgmt->uScanChannel = pDevice->byMinChannel;
-            if (pMgmt->uScanChannel > pDevice->byMaxChannel) {
-		pDevice->eCommandState = WLAN_CMD_SCAN_END;
-                s_bCommandComplete(pDevice);
-                spin_unlock_irq(&pDevice->lock);
-                return;
-
-            } else {
-                if (!ChannelValid(pDevice->byZoneType, pMgmt->uScanChannel)) {
-                    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Invalid channel pMgmt->uScanChannel = %d\n", pMgmt->uScanChannel);
+		if (pMgmt->uScanChannel == 0)
+			pMgmt->uScanChannel = pDevice->byMinChannel;
+		if (pMgmt->uScanChannel > pDevice->byMaxChannel) {
+			pDevice->eCommandState = WLAN_CMD_SCAN_END;
+			s_bCommandComplete(pDevice);
+			spin_unlock_irq(&pDevice->lock);
+			return;
+		} else {
+			if (!ChannelValid(pDevice->byZoneType, pMgmt->uScanChannel)) {
+				DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Invalid channel pMgmt->uScanChannel = %d\n", pMgmt->uScanChannel);
+				pMgmt->uScanChannel++;
+				s_bCommandComplete(pDevice);
+				spin_unlock_irq(&pDevice->lock);
+				return;
+			}
+			if (pMgmt->uScanChannel == pDevice->byMinChannel) {
+				// pMgmt->eScanType = WMAC_SCAN_ACTIVE;          //mike mark
+				pMgmt->abyScanBSSID[0] = 0xFF;
+				pMgmt->abyScanBSSID[1] = 0xFF;
+				pMgmt->abyScanBSSID[2] = 0xFF;
+				pMgmt->abyScanBSSID[3] = 0xFF;
+				pMgmt->abyScanBSSID[4] = 0xFF;
+				pMgmt->abyScanBSSID[5] = 0xFF;
+				pItemSSID->byElementID = WLAN_EID_SSID;
+				// clear bssid list
+				/* BSSvClearBSSList((void *) pDevice, pDevice->bLinkPass); */
+				pMgmt->eScanState = WMAC_IS_SCANNING;
+				pDevice->byScanBBType = pDevice->byBBType;  //lucas
+				pDevice->bStopDataPkt = true;
+				// Turn off RCR_BSSID filter every time
+				MACvRegBitsOff(pDevice, MAC_REG_RCR, RCR_BSSID);
+				pDevice->byRxMode &= ~RCR_BSSID;
+			}
+			//lucas
+			vAdHocBeaconStop(pDevice);
+			if ((pDevice->byBBType != BB_TYPE_11A) &&
+			    (pMgmt->uScanChannel > CB_MAX_CHANNEL_24G)) {
+				pDevice->byBBType = BB_TYPE_11A;
+				CARDvSetBSSMode(pDevice);
+			} else if ((pDevice->byBBType == BB_TYPE_11A) &&
+				   (pMgmt->uScanChannel <= CB_MAX_CHANNEL_24G)) {
+				pDevice->byBBType = BB_TYPE_11G;
+				CARDvSetBSSMode(pDevice);
+			}
+			DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Scanning....  channel: [%d]\n", pMgmt->uScanChannel);
+			// Set channel
+			CARDbSetMediaChannel(pDevice, pMgmt->uScanChannel);
+			// Set Baseband to be more sensitive.
+
+			if (pDevice->bUpdateBBVGA) {
+				BBvSetShortSlotTime(pDevice);
+				BBvSetVGAGainOffset(pDevice, pDevice->abyBBVGA[0]);
+				BBvUpdatePreEDThreshold(pDevice, true);
+			}
 			pMgmt->uScanChannel++;
-                    s_bCommandComplete(pDevice);
-                    spin_unlock_irq(&pDevice->lock);
-                    return;
-                }
-                if (pMgmt->uScanChannel == pDevice->byMinChannel) {
-                   // pMgmt->eScanType = WMAC_SCAN_ACTIVE;          //mike mark
-                    pMgmt->abyScanBSSID[0] = 0xFF;
-                    pMgmt->abyScanBSSID[1] = 0xFF;
-                    pMgmt->abyScanBSSID[2] = 0xFF;
-                    pMgmt->abyScanBSSID[3] = 0xFF;
-                    pMgmt->abyScanBSSID[4] = 0xFF;
-                    pMgmt->abyScanBSSID[5] = 0xFF;
-                    pItemSSID->byElementID = WLAN_EID_SSID;
-                    // clear bssid list
-		    /* BSSvClearBSSList((void *) pDevice,
-		       pDevice->bLinkPass); */
-                    pMgmt->eScanState = WMAC_IS_SCANNING;
-                    pDevice->byScanBBType = pDevice->byBBType;  //lucas
-                    pDevice->bStopDataPkt = true;
-                    // Turn off RCR_BSSID filter every time
-                    MACvRegBitsOff(pDevice, MAC_REG_RCR, RCR_BSSID);
-                    pDevice->byRxMode &= ~RCR_BSSID;
-
-                }
-                //lucas
-                vAdHocBeaconStop(pDevice);
-                if ((pDevice->byBBType != BB_TYPE_11A) && (pMgmt->uScanChannel > CB_MAX_CHANNEL_24G)) {
-                    pDevice->byBBType = BB_TYPE_11A;
-                    CARDvSetBSSMode(pDevice);
-                } else if ((pDevice->byBBType == BB_TYPE_11A) && (pMgmt->uScanChannel <= CB_MAX_CHANNEL_24G)) {
-                    pDevice->byBBType = BB_TYPE_11G;
-                    CARDvSetBSSMode(pDevice);
-                }
-                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Scanning....  channel: [%d]\n", pMgmt->uScanChannel);
-                // Set channel
-                CARDbSetMediaChannel(pDevice, pMgmt->uScanChannel);
-                // Set Baseband to be more sensitive.
-
-                if (pDevice->bUpdateBBVGA) {
-                    BBvSetShortSlotTime(pDevice);
-                    BBvSetVGAGainOffset(pDevice, pDevice->abyBBVGA[0]);
-                    BBvUpdatePreEDThreshold(pDevice, true);
-                }
-                pMgmt->uScanChannel++;
-
-                while (!ChannelValid(pDevice->byZoneType, pMgmt->uScanChannel) &&
-                        pMgmt->uScanChannel <= pDevice->byMaxChannel){
-                    pMgmt->uScanChannel++;
-                }
-
-                if (pMgmt->uScanChannel > pDevice->byMaxChannel) {
-                    // Set Baseband to be not sensitive and rescan
-                    pDevice->eCommandState = WLAN_CMD_SCAN_END;
-
-                }
-                if ((pMgmt->b11hEnable == false) ||
-                    (pMgmt->uScanChannel < CB_MAX_CHANNEL_24G)) {
-                    s_vProbeChannel(pDevice);
-                    spin_unlock_irq(&pDevice->lock);
-		     vCommandTimerWait((void *) pDevice, 100);
-                    return;
-                } else {
-                    spin_unlock_irq(&pDevice->lock);
-		    vCommandTimerWait((void *) pDevice, WCMD_PASSIVE_SCAN_TIME);
-                    return;
-                }
-
-            }
+
+			while (!ChannelValid(pDevice->byZoneType, pMgmt->uScanChannel) &&
+				pMgmt->uScanChannel <= pDevice->byMaxChannel){
+				pMgmt->uScanChannel++;
+			}
+
+			if (pMgmt->uScanChannel > pDevice->byMaxChannel) {
+				// Set Baseband to be not sensitive and rescan
+				pDevice->eCommandState = WLAN_CMD_SCAN_END;
+			}
+			if ((pMgmt->b11hEnable == false) ||
+			    (pMgmt->uScanChannel < CB_MAX_CHANNEL_24G)) {
+				s_vProbeChannel(pDevice);
+				spin_unlock_irq(&pDevice->lock);
+				vCommandTimerWait((void *) pDevice, 100);
+				return;
+			} else {
+				spin_unlock_irq(&pDevice->lock);
+				vCommandTimerWait((void *) pDevice, WCMD_PASSIVE_SCAN_TIME);
+				return;
+			}
+		}
 
             break;
 
     case WLAN_CMD_SCAN_END:
 
             // Set Baseband's sensitivity back.
-            if (pDevice->byBBType != pDevice->byScanBBType) {
-                pDevice->byBBType = pDevice->byScanBBType;
-                CARDvSetBSSMode(pDevice);
-            }
+		if (pDevice->byBBType != pDevice->byScanBBType) {
+			pDevice->byBBType = pDevice->byScanBBType;
+			CARDvSetBSSMode(pDevice);
+		}
 
-            if (pDevice->bUpdateBBVGA) {
-                BBvSetShortSlotTime(pDevice);
-                BBvSetVGAGainOffset(pDevice, pDevice->byBBVGACurrent);
-                BBvUpdatePreEDThreshold(pDevice, false);
-            }
+		if (pDevice->bUpdateBBVGA) {
+			BBvSetShortSlotTime(pDevice);
+			BBvSetVGAGainOffset(pDevice, pDevice->byBBVGACurrent);
+			BBvUpdatePreEDThreshold(pDevice, false);
+		}
 
             // Set channel back
             vAdHocBeaconRestart(pDevice);
             // Set channel back
             CARDbSetMediaChannel(pDevice, pMgmt->uCurrChannel);
             // Set Filter
-            if (pMgmt->bCurrBSSIDFilterOn) {
-                MACvRegBitsOn(pDevice, MAC_REG_RCR, RCR_BSSID);
-                pDevice->byRxMode |= RCR_BSSID;
-            }
+		if (pMgmt->bCurrBSSIDFilterOn) {
+			MACvRegBitsOn(pDevice, MAC_REG_RCR, RCR_BSSID);
+			pDevice->byRxMode |= RCR_BSSID;
+		}
             DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Scanning, set back to channel: [%d]\n", pMgmt->uCurrChannel);
 		pMgmt->uScanChannel = 0;
             pMgmt->eScanState = WMAC_NO_SCANNING;
@@ -430,37 +427,36 @@  void vRunCommand(struct work_struct *work)
 
     case WLAN_CMD_DISASSOCIATE_START:
 		pDevice->byReAssocCount = 0;
-            if ((pMgmt->eCurrMode == WMAC_MODE_ESS_STA) &&
-                (pMgmt->eCurrState != WMAC_STATE_ASSOC)) {
-                s_bCommandComplete(pDevice);
-                spin_unlock_irq(&pDevice->lock);
-                return;
-            } else {
-
-		      pDevice->bwextstep0 = false;
-                        pDevice->bwextstep1 = false;
-                        pDevice->bwextstep2 = false;
-                        pDevice->bwextstep3 = false;
-		   pDevice->bWPASuppWextEnabled = false;
-                   pDevice->fWPA_Authened = false;
-
-                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Send Disassociation Packet..\n");
-                // reason = 8 : disassoc because sta has left
-		vMgrDisassocBeginSta((void *) pDevice,
-				     pMgmt,
-				     pMgmt->abyCurrBSSID,
-				     (8),
-				     &Status);
-                pDevice->bLinkPass = false;
-                ControlvMaskByte(pDevice,MESSAGE_REQUEST_MACREG, MAC_REG_PAPEDELAY, LEDSTS_STS, LEDSTS_SLOW);
-                // unlock command busy
-                pItemSSID = (PWLAN_IE_SSID)pMgmt->abyCurrSSID;
-                pItemSSID->len = 0;
-                memset(pItemSSID->abySSID, 0, WLAN_SSID_MAXLEN);
-                pMgmt->eCurrState = WMAC_STATE_IDLE;
-                pMgmt->sNodeDBTable[0].bActive = false;
-//                pDevice->bBeaconBufReady = false;
-            }
+		if ((pMgmt->eCurrMode == WMAC_MODE_ESS_STA) &&
+		    (pMgmt->eCurrState != WMAC_STATE_ASSOC)) {
+			s_bCommandComplete(pDevice);
+			spin_unlock_irq(&pDevice->lock);
+			return;
+		} else {
+			pDevice->bwextstep0 = false;
+			pDevice->bwextstep1 = false;
+			pDevice->bwextstep2 = false;
+			pDevice->bwextstep3 = false;
+			pDevice->bWPASuppWextEnabled = false;
+			pDevice->fWPA_Authened = false;
+
+			DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Send Disassociation Packet..\n");
+			// reason = 8 : disassoc because sta has left
+			vMgrDisassocBeginSta((void *) pDevice,
+					     pMgmt,
+					     pMgmt->abyCurrBSSID,
+					     (8),
+					     &Status);
+			pDevice->bLinkPass = false;
+			ControlvMaskByte(pDevice,MESSAGE_REQUEST_MACREG, MAC_REG_PAPEDELAY, LEDSTS_STS, LEDSTS_SLOW);
+			// unlock command busy
+			pItemSSID = (PWLAN_IE_SSID)pMgmt->abyCurrSSID;
+			pItemSSID->len = 0;
+			memset(pItemSSID->abySSID, 0, WLAN_SSID_MAXLEN);
+			pMgmt->eCurrState = WMAC_STATE_IDLE;
+			pMgmt->sNodeDBTable[0].bActive = false;
+//			pDevice->bBeaconBufReady = false;
+		}
             netif_stop_queue(pDevice->dev);
             if (pDevice->bNeedRadioOFF == true)
                 CARDbRadioPowerOff(pDevice);
@@ -470,11 +466,11 @@  void vRunCommand(struct work_struct *work)
     case WLAN_CMD_SSID_START:
 
 		pDevice->byReAssocCount = 0;
-            if (pDevice->bRadioOff == true) {
-                s_bCommandComplete(pDevice);
-                spin_unlock_irq(&pDevice->lock);
-                return;
-            }
+		if (pDevice->bRadioOff == true) {
+			s_bCommandComplete(pDevice);
+			spin_unlock_irq(&pDevice->lock);
+			return;
+		}
 
             memcpy(pMgmt->abyAdHocSSID, pMgmt->abyDesireSSID,
                               ((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->len + WLAN_IEHDR_LEN);
@@ -484,28 +480,27 @@  void vRunCommand(struct work_struct *work)
             DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" cmd: desire ssid = %s\n", pItemSSID->abySSID);
             DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" cmd: curr ssid = %s\n", pItemSSIDCurr->abySSID);
 
-            if (pMgmt->eCurrState == WMAC_STATE_ASSOC) {
-                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" Cmd pMgmt->eCurrState == WMAC_STATE_ASSOC\n");
-                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" pItemSSID->len =%d\n", pItemSSID->len);
-                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" pItemSSIDCurr->len = %d\n", pItemSSIDCurr->len);
-                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" desire ssid = %s\n", pItemSSID->abySSID);
-                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" curr ssid = %s\n", pItemSSIDCurr->abySSID);
-            }
-
-            if ((pMgmt->eCurrState == WMAC_STATE_ASSOC) ||
-                ((pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) && (pMgmt->eCurrState == WMAC_STATE_JOINTED))) {
-
-                if (pItemSSID->len == pItemSSIDCurr->len) {
-                    if (memcmp(pItemSSID->abySSID, pItemSSIDCurr->abySSID, pItemSSID->len) == 0) {
-                        s_bCommandComplete(pDevice);
-                        spin_unlock_irq(&pDevice->lock);
-                        return;
-                    }
-                }
-                netif_stop_queue(pDevice->dev);
-                pDevice->bLinkPass = false;
-                ControlvMaskByte(pDevice, MESSAGE_REQUEST_MACREG, MAC_REG_PAPEDELAY, LEDSTS_STS, LEDSTS_SLOW);
-            }
+		if (pMgmt->eCurrState == WMAC_STATE_ASSOC) {
+			DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" Cmd pMgmt->eCurrState == WMAC_STATE_ASSOC\n");
+			DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" pItemSSID->len =%d\n", pItemSSID->len);
+			DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" pItemSSIDCurr->len = %d\n", pItemSSIDCurr->len);
+			DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" desire ssid = %s\n", pItemSSID->abySSID);
+			DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" curr ssid = %s\n", pItemSSIDCurr->abySSID);
+		}
+
+		if ((pMgmt->eCurrState == WMAC_STATE_ASSOC) ||
+		    ((pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) && (pMgmt->eCurrState == WMAC_STATE_JOINTED))) {
+			if (pItemSSID->len == pItemSSIDCurr->len) {
+				if (memcmp(pItemSSID->abySSID, pItemSSIDCurr->abySSID, pItemSSID->len) == 0) {
+					s_bCommandComplete(pDevice);
+					spin_unlock_irq(&pDevice->lock);
+					return;
+				}
+			}
+			netif_stop_queue(pDevice->dev);
+			pDevice->bLinkPass = false;
+			ControlvMaskByte(pDevice, MESSAGE_REQUEST_MACREG, MAC_REG_PAPEDELAY, LEDSTS_STS, LEDSTS_SLOW);
+		}
             // set initial state
             pMgmt->eCurrState = WMAC_STATE_IDLE;
             pMgmt->eCurrMode = WMAC_MODE_STANDBY;
@@ -513,145 +508,144 @@  void vRunCommand(struct work_struct *work)
             BSSvClearNodeDBTable(pDevice, 0);
 	    vMgrJoinBSSBegin((void *) pDevice, &Status);
             // if Infra mode
-            if ((pMgmt->eCurrMode == WMAC_MODE_ESS_STA) && (pMgmt->eCurrState == WMAC_STATE_JOINTED)) {
-                // Call mgr to begin the deauthentication
-                // reason = (3) because sta has left ESS
-	      if (pMgmt->eCurrState >= WMAC_STATE_AUTH) {
-		vMgrDeAuthenBeginSta((void *)pDevice,
-				     pMgmt,
-				     pMgmt->abyCurrBSSID,
-				     (3),
-				     &Status);
-	      }
-                // Call mgr to begin the authentication
-		vMgrAuthenBeginSta((void *) pDevice, pMgmt, &Status);
-                if (Status == CMD_STATUS_SUCCESS) {
-		   pDevice->byLinkWaitCount = 0;
-                    pDevice->eCommandState = WLAN_AUTHENTICATE_WAIT;
-		    vCommandTimerWait((void *) pDevice, AUTHENTICATE_TIMEOUT);
-                    spin_unlock_irq(&pDevice->lock);
-                    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" Set eCommandState = WLAN_AUTHENTICATE_WAIT\n");
-                    return;
-                }
-            }
-            // if Adhoc mode
-            else if (pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) {
-                if (pMgmt->eCurrState == WMAC_STATE_JOINTED) {
-                    if (netif_queue_stopped(pDevice->dev))
-                        netif_wake_queue(pDevice->dev);
-                    pDevice->bLinkPass = true;
-                    ControlvMaskByte(pDevice, MESSAGE_REQUEST_MACREG, MAC_REG_PAPEDELAY, LEDSTS_STS, LEDSTS_INTER);
-                    pMgmt->sNodeDBTable[0].bActive = true;
-                    pMgmt->sNodeDBTable[0].uInActiveCount = 0;
-                } else {
-                    // start own IBSS
-		    DBG_PRT(MSG_LEVEL_DEBUG,
-			    KERN_INFO "CreateOwn IBSS by CurrMode = IBSS_STA\n");
-		    vMgrCreateOwnIBSS((void *) pDevice, &Status);
-                    if (Status != CMD_STATUS_SUCCESS) {
-			DBG_PRT(MSG_LEVEL_DEBUG,
-				KERN_INFO "WLAN_CMD_IBSS_CREATE fail!\n");
-                    }
-                    BSSvAddMulticastNode(pDevice);
-                }
-                s_bClearBSSID_SCAN(pDevice);
-            }
-            // if SSID not found
-            else if (pMgmt->eCurrMode == WMAC_MODE_STANDBY) {
-                if (pMgmt->eConfigMode == WMAC_CONFIG_IBSS_STA ||
-                    pMgmt->eConfigMode == WMAC_CONFIG_AUTO) {
-                    // start own IBSS
-			DBG_PRT(MSG_LEVEL_DEBUG,
-				KERN_INFO "CreateOwn IBSS by CurrMode = STANDBY\n");
-		    vMgrCreateOwnIBSS((void *) pDevice, &Status);
-                    if (Status != CMD_STATUS_SUCCESS) {
-			DBG_PRT(MSG_LEVEL_DEBUG,
-				KERN_INFO "WLAN_CMD_IBSS_CREATE fail!\n");
-                    }
-                    BSSvAddMulticastNode(pDevice);
-                    s_bClearBSSID_SCAN(pDevice);
+		if ((pMgmt->eCurrMode == WMAC_MODE_ESS_STA) && (pMgmt->eCurrState == WMAC_STATE_JOINTED)) {
+			// Call mgr to begin the deauthentication
+			// reason = (3) because sta has left ESS
+			if (pMgmt->eCurrState >= WMAC_STATE_AUTH) {
+				vMgrDeAuthenBeginSta((void *)pDevice,
+						     pMgmt,
+						     pMgmt->abyCurrBSSID,
+						     (3),
+						     &Status);
+			}
+			// Call mgr to begin the authentication
+			vMgrAuthenBeginSta((void *) pDevice, pMgmt, &Status);
+			if (Status == CMD_STATUS_SUCCESS) {
+				pDevice->byLinkWaitCount = 0;
+				pDevice->eCommandState = WLAN_AUTHENTICATE_WAIT;
+				vCommandTimerWait((void *) pDevice, AUTHENTICATE_TIMEOUT);
+				spin_unlock_irq(&pDevice->lock);
+				DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" Set eCommandState = WLAN_AUTHENTICATE_WAIT\n");
+				return;
+			}
+		}
+		// if Adhoc mode
+		else if (pMgmt->eCurrMode == WMAC_MODE_IBSS_STA) {
+			if (pMgmt->eCurrState == WMAC_STATE_JOINTED) {
+				if (netif_queue_stopped(pDevice->dev))
+					netif_wake_queue(pDevice->dev);
+				pDevice->bLinkPass = true;
+				ControlvMaskByte(pDevice, MESSAGE_REQUEST_MACREG, MAC_REG_PAPEDELAY, LEDSTS_STS, LEDSTS_INTER);
+				pMgmt->sNodeDBTable[0].bActive = true;
+				pMgmt->sNodeDBTable[0].uInActiveCount = 0;
+			} else {
+				// start own IBSS
+				DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "CreateOwn IBSS by CurrMode = IBSS_STA\n");
+				vMgrCreateOwnIBSS((void *) pDevice, &Status);
+				if (Status != CMD_STATUS_SUCCESS) {
+					DBG_PRT(MSG_LEVEL_DEBUG,
+						KERN_INFO "WLAN_CMD_IBSS_CREATE fail!\n");
+				}
+				BSSvAddMulticastNode(pDevice);
+			}
+			s_bClearBSSID_SCAN(pDevice);
+		}
+		// if SSID not found
+		else if (pMgmt->eCurrMode == WMAC_MODE_STANDBY) {
+			if (pMgmt->eConfigMode == WMAC_CONFIG_IBSS_STA ||
+			    pMgmt->eConfigMode == WMAC_CONFIG_AUTO) {
+				// start own IBSS
+				DBG_PRT(MSG_LEVEL_DEBUG,
+					KERN_INFO "CreateOwn IBSS by CurrMode = STANDBY\n");
+				vMgrCreateOwnIBSS((void *) pDevice, &Status);
+				if (Status != CMD_STATUS_SUCCESS) {
+					DBG_PRT(MSG_LEVEL_DEBUG,
+						KERN_INFO "WLAN_CMD_IBSS_CREATE fail!\n");
+				}
+				BSSvAddMulticastNode(pDevice);
+				s_bClearBSSID_SCAN(pDevice);
 /*
-                    pDevice->bLinkPass = true;
-                    ControlvMaskByte(pDevice,MESSAGE_REQUEST_MACREG,MAC_REG_PAPEDELAY,LEDSTS_STS,LEDSTS_INTER);
-                    if (netif_queue_stopped(pDevice->dev)){
-                        netif_wake_queue(pDevice->dev);
-                    }
-                    s_bClearBSSID_SCAN(pDevice);
+				pDevice->bLinkPass = true;
+				ControlvMaskByte(pDevice,MESSAGE_REQUEST_MACREG,MAC_REG_PAPEDELAY,LEDSTS_STS,LEDSTS_INTER);
+				if (netif_queue_stopped(pDevice->dev)){
+					netif_wake_queue(pDevice->dev);
+				}
+				s_bClearBSSID_SCAN(pDevice);
 */
-                } else {
-                    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Disconnect SSID none\n");
-                    // if(pDevice->bWPASuppWextEnabled == true)
-                        {
-                  	union iwreq_data  wrqu;
-                  	memset(&wrqu, 0, sizeof(wrqu));
-                          wrqu.ap_addr.sa_family = ARPHRD_ETHER;
-                  	PRINT_K("wireless_send_event--->SIOCGIWAP(disassociated:vMgrJoinBSSBegin Fail !!)\n");
-                  	wireless_send_event(pDevice->dev, SIOCGIWAP, &wrqu, NULL);
-                       }
-                }
-            }
+			} else {
+				DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Disconnect SSID none\n");
+				// if(pDevice->bWPASuppWextEnabled == true)
+				{
+					union iwreq_data  wrqu;
+					memset(&wrqu, 0, sizeof(wrqu));
+					wrqu.ap_addr.sa_family = ARPHRD_ETHER;
+					PRINT_K("wireless_send_event--->SIOCGIWAP(disassociated:vMgrJoinBSSBegin Fail !!)\n");
+					wireless_send_event(pDevice->dev, SIOCGIWAP, &wrqu, NULL);
+				}
+			}
+		}
             s_bCommandComplete(pDevice);
             break;
 
     case WLAN_AUTHENTICATE_WAIT:
             DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"eCommandState == WLAN_AUTHENTICATE_WAIT\n");
-            if (pMgmt->eCurrState == WMAC_STATE_AUTH) {
-		pDevice->byLinkWaitCount = 0;
-                // Call mgr to begin the association
-                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"eCurrState == WMAC_STATE_AUTH\n");
-		vMgrAssocBeginSta((void *) pDevice, pMgmt, &Status);
-                if (Status == CMD_STATUS_SUCCESS) {
-                    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"eCommandState = WLAN_ASSOCIATE_WAIT\n");
-		  pDevice->byLinkWaitCount = 0;
-                    pDevice->eCommandState = WLAN_ASSOCIATE_WAIT;
-		    vCommandTimerWait((void *) pDevice, ASSOCIATE_TIMEOUT);
-                    spin_unlock_irq(&pDevice->lock);
-                    return;
-                }
-            } else if (pMgmt->eCurrState < WMAC_STATE_AUTHPENDING) {
-               printk("WLAN_AUTHENTICATE_WAIT:Authen Fail???\n");
-	   } else if (pDevice->byLinkWaitCount <= 4) {    //mike add:wait another 2 sec if authenticated_frame delay!
-                pDevice->byLinkWaitCount++;
-	       printk("WLAN_AUTHENTICATE_WAIT:wait %d times!!\n", pDevice->byLinkWaitCount);
-	       spin_unlock_irq(&pDevice->lock);
-	       vCommandTimerWait((void *) pDevice, AUTHENTICATE_TIMEOUT/2);
-	       return;
-	   }
+		if (pMgmt->eCurrState == WMAC_STATE_AUTH) {
+			pDevice->byLinkWaitCount = 0;
+			// Call mgr to begin the association
+			DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"eCurrState == WMAC_STATE_AUTH\n");
+			vMgrAssocBeginSta((void *) pDevice, pMgmt, &Status);
+			if (Status == CMD_STATUS_SUCCESS) {
+				DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"eCommandState = WLAN_ASSOCIATE_WAIT\n");
+				pDevice->byLinkWaitCount = 0;
+				pDevice->eCommandState = WLAN_ASSOCIATE_WAIT;
+				vCommandTimerWait((void *) pDevice, ASSOCIATE_TIMEOUT);
+				spin_unlock_irq(&pDevice->lock);
+				return;
+			}
+		} else if (pMgmt->eCurrState < WMAC_STATE_AUTHPENDING) {
+			printk("WLAN_AUTHENTICATE_WAIT:Authen Fail???\n");
+		} else if (pDevice->byLinkWaitCount <= 4) {    //mike add:wait another 2 sec if authenticated_frame delay!
+			pDevice->byLinkWaitCount++;
+			printk("WLAN_AUTHENTICATE_WAIT:wait %d times!!\n", pDevice->byLinkWaitCount);
+			spin_unlock_irq(&pDevice->lock);
+			vCommandTimerWait((void *) pDevice, AUTHENTICATE_TIMEOUT/2);
+			return;
+		}
 	          pDevice->byLinkWaitCount = 0;
 
             s_bCommandComplete(pDevice);
             break;
 
     case WLAN_ASSOCIATE_WAIT:
-            if (pMgmt->eCurrState == WMAC_STATE_ASSOC) {
-                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"eCurrState == WMAC_STATE_ASSOC\n");
-                if (pDevice->ePSMode != WMAC_POWER_CAM) {
-			PSvEnablePowerSaving((void *) pDevice,
-					     pMgmt->wListenInterval);
-                }
+		if (pMgmt->eCurrState == WMAC_STATE_ASSOC) {
+			DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"eCurrState == WMAC_STATE_ASSOC\n");
+			if (pDevice->ePSMode != WMAC_POWER_CAM) {
+				PSvEnablePowerSaving((void *) pDevice,
+						pMgmt->wListenInterval);
+			}
 /*
-                if (pMgmt->eAuthenMode >= WMAC_AUTH_WPA) {
-                    KeybRemoveAllKey(pDevice, &(pDevice->sKey), pDevice->abyBSSID);
-                }
+			if (pMgmt->eAuthenMode >= WMAC_AUTH_WPA) {
+				KeybRemoveAllKey(pDevice, &(pDevice->sKey), pDevice->abyBSSID);
+			}
 */
-                pDevice->byLinkWaitCount = 0;
-                pDevice->byReAssocCount = 0;
-                pDevice->bLinkPass = true;
-                ControlvMaskByte(pDevice, MESSAGE_REQUEST_MACREG, MAC_REG_PAPEDELAY, LEDSTS_STS, LEDSTS_INTER);
-                s_bClearBSSID_SCAN(pDevice);
-
-                if (netif_queue_stopped(pDevice->dev))
-                    netif_wake_queue(pDevice->dev);
-
-            } else if (pMgmt->eCurrState < WMAC_STATE_ASSOCPENDING) {
-               printk("WLAN_ASSOCIATE_WAIT:Association Fail???\n");
-	   } else if (pDevice->byLinkWaitCount <= 4) {    //mike add:wait another 2 sec if associated_frame delay!
-                pDevice->byLinkWaitCount++;
-	       printk("WLAN_ASSOCIATE_WAIT:wait %d times!!\n", pDevice->byLinkWaitCount);
-	       spin_unlock_irq(&pDevice->lock);
-	       vCommandTimerWait((void *) pDevice, ASSOCIATE_TIMEOUT/2);
-	       return;
-	   }
+			pDevice->byLinkWaitCount = 0;
+			pDevice->byReAssocCount = 0;
+			pDevice->bLinkPass = true;
+			ControlvMaskByte(pDevice, MESSAGE_REQUEST_MACREG, MAC_REG_PAPEDELAY, LEDSTS_STS, LEDSTS_INTER);
+			s_bClearBSSID_SCAN(pDevice);
+
+			if (netif_queue_stopped(pDevice->dev))
+				netif_wake_queue(pDevice->dev);
+
+		} else if (pMgmt->eCurrState < WMAC_STATE_ASSOCPENDING) {
+			printk("WLAN_ASSOCIATE_WAIT:Association Fail???\n");
+		} else if (pDevice->byLinkWaitCount <= 4) {    //mike add:wait another 2 sec if associated_frame delay!
+			pDevice->byLinkWaitCount++;
+			printk("WLAN_ASSOCIATE_WAIT:wait %d times!!\n", pDevice->byLinkWaitCount);
+			spin_unlock_irq(&pDevice->lock);
+			vCommandTimerWait((void *) pDevice, ASSOCIATE_TIMEOUT/2);
+			return;
+		}
 
             s_bCommandComplete(pDevice);
             break;
@@ -659,91 +653,91 @@  void vRunCommand(struct work_struct *work)
     case WLAN_CMD_AP_MODE_START:
             DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"eCommandState == WLAN_CMD_AP_MODE_START\n");
 
-            if (pMgmt->eConfigMode == WMAC_CONFIG_AP) {
-		cancel_delayed_work_sync(&pDevice->second_callback_work);
-                pMgmt->eCurrState = WMAC_STATE_IDLE;
-                pMgmt->eCurrMode = WMAC_MODE_STANDBY;
-                pDevice->bLinkPass = false;
-                ControlvMaskByte(pDevice, MESSAGE_REQUEST_MACREG, MAC_REG_PAPEDELAY, LEDSTS_STS, LEDSTS_SLOW);
-                if (pDevice->bEnableHostWEP == true)
-                    BSSvClearNodeDBTable(pDevice, 1);
-                else
-                    BSSvClearNodeDBTable(pDevice, 0);
-                pDevice->uAssocCount = 0;
-                pMgmt->eCurrState = WMAC_STATE_IDLE;
-                pDevice->bFixRate = false;
-
-		vMgrCreateOwnIBSS((void *) pDevice, &Status);
-		if (Status != CMD_STATUS_SUCCESS) {
-			DBG_PRT(MSG_LEVEL_DEBUG,
-				KERN_INFO "vMgrCreateOwnIBSS fail!\n");
-                }
-                // always turn off unicast bit
-                MACvRegBitsOff(pDevice, MAC_REG_RCR, RCR_UNICAST);
-                pDevice->byRxMode &= ~RCR_UNICAST;
-                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "wcmd: rx_mode = %x\n", pDevice->byRxMode);
-                BSSvAddMulticastNode(pDevice);
-                if (netif_queue_stopped(pDevice->dev))
-                    netif_wake_queue(pDevice->dev);
-                pDevice->bLinkPass = true;
-                ControlvMaskByte(pDevice, MESSAGE_REQUEST_MACREG, MAC_REG_PAPEDELAY, LEDSTS_STS, LEDSTS_INTER);
-		schedule_delayed_work(&pDevice->second_callback_work, HZ);
-            }
+		if (pMgmt->eConfigMode == WMAC_CONFIG_AP) {
+			cancel_delayed_work_sync(&pDevice->second_callback_work);
+			pMgmt->eCurrState = WMAC_STATE_IDLE;
+			pMgmt->eCurrMode = WMAC_MODE_STANDBY;
+			pDevice->bLinkPass = false;
+			ControlvMaskByte(pDevice, MESSAGE_REQUEST_MACREG, MAC_REG_PAPEDELAY, LEDSTS_STS, LEDSTS_SLOW);
+			if (pDevice->bEnableHostWEP == true)
+				BSSvClearNodeDBTable(pDevice, 1);
+			else
+				BSSvClearNodeDBTable(pDevice, 0);
+			pDevice->uAssocCount = 0;
+			pMgmt->eCurrState = WMAC_STATE_IDLE;
+			pDevice->bFixRate = false;
+
+			vMgrCreateOwnIBSS((void *) pDevice, &Status);
+			if (Status != CMD_STATUS_SUCCESS) {
+				DBG_PRT(MSG_LEVEL_DEBUG,
+					KERN_INFO "vMgrCreateOwnIBSS fail!\n");
+			}
+			// always turn off unicast bit
+			MACvRegBitsOff(pDevice, MAC_REG_RCR, RCR_UNICAST);
+			pDevice->byRxMode &= ~RCR_UNICAST;
+			DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "wcmd: rx_mode = %x\n", pDevice->byRxMode);
+			BSSvAddMulticastNode(pDevice);
+			if (netif_queue_stopped(pDevice->dev))
+				netif_wake_queue(pDevice->dev);
+			pDevice->bLinkPass = true;
+			ControlvMaskByte(pDevice, MESSAGE_REQUEST_MACREG, MAC_REG_PAPEDELAY, LEDSTS_STS, LEDSTS_INTER);
+			schedule_delayed_work(&pDevice->second_callback_work, HZ);
+		}
             s_bCommandComplete(pDevice);
             break;
 
     case WLAN_CMD_TX_PSPACKET_START:
             // DTIM Multicast tx
-            if (pMgmt->sNodeDBTable[0].bRxPSPoll) {
-                while ((skb = skb_dequeue(&pMgmt->sNodeDBTable[0].sTxPSQueue)) != NULL) {
-                    if (skb_queue_empty(&pMgmt->sNodeDBTable[0].sTxPSQueue)) {
-                        pMgmt->abyPSTxMap[0] &= ~byMask[0];
-                        pDevice->bMoreData = false;
-                    } else {
-                        pDevice->bMoreData = true;
-                    }
-
-                    if (nsDMA_tx_packet(pDevice, TYPE_AC0DMA, skb) != 0)
-                        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Multicast ps tx fail\n");
-
-                    pMgmt->sNodeDBTable[0].wEnQueueCnt--;
-                }
-            }
+		if (pMgmt->sNodeDBTable[0].bRxPSPoll) {
+			while ((skb = skb_dequeue(&pMgmt->sNodeDBTable[0].sTxPSQueue)) != NULL) {
+				if (skb_queue_empty(&pMgmt->sNodeDBTable[0].sTxPSQueue)) {
+					pMgmt->abyPSTxMap[0] &= ~byMask[0];
+					pDevice->bMoreData = false;
+				} else {
+					pDevice->bMoreData = true;
+				}
+
+				if (nsDMA_tx_packet(pDevice, TYPE_AC0DMA, skb) != 0)
+					DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Multicast ps tx fail\n");
+
+				pMgmt->sNodeDBTable[0].wEnQueueCnt--;
+			}
+		}
 
             // PS nodes tx
-            for (ii = 1; ii < (MAX_NODE_NUM + 1); ii++) {
-                if (pMgmt->sNodeDBTable[ii].bActive &&
-                    pMgmt->sNodeDBTable[ii].bRxPSPoll) {
-                    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Index=%d Enqueu Cnt= %d\n",
-                               ii, pMgmt->sNodeDBTable[ii].wEnQueueCnt);
-                    while ((skb = skb_dequeue(&pMgmt->sNodeDBTable[ii].sTxPSQueue)) != NULL) {
-                        if (skb_queue_empty(&pMgmt->sNodeDBTable[ii].sTxPSQueue)) {
-                            // clear tx map
-                            pMgmt->abyPSTxMap[pMgmt->sNodeDBTable[ii].wAID >> 3] &=
-                                    ~byMask[pMgmt->sNodeDBTable[ii].wAID & 7];
-                            pDevice->bMoreData = false;
-                        } else {
-                            pDevice->bMoreData = true;
-                        }
-
-                        if (nsDMA_tx_packet(pDevice, TYPE_AC0DMA, skb) != 0)
-                            DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "sta ps tx fail\n");
-
-                        pMgmt->sNodeDBTable[ii].wEnQueueCnt--;
-                        // check if sta ps enable, wait next pspoll
-                        // if sta ps disable, send all pending buffers.
-                        if (pMgmt->sNodeDBTable[ii].bPSEnable)
-                            break;
-                    }
-                    if (skb_queue_empty(&pMgmt->sNodeDBTable[ii].sTxPSQueue)) {
-                        // clear tx map
-                        pMgmt->abyPSTxMap[pMgmt->sNodeDBTable[ii].wAID >> 3] &=
-                                    ~byMask[pMgmt->sNodeDBTable[ii].wAID & 7];
-                        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Index=%d PS queue clear\n", ii);
-                    }
-                    pMgmt->sNodeDBTable[ii].bRxPSPoll = false;
-                }
-            }
+		for (ii = 1; ii < (MAX_NODE_NUM + 1); ii++) {
+			if (pMgmt->sNodeDBTable[ii].bActive &&
+			    pMgmt->sNodeDBTable[ii].bRxPSPoll) {
+				DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Index=%d Enqueu Cnt= %d\n",
+						ii, pMgmt->sNodeDBTable[ii].wEnQueueCnt);
+				while ((skb = skb_dequeue(&pMgmt->sNodeDBTable[ii].sTxPSQueue)) != NULL) {
+					if (skb_queue_empty(&pMgmt->sNodeDBTable[ii].sTxPSQueue)) {
+						// clear tx map
+						pMgmt->abyPSTxMap[pMgmt->sNodeDBTable[ii].wAID >> 3] &=
+									~byMask[pMgmt->sNodeDBTable[ii].wAID & 7];
+						pDevice->bMoreData = false;
+					} else {
+						pDevice->bMoreData = true;
+					}
+
+					if (nsDMA_tx_packet(pDevice, TYPE_AC0DMA, skb) != 0)
+						DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "sta ps tx fail\n");
+
+					pMgmt->sNodeDBTable[ii].wEnQueueCnt--;
+					// check if sta ps enable, wait next pspoll
+					// if sta ps disable, send all pending buffers.
+					if (pMgmt->sNodeDBTable[ii].bPSEnable)
+						break;
+				}
+				if (skb_queue_empty(&pMgmt->sNodeDBTable[ii].sTxPSQueue)) {
+					// clear tx map
+					pMgmt->abyPSTxMap[pMgmt->sNodeDBTable[ii].wAID >> 3] &=
+							~byMask[pMgmt->sNodeDBTable[ii].wAID & 7];
+					DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Index=%d PS queue clear\n", ii);
+				}
+				pMgmt->sNodeDBTable[ii].bRxPSPoll = false;
+			}
+		}
 
             s_bCommandComplete(pDevice);
             break;
@@ -751,94 +745,93 @@  void vRunCommand(struct work_struct *work)
     case WLAN_CMD_RADIO_START:
 
             DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"eCommandState == WLAN_CMD_RADIO_START\n");
-       //     if (pDevice->bRadioCmd == true)
-       //         CARDbRadioPowerOn(pDevice);
-       //     else
-       //         CARDbRadioPowerOff(pDevice);
-
-       {
-	       int ntStatus = STATUS_SUCCESS;
-        u8            byTmp;
-
-        ntStatus = CONTROLnsRequestIn(pDevice,
-                                    MESSAGE_TYPE_READ,
-                                    MAC_REG_GPIOCTL1,
-                                    MESSAGE_REQUEST_MACREG,
-                                    1,
-                                    &byTmp);
-
-        if (ntStatus != STATUS_SUCCESS) {
-                s_bCommandComplete(pDevice);
-                spin_unlock_irq(&pDevice->lock);
-                return;
-        }
-        if ((byTmp & GPIO3_DATA) == 0) {
-	    DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" WLAN_CMD_RADIO_START_OFF........................\n");
-                // Old commands are useless.
-                // empty command Q
-	       pDevice->cbFreeCmdQueue = CMD_Q_SIZE;
-                pDevice->uCmdDequeueIdx = 0;
-                pDevice->uCmdEnqueueIdx = 0;
-                //0415pDevice->bCmdRunning = false;
-                pDevice->bCmdClear = true;
-                pDevice->bStopTx0Pkt = false;
-                pDevice->bStopDataPkt = true;
-
-                pDevice->byKeyIndex = 0;
-                pDevice->bTransmitKey = false;
-	    spin_unlock_irq(&pDevice->lock);
-	    KeyvInitTable(pDevice, &pDevice->sKey);
-	    spin_lock_irq(&pDevice->lock);
-	       pMgmt->byCSSPK = KEY_CTL_NONE;
-                pMgmt->byCSSGK = KEY_CTL_NONE;
-
-	  if (pDevice->bLinkPass == true) {
-                // reason = 8 : disassoc because sta has left
-		vMgrDisassocBeginSta((void *) pDevice,
-				     pMgmt,
-				     pMgmt->abyCurrBSSID,
-				     (8),
-				     &Status);
-                       pDevice->bLinkPass = false;
-                // unlock command busy
-                        pMgmt->eCurrState = WMAC_STATE_IDLE;
-                        pMgmt->sNodeDBTable[0].bActive = false;
-                    // if(pDevice->bWPASuppWextEnabled == true)
-                        {
-                  	union iwreq_data  wrqu;
-                  	memset(&wrqu, 0, sizeof(wrqu));
-                          wrqu.ap_addr.sa_family = ARPHRD_ETHER;
-                  	PRINT_K("wireless_send_event--->SIOCGIWAP(disassociated)\n");
-                  	wireless_send_event(pDevice->dev, SIOCGIWAP, &wrqu, NULL);
-                       }
-	  	}
-	               pDevice->bwextstep0 = false;
-                        pDevice->bwextstep1 = false;
-                        pDevice->bwextstep2 = false;
-                        pDevice->bwextstep3 = false;
-		      pDevice->bWPASuppWextEnabled = false;
-	                  //clear current SSID
-                  pItemSSID = (PWLAN_IE_SSID)pMgmt->abyCurrSSID;
-                  pItemSSID->len = 0;
-                  memset(pItemSSID->abySSID, 0, WLAN_SSID_MAXLEN);
-                //clear desired SSID
-                pItemSSID = (PWLAN_IE_SSID)pMgmt->abyDesireSSID;
-                pItemSSID->len = 0;
-                memset(pItemSSID->abySSID, 0, WLAN_SSID_MAXLEN);
-
-	    netif_stop_queue(pDevice->dev);
-	    CARDbRadioPowerOff(pDevice);
-             MACvRegBitsOn(pDevice, MAC_REG_GPIOCTL1, GPIO3_INTMD);
-	    ControlvMaskByte(pDevice, MESSAGE_REQUEST_MACREG, MAC_REG_PAPEDELAY, LEDSTS_STS, LEDSTS_OFF);
-	    pDevice->bHWRadioOff = true;
-        } else {
-            DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" WLAN_CMD_RADIO_START_ON........................\n");
-            pDevice->bHWRadioOff = false;
-                CARDbRadioPowerOn(pDevice);
-            MACvRegBitsOff(pDevice, MAC_REG_GPIOCTL1, GPIO3_INTMD);
-            ControlvMaskByte(pDevice, MESSAGE_REQUEST_MACREG, MAC_REG_PAPEDELAY, LEDSTS_STS, LEDSTS_ON);
-        }
-      }
+//		if (pDevice->bRadioCmd == true)
+//			CARDbRadioPowerOn(pDevice);
+//		else
+//			CARDbRadioPowerOff(pDevice);
+		{
+			int ntStatus = STATUS_SUCCESS;
+			u8            byTmp;
+
+			ntStatus = CONTROLnsRequestIn(pDevice,
+					MESSAGE_TYPE_READ,
+					MAC_REG_GPIOCTL1,
+					MESSAGE_REQUEST_MACREG,
+					1,
+					&byTmp);
+
+			if (ntStatus != STATUS_SUCCESS) {
+				s_bCommandComplete(pDevice);
+				spin_unlock_irq(&pDevice->lock);
+				return;
+			}
+			if ((byTmp & GPIO3_DATA) == 0) {
+				DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" WLAN_CMD_RADIO_START_OFF........................\n");
+				// Old commands are useless.
+				// empty command Q
+				pDevice->cbFreeCmdQueue = CMD_Q_SIZE;
+				pDevice->uCmdDequeueIdx = 0;
+				pDevice->uCmdEnqueueIdx = 0;
+				//0415pDevice->bCmdRunning = false;
+				pDevice->bCmdClear = true;
+				pDevice->bStopTx0Pkt = false;
+				pDevice->bStopDataPkt = true;
+
+				pDevice->byKeyIndex = 0;
+				pDevice->bTransmitKey = false;
+				spin_unlock_irq(&pDevice->lock);
+				KeyvInitTable(pDevice, &pDevice->sKey);
+				spin_lock_irq(&pDevice->lock);
+				pMgmt->byCSSPK = KEY_CTL_NONE;
+				pMgmt->byCSSGK = KEY_CTL_NONE;
+
+				if (pDevice->bLinkPass == true) {
+					// reason = 8 : disassoc because sta has left
+					vMgrDisassocBeginSta((void *) pDevice,
+							pMgmt,
+							pMgmt->abyCurrBSSID,
+							(8),
+							&Status);
+					pDevice->bLinkPass = false;
+					// unlock command busy
+					pMgmt->eCurrState = WMAC_STATE_IDLE;
+					pMgmt->sNodeDBTable[0].bActive = false;
+					// if(pDevice->bWPASuppWextEnabled == true)
+					{
+						union iwreq_data  wrqu;
+						memset(&wrqu, 0, sizeof(wrqu));
+						wrqu.ap_addr.sa_family = ARPHRD_ETHER;
+						PRINT_K("wireless_send_event--->SIOCGIWAP(disassociated)\n");
+						wireless_send_event(pDevice->dev, SIOCGIWAP, &wrqu, NULL);
+					}
+				}
+				pDevice->bwextstep0 = false;
+				pDevice->bwextstep1 = false;
+				pDevice->bwextstep2 = false;
+				pDevice->bwextstep3 = false;
+				pDevice->bWPASuppWextEnabled = false;
+				//clear current SSID
+				pItemSSID = (PWLAN_IE_SSID)pMgmt->abyCurrSSID;
+				pItemSSID->len = 0;
+				memset(pItemSSID->abySSID, 0, WLAN_SSID_MAXLEN);
+				//clear desired SSID
+				pItemSSID = (PWLAN_IE_SSID)pMgmt->abyDesireSSID;
+				pItemSSID->len = 0;
+				memset(pItemSSID->abySSID, 0, WLAN_SSID_MAXLEN);
+
+				netif_stop_queue(pDevice->dev);
+				CARDbRadioPowerOff(pDevice);
+				MACvRegBitsOn(pDevice, MAC_REG_GPIOCTL1, GPIO3_INTMD);
+				ControlvMaskByte(pDevice, MESSAGE_REQUEST_MACREG, MAC_REG_PAPEDELAY, LEDSTS_STS, LEDSTS_OFF);
+				pDevice->bHWRadioOff = true;
+			} else {
+				DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" WLAN_CMD_RADIO_START_ON........................\n");
+				pDevice->bHWRadioOff = false;
+				CARDbRadioPowerOn(pDevice);
+				MACvRegBitsOff(pDevice, MAC_REG_GPIOCTL1, GPIO3_INTMD);
+				ControlvMaskByte(pDevice, MESSAGE_REQUEST_MACREG, MAC_REG_PAPEDELAY, LEDSTS_STS, LEDSTS_ON);
+			}
+		}
 
             s_bCommandComplete(pDevice);
             break;
@@ -872,19 +865,19 @@  void vRunCommand(struct work_struct *work)
 
     case WLAN_CMD_CHANGE_ANTENNA_START:
             DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Change from Antenna%d to", (int)pDevice->dwRxAntennaSel);
-            if (pDevice->dwRxAntennaSel == 0) {
-                pDevice->dwRxAntennaSel = 1;
-                if (pDevice->bTxRxAntInv == true)
-                    BBvSetAntennaMode(pDevice, ANT_RXA);
-                else
-                    BBvSetAntennaMode(pDevice, ANT_RXB);
-            } else {
-                pDevice->dwRxAntennaSel = 0;
-                if (pDevice->bTxRxAntInv == true)
-                    BBvSetAntennaMode(pDevice, ANT_RXB);
-                else
-                    BBvSetAntennaMode(pDevice, ANT_RXA);
-            }
+		if (pDevice->dwRxAntennaSel == 0) {
+			pDevice->dwRxAntennaSel = 1;
+			if (pDevice->bTxRxAntInv == true)
+				BBvSetAntennaMode(pDevice, ANT_RXA);
+			else
+				BBvSetAntennaMode(pDevice, ANT_RXB);
+		} else {
+			pDevice->dwRxAntennaSel = 0;
+			if (pDevice->bTxRxAntInv == true)
+				BBvSetAntennaMode(pDevice, ANT_RXB);
+			else
+				BBvSetAntennaMode(pDevice, ANT_RXA);
+		}
             s_bCommandComplete(pDevice);
             break;
 
@@ -895,16 +888,16 @@  void vRunCommand(struct work_struct *work)
 
     case WLAN_CMD_MAC_DISPOWERSAVING_START:
             ControlvReadByte(pDevice, MESSAGE_REQUEST_MACREG, MAC_REG_PSCTL, &byData);
-            if ((byData & PSCTL_PS) != 0) {
-                // disable power saving hw function
-                CONTROLnsRequestOut(pDevice,
-                                MESSAGE_TYPE_DISABLE_PS,
-                                0,
-                                0,
-                                0,
-                                NULL
-                                );
-            }
+		if ((byData & PSCTL_PS) != 0) {
+			// disable power saving hw function
+			CONTROLnsRequestOut(pDevice,
+					MESSAGE_TYPE_DISABLE_PS,
+					0,
+					0,
+					0,
+					NULL
+					);
+		}
             s_bCommandComplete(pDevice);
             break;
 
@@ -933,95 +926,94 @@  static int s_bCommandComplete(struct vnt_private *pDevice)
 	int bForceSCAN = true;
 
     pDevice->eCommandState = WLAN_CMD_IDLE;
-    if (pDevice->cbFreeCmdQueue == CMD_Q_SIZE) {
-        //Command Queue Empty
-        pDevice->bCmdRunning = false;
-        return true;
-    } else {
-        pDevice->eCommand = pDevice->eCmdQueue[pDevice->uCmdDequeueIdx].eCmd;
-        pSSID = (PWLAN_IE_SSID)pDevice->eCmdQueue[pDevice->uCmdDequeueIdx].abyCmdDesireSSID;
-        bRadioCmd = pDevice->eCmdQueue[pDevice->uCmdDequeueIdx].bRadioCmd;
-        bForceSCAN = pDevice->eCmdQueue[pDevice->uCmdDequeueIdx].bForceSCAN;
-        ADD_ONE_WITH_WRAP_AROUND(pDevice->uCmdDequeueIdx, CMD_Q_SIZE);
-        pDevice->cbFreeCmdQueue++;
-        pDevice->bCmdRunning = true;
-        switch (pDevice->eCommand) {
-        case WLAN_CMD_BSSID_SCAN:
-                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"eCommandState= WLAN_CMD_BSSID_SCAN\n");
-                pDevice->eCommandState = WLAN_CMD_SCAN_START;
-                pMgmt->uScanChannel = 0;
-                if (pSSID->len != 0)
-                    memcpy(pMgmt->abyScanSSID, pSSID, WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1);
-                else
-                    memset(pMgmt->abyScanSSID, 0, WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1);
+	if (pDevice->cbFreeCmdQueue == CMD_Q_SIZE) {
+		//Command Queue Empty
+		pDevice->bCmdRunning = false;
+		return true;
+	} else {
+		pDevice->eCommand = pDevice->eCmdQueue[pDevice->uCmdDequeueIdx].eCmd;
+		pSSID = (PWLAN_IE_SSID)pDevice->eCmdQueue[pDevice->uCmdDequeueIdx].abyCmdDesireSSID;
+		bRadioCmd = pDevice->eCmdQueue[pDevice->uCmdDequeueIdx].bRadioCmd;
+		bForceSCAN = pDevice->eCmdQueue[pDevice->uCmdDequeueIdx].bForceSCAN;
+		ADD_ONE_WITH_WRAP_AROUND(pDevice->uCmdDequeueIdx, CMD_Q_SIZE);
+		pDevice->cbFreeCmdQueue++;
+		pDevice->bCmdRunning = true;
+		switch (pDevice->eCommand) {
+		case WLAN_CMD_BSSID_SCAN:
+			DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"eCommandState= WLAN_CMD_BSSID_SCAN\n");
+			pDevice->eCommandState = WLAN_CMD_SCAN_START;
+			pMgmt->uScanChannel = 0;
+			if (pSSID->len != 0)
+				memcpy(pMgmt->abyScanSSID, pSSID, WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1);
+			else
+				memset(pMgmt->abyScanSSID, 0, WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1);
 /*
-                if ((bForceSCAN == false) && (pDevice->bLinkPass == true)) {
-                    if ((pSSID->len == ((PWLAN_IE_SSID)pMgmt->abyCurrSSID)->len) &&
-                        ( !memcmp(pSSID->abySSID, ((PWLAN_IE_SSID)pMgmt->abyCurrSSID)->abySSID, pSSID->len))) {
-                        pDevice->eCommandState = WLAN_CMD_IDLE;
-                    }
-                }
+			if ((bForceSCAN == false) && (pDevice->bLinkPass == true)) {
+				if ((pSSID->len == ((PWLAN_IE_SSID)pMgmt->abyCurrSSID)->len) &&
+				    ( !memcmp(pSSID->abySSID, ((PWLAN_IE_SSID)pMgmt->abyCurrSSID)->abySSID, pSSID->len))) {
+					pDevice->eCommandState = WLAN_CMD_IDLE;
+				}
+			}
 */
-                break;
-        case WLAN_CMD_SSID:
-                pDevice->eCommandState = WLAN_CMD_SSID_START;
-                if (pSSID->len > WLAN_SSID_MAXLEN)
-                    pSSID->len = WLAN_SSID_MAXLEN;
-                if (pSSID->len != 0)
-                    memcpy(pMgmt->abyDesireSSID, pSSID, WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1);
-                DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"eCommandState= WLAN_CMD_SSID_START\n");
-                break;
-        case WLAN_CMD_DISASSOCIATE:
-                pDevice->eCommandState = WLAN_CMD_DISASSOCIATE_START;
-                break;
-        case WLAN_CMD_RX_PSPOLL:
-                pDevice->eCommandState = WLAN_CMD_TX_PSPACKET_START;
-                break;
-        case WLAN_CMD_RUN_AP:
-                pDevice->eCommandState = WLAN_CMD_AP_MODE_START;
-                break;
-        case WLAN_CMD_RADIO:
-                pDevice->eCommandState = WLAN_CMD_RADIO_START;
-                pDevice->bRadioCmd = bRadioCmd;
-                break;
-        case WLAN_CMD_CHANGE_BBSENSITIVITY:
-                pDevice->eCommandState = WLAN_CMD_CHANGE_BBSENSITIVITY_START;
-                break;
-
-        case WLAN_CMD_TBTT_WAKEUP:
-                pDevice->eCommandState = WLAN_CMD_TBTT_WAKEUP_START;
-                break;
-
-        case WLAN_CMD_BECON_SEND:
-                pDevice->eCommandState = WLAN_CMD_BECON_SEND_START;
-                break;
-
-        case WLAN_CMD_SETPOWER:
-                pDevice->eCommandState = WLAN_CMD_SETPOWER_START;
-                break;
-
-        case WLAN_CMD_CHANGE_ANTENNA:
-                pDevice->eCommandState = WLAN_CMD_CHANGE_ANTENNA_START;
-                break;
-
-        case WLAN_CMD_REMOVE_ALLKEY:
-                pDevice->eCommandState = WLAN_CMD_REMOVE_ALLKEY_START;
-                break;
-
-        case WLAN_CMD_MAC_DISPOWERSAVING:
-                pDevice->eCommandState = WLAN_CMD_MAC_DISPOWERSAVING_START;
-                break;
-
-        case WLAN_CMD_11H_CHSW:
-                pDevice->eCommandState = WLAN_CMD_11H_CHSW_START;
-                break;
-
-        default:
-                break;
-
-        }
-	vCommandTimerWait(pDevice, 0);
-    }
+			break;
+		case WLAN_CMD_SSID:
+			pDevice->eCommandState = WLAN_CMD_SSID_START;
+			if (pSSID->len > WLAN_SSID_MAXLEN)
+				pSSID->len = WLAN_SSID_MAXLEN;
+			if (pSSID->len != 0)
+				memcpy(pMgmt->abyDesireSSID, pSSID, WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1);
+			DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"eCommandState= WLAN_CMD_SSID_START\n");
+			break;
+		case WLAN_CMD_DISASSOCIATE:
+			pDevice->eCommandState = WLAN_CMD_DISASSOCIATE_START;
+			break;
+		case WLAN_CMD_RX_PSPOLL:
+			pDevice->eCommandState = WLAN_CMD_TX_PSPACKET_START;
+			break;
+		case WLAN_CMD_RUN_AP:
+			pDevice->eCommandState = WLAN_CMD_AP_MODE_START;
+			break;
+		case WLAN_CMD_RADIO:
+			pDevice->eCommandState = WLAN_CMD_RADIO_START;
+			pDevice->bRadioCmd = bRadioCmd;
+			break;
+		case WLAN_CMD_CHANGE_BBSENSITIVITY:
+			pDevice->eCommandState = WLAN_CMD_CHANGE_BBSENSITIVITY_START;
+			break;
+
+		case WLAN_CMD_TBTT_WAKEUP:
+			pDevice->eCommandState = WLAN_CMD_TBTT_WAKEUP_START;
+			break;
+
+		case WLAN_CMD_BECON_SEND:
+			pDevice->eCommandState = WLAN_CMD_BECON_SEND_START;
+			break;
+
+		case WLAN_CMD_SETPOWER:
+			pDevice->eCommandState = WLAN_CMD_SETPOWER_START;
+			break;
+
+		case WLAN_CMD_CHANGE_ANTENNA:
+			pDevice->eCommandState = WLAN_CMD_CHANGE_ANTENNA_START;
+			break;
+
+		case WLAN_CMD_REMOVE_ALLKEY:
+			pDevice->eCommandState = WLAN_CMD_REMOVE_ALLKEY_START;
+			break;
+
+		case WLAN_CMD_MAC_DISPOWERSAVING:
+			pDevice->eCommandState = WLAN_CMD_MAC_DISPOWERSAVING_START;
+			break;
+
+		case WLAN_CMD_11H_CHSW:
+			pDevice->eCommandState = WLAN_CMD_11H_CHSW_START;
+			break;
+
+		default:
+			break;
+		}
+		vCommandTimerWait(pDevice, 0);
+	}
 
     return true;
 }
@@ -1030,47 +1022,47 @@  int bScheduleCommand(struct vnt_private *pDevice,
 		CMD_CODE eCommand, u8 *pbyItem0)
 {
 
-    if (pDevice->cbFreeCmdQueue == 0)
-        return (false);
-    pDevice->eCmdQueue[pDevice->uCmdEnqueueIdx].eCmd = eCommand;
-    pDevice->eCmdQueue[pDevice->uCmdEnqueueIdx].bForceSCAN = true;
-    memset(pDevice->eCmdQueue[pDevice->uCmdEnqueueIdx].abyCmdDesireSSID, 0 , WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1);
-    if (pbyItem0 != NULL) {
-        switch (eCommand) {
-        case WLAN_CMD_BSSID_SCAN:
-                pDevice->eCmdQueue[pDevice->uCmdEnqueueIdx].bForceSCAN = false;
-                memcpy(pDevice->eCmdQueue[pDevice->uCmdEnqueueIdx].abyCmdDesireSSID,
-                         pbyItem0, WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1);
-                break;
-
-        case WLAN_CMD_SSID:
-                memcpy(pDevice->eCmdQueue[pDevice->uCmdEnqueueIdx].abyCmdDesireSSID,
-                         pbyItem0, WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1);
-                break;
-
-        case WLAN_CMD_DISASSOCIATE:
-                pDevice->eCmdQueue[pDevice->uCmdEnqueueIdx].bNeedRadioOFF = *((int *)pbyItem0);
-                break;
+	if (pDevice->cbFreeCmdQueue == 0)
+		return (false);
+	pDevice->eCmdQueue[pDevice->uCmdEnqueueIdx].eCmd = eCommand;
+	pDevice->eCmdQueue[pDevice->uCmdEnqueueIdx].bForceSCAN = true;
+	memset(pDevice->eCmdQueue[pDevice->uCmdEnqueueIdx].abyCmdDesireSSID, 0 , WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1);
+	if (pbyItem0 != NULL) {
+		switch (eCommand) {
+		case WLAN_CMD_BSSID_SCAN:
+			pDevice->eCmdQueue[pDevice->uCmdEnqueueIdx].bForceSCAN = false;
+			memcpy(pDevice->eCmdQueue[pDevice->uCmdEnqueueIdx].abyCmdDesireSSID,
+				pbyItem0, WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1);
+			break;
+
+		case WLAN_CMD_SSID:
+			memcpy(pDevice->eCmdQueue[pDevice->uCmdEnqueueIdx].abyCmdDesireSSID,
+				pbyItem0, WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1);
+			break;
+
+		case WLAN_CMD_DISASSOCIATE:
+			pDevice->eCmdQueue[pDevice->uCmdEnqueueIdx].bNeedRadioOFF = *((int *)pbyItem0);
+			break;
 /*
-        case WLAN_CMD_DEAUTH:
-                pDevice->eCmdQueue[pDevice->uCmdEnqueueIdx].wDeAuthenReason = *((u16 *)pbyItem0);
-                break;
+		case WLAN_CMD_DEAUTH:
+			pDevice->eCmdQueue[pDevice->uCmdEnqueueIdx].wDeAuthenReason = *((u16 *)pbyItem0);
+			break;
 */
 
-        case WLAN_CMD_RADIO:
-                pDevice->eCmdQueue[pDevice->uCmdEnqueueIdx].bRadioCmd = *((int *)pbyItem0);
-                break;
+		case WLAN_CMD_RADIO:
+			pDevice->eCmdQueue[pDevice->uCmdEnqueueIdx].bRadioCmd = *((int *)pbyItem0);
+			break;
 
-        default:
-                break;
-        }
-    }
+		default:
+			break;
+		}
+	}
 
     ADD_ONE_WITH_WRAP_AROUND(pDevice->uCmdEnqueueIdx, CMD_Q_SIZE);
     pDevice->cbFreeCmdQueue--;
 
-    if (pDevice->bCmdRunning == false)
-        s_bCommandComplete(pDevice);
+	if (pDevice->bCmdRunning == false)
+		s_bCommandComplete(pDevice);
 
     return (true);
 
@@ -1095,15 +1087,15 @@  static int s_bClearBSSID_SCAN(struct vnt_private *pDevice)
 	unsigned int uCmdDequeueIdx = pDevice->uCmdDequeueIdx;
 	unsigned int ii;
 
-    if ((pDevice->cbFreeCmdQueue < CMD_Q_SIZE) && (uCmdDequeueIdx != pDevice->uCmdEnqueueIdx)) {
-        for (ii = 0; ii < (CMD_Q_SIZE - pDevice->cbFreeCmdQueue); ii++) {
-            if (pDevice->eCmdQueue[uCmdDequeueIdx].eCmd == WLAN_CMD_BSSID_SCAN)
-                pDevice->eCmdQueue[uCmdDequeueIdx].eCmd = WLAN_CMD_IDLE;
-            ADD_ONE_WITH_WRAP_AROUND(uCmdDequeueIdx, CMD_Q_SIZE);
-            if (uCmdDequeueIdx == pDevice->uCmdEnqueueIdx)
-                break;
-        }
-    }
+	if ((pDevice->cbFreeCmdQueue < CMD_Q_SIZE) && (uCmdDequeueIdx != pDevice->uCmdEnqueueIdx)) {
+		for (ii = 0; ii < (CMD_Q_SIZE - pDevice->cbFreeCmdQueue); ii++) {
+			if (pDevice->eCmdQueue[uCmdDequeueIdx].eCmd == WLAN_CMD_BSSID_SCAN)
+				pDevice->eCmdQueue[uCmdDequeueIdx].eCmd = WLAN_CMD_IDLE;
+			ADD_ONE_WITH_WRAP_AROUND(uCmdDequeueIdx, CMD_Q_SIZE);
+			if (uCmdDequeueIdx == pDevice->uCmdEnqueueIdx)
+				break;
+		}
+	}
     return true;
 }