diff options
Diffstat (limited to 'drivers/staging/vt6656/wcmd.c')
| -rw-r--r-- | drivers/staging/vt6656/wcmd.c | 41 |
1 files changed, 2 insertions, 39 deletions
diff --git a/drivers/staging/vt6656/wcmd.c b/drivers/staging/vt6656/wcmd.c index 72e21b6f0e88..686747a09294 100644 --- a/drivers/staging/vt6656/wcmd.c +++ b/drivers/staging/vt6656/wcmd.c @@ -565,11 +565,9 @@ void vRunCommand(void *hDeviceContext) return; } -//20080131-03,<Add> by Mike Liu - #ifdef Adhoc_STA memcpy(pMgmt->abyAdHocSSID,pMgmt->abyDesireSSID, ((PWLAN_IE_SSID)pMgmt->abyDesireSSID)->len + WLAN_IEHDR_LEN); - #endif + pItemSSID = (PWLAN_IE_SSID)pMgmt->abyDesireSSID; pItemSSIDCurr = (PWLAN_IE_SSID)pMgmt->abyCurrSSID; DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO" cmd: desire ssid = %s\n", pItemSSID->abySSID); @@ -716,18 +714,6 @@ void vRunCommand(void *hDeviceContext) return; } pDevice->byLinkWaitCount = 0; - #if 0 - #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT - // if(pDevice->bWPASuppWextEnabled == TRUE) - { - union iwreq_data wrqu; - memset(&wrqu, 0, sizeof (wrqu)); - wrqu.ap_addr.sa_family = ARPHRD_ETHER; - printk("wireless_send_event--->SIOCGIWAP(disassociated:AUTHENTICATE_WAIT_timeout)\n"); - wireless_send_event(pDevice->dev, SIOCGIWAP, &wrqu, NULL); - } - #endif - #endif s_bCommandComplete(pDevice); break; @@ -754,8 +740,6 @@ void vRunCommand(void *hDeviceContext) netif_wake_queue(pDevice->dev); } - //2007-0115-07<Add>by MikeLiu - #ifdef TxInSleep if(pDevice->IsTxDataTrigger != FALSE) { //TxDataTimer is not triggered at the first time // printk("Re-initial TxDataTimer****\n"); del_timer(&pDevice->sTimerTxData); @@ -771,7 +755,6 @@ void vRunCommand(void *hDeviceContext) } pDevice->IsTxDataTrigger = TRUE; add_timer(&pDevice->sTimerTxData); - #endif } else if(pMgmt->eCurrState < WMAC_STATE_ASSOCPENDING) { @@ -785,18 +768,6 @@ void vRunCommand(void *hDeviceContext) return; } pDevice->byLinkWaitCount = 0; - #if 0 - #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT - // if(pDevice->bWPASuppWextEnabled == TRUE) - { - union iwreq_data wrqu; - memset(&wrqu, 0, sizeof (wrqu)); - wrqu.ap_addr.sa_family = ARPHRD_ETHER; - printk("wireless_send_event--->SIOCGIWAP(disassociated:ASSOCIATE_WAIT_timeout)\n"); - wireless_send_event(pDevice->dev, SIOCGIWAP, &wrqu, NULL); - } - #endif - #endif s_bCommandComplete(pDevice); break; @@ -907,7 +878,7 @@ void vRunCommand(void *hDeviceContext) // CARDbRadioPowerOff(pDevice); //2008-09-09<Add> BY Mike:Hot Key for Radio On/Off { - NTSTATUS ntStatus = STATUS_SUCCESS; + int ntStatus = STATUS_SUCCESS; BYTE byTmp; ntStatus = CONTROLnsRequestIn(pDevice, @@ -1300,8 +1271,6 @@ void vResetCommandTimer(void *hDeviceContext) pDevice->bCmdClear = FALSE; } -//2007-0115-08<Add>by MikeLiu -#ifdef TxInSleep void BSSvSecondTxData(void *hDeviceContext) { PSDevice pDevice = (PSDevice)hDeviceContext; @@ -1320,12 +1289,8 @@ void BSSvSecondTxData(void *hDeviceContext) spin_lock_irq(&pDevice->lock); //is wap_supplicant running successful OR only open && sharekey mode! - #if 1 if(((pDevice->bLinkPass ==TRUE)&&(pMgmt->eAuthenMode < WMAC_AUTH_WPA)) || //open && sharekey linking (pDevice->fWPA_Authened == TRUE)) { //wpa linking - #else - if(pDevice->bLinkPass ==TRUE) { - #endif // printk("mike:%s-->InSleep Tx Data Procedure\n",__FUNCTION__); pDevice->fTxDataInSleep = TRUE; PSbSendNullPacket(pDevice); //send null packet @@ -1337,5 +1302,3 @@ void BSSvSecondTxData(void *hDeviceContext) add_timer(&pDevice->sTimerTxData); return; } -#endif - |