diff options
Diffstat (limited to 'drivers/staging/vt6656/wmgr.c')
| -rw-r--r-- | drivers/staging/vt6656/wmgr.c | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/drivers/staging/vt6656/wmgr.c b/drivers/staging/vt6656/wmgr.c index e4eca9b..2ec200d 100644 --- a/drivers/staging/vt6656/wmgr.c +++ b/drivers/staging/vt6656/wmgr.c @@ -92,7 +92,7 @@ static int msglevel =MSG_LEVEL_INFO; //static int msglevel =MSG_LEVEL_DEBUG; /*--------------------- Static Functions --------------------------*/ -//2008-0730-01<Add>by MikeLiu + static BOOL ChannelExceedZoneType( PSDevice pDevice, BYTE byCurrChannel @@ -997,7 +997,7 @@ s_vMgrRxAssocResponse( netif_rx(pDevice->skb); pDevice->skb = dev_alloc_skb((int)pDevice->rx_buf_sz); } -//2008-0409-07, <Add> by Einsn Liu + #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT //if(pDevice->bWPASuppWextEnabled == TRUE) { @@ -1038,7 +1038,7 @@ s_vMgrRxAssocResponse( } #endif //#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT -//End Add -- //2008-0409-07, <Add> by Einsn Liu + } else { if (bReAssocType) { @@ -1745,7 +1745,6 @@ s_vMgrRxDeauthentication( return; } -//2008-0730-01<Add>by MikeLiu /*+ * * Routine Description: @@ -1868,7 +1867,6 @@ s_vMgrRxBeacon( } } -//2008-0730-01<Add>by MikeLiu if(ChannelExceedZoneType(pDevice,byCurrChannel)==TRUE) return; @@ -2638,8 +2636,9 @@ void vMgrJoinBSSBegin(void *hDeviceContext, PCMD_STATUS pStatus) if (WLAN_GET_CAP_INFO_ESS(cpu_to_le16(pCurr->wCapInfo))){ - if ((pMgmt->eAuthenMode == WMAC_AUTH_WPA)||(pMgmt->eAuthenMode == WMAC_AUTH_WPAPSK)) { -/* + if ((pMgmt->eAuthenMode == WMAC_AUTH_WPA) || + (pMgmt->eAuthenMode == WMAC_AUTH_WPAPSK)) { + /* if (pDevice->eEncryptionStatus == Ndis802_11Encryption2Enabled) { if (WPA_SearchRSN(0, WPA_TKIP, pCurr) == FALSE) { DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"No match RSN info. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++\n"); @@ -4239,7 +4238,6 @@ s_vMgrRxProbeResponse( } //RobertYu:20050201 -//2008-0730-01<Add>by MikeLiu if(ChannelExceedZoneType(pDevice,byCurrChannel)==TRUE) return; @@ -4767,8 +4765,9 @@ s_bCipherMatch ( if ((WLAN_GET_CAP_INFO_PRIVACY(pBSSNode->wCapInfo) != 0) && (pBSSNode->bWPA2Valid == TRUE) && - //20080123-01,<Add> by Einsn Liu - ((EncStatus == Ndis802_11Encryption3Enabled)||(EncStatus == Ndis802_11Encryption2Enabled))) { + + ((EncStatus == Ndis802_11Encryption3Enabled) || + (EncStatus == Ndis802_11Encryption2Enabled))) { //WPA2 // check Group Key Cipher if ((pBSSNode->byCSSGK == WLAN_11i_CSS_WEP40) || |
