diff options
Diffstat (limited to 'drivers/staging/vt6656')
25 files changed, 124 insertions, 191 deletions
diff --git a/drivers/staging/vt6656/80211mgr.h b/drivers/staging/vt6656/80211mgr.h index 3d57f79..515b9c1 100644 --- a/drivers/staging/vt6656/80211mgr.h +++ b/drivers/staging/vt6656/80211mgr.h @@ -66,9 +66,9 @@ #define WLAN_EID_RSN_WPA 221 #ifdef Cisco_ccx -#define WLAN_EID_CCX 133 //DavidWang -#define WLAN_EID_CCX_IP 149 //DavidWang -#define WLAN_EID_CCX_Ver 221 //DavidWang +#define WLAN_EID_CCX 133 +#define WLAN_EID_CCX_IP 149 +#define WLAN_EID_CCX_Ver 221 #endif #define WLAN_EID_ERP_NONERP_PRESENT 0x01 @@ -348,7 +348,7 @@ typedef struct tagWLAN_IE_RSN { BYTE abyRSN[WLAN_MIN_ARRAY]; } WLAN_IE_RSN, *PWLAN_IE_RSN; -//DavidWang + // CCX Identity DavidWang #pragma pack(1) typedef struct tagWLAN_IE_CCX { @@ -371,7 +371,7 @@ BYTE len; BYTE abyCCXVer[5]; } WLAN_IE_CCX_Ver, *PWLAN_IE_CCX_Ver; -//DavidWang + // ERP #pragma pack(1) diff --git a/drivers/staging/vt6656/Makefile b/drivers/staging/vt6656/Makefile index 582a35197..41ed06b 100644 --- a/drivers/staging/vt6656/Makefile +++ b/drivers/staging/vt6656/Makefile @@ -1,6 +1,6 @@ # TODO: all of these should be removed -EXTRA_CFLAGS += -DLINUX -D__KERNEL__ -DEXPORT_SYMTAB -D__NO_VERSION__ -EXTRA_CFLAGS += -DHOSTAP +ccflags-y := -DLINUX -D__KERNEL__ -DEXPORT_SYMTAB -D__NO_VERSION__ +ccflags-y += -DHOSTAP vt6656_stage-y += main_usb.o \ card.o \ diff --git a/drivers/staging/vt6656/baseband.c b/drivers/staging/vt6656/baseband.c index 2990249..e5add20 100644 --- a/drivers/staging/vt6656/baseband.c +++ b/drivers/staging/vt6656/baseband.c @@ -1010,11 +1010,9 @@ BOOL BBbVT3184Init(PSDevice pDevice) } - //20080215-01,<Add> by Mike Liu // if ((pDevice->abyEEPROM[EEP_OFS_RADIOCTL]&0x06)==0x04) // return FALSE; -//20080804-01,<Add> by Mike Liu //zonetype initial pDevice->byOriginalZonetype = pDevice->abyEEPROM[EEP_OFS_ZONETYPE]; if(pDevice->config_file.ZoneType >= 0) { //read zonetype file ok! diff --git a/drivers/staging/vt6656/bssdb.c b/drivers/staging/vt6656/bssdb.c index a9f68bd..2bdd0a2 100644 --- a/drivers/staging/vt6656/bssdb.c +++ b/drivers/staging/vt6656/bssdb.c @@ -148,7 +148,6 @@ PKnownBSS BSSpSearchBSSList(void *hDeviceContext, for (ii = 0; ii <MAX_BSS_NUM; ii++) { pCurrBSS = &(pMgmt->sBSSList[ii]); - //2008-0718-01<Add>by MikeLiu pCurrBSS->bSelected = FALSE; if ((pCurrBSS->bActive) && @@ -188,7 +187,6 @@ PKnownBSS BSSpSearchBSSList(void *hDeviceContext, // if ((pCurrBSS->bActive) && // (pCurrBSS->bSelected == FALSE)) { - //2007-0721-01<Add>by MikeLiu pCurrBSS->bSelected = FALSE; if (pCurrBSS->bActive) { @@ -238,12 +236,12 @@ PKnownBSS BSSpSearchBSSList(void *hDeviceContext, } } */ -//DavidWang + pMgmt->pSameBSS[jj].uChannel = pCurrBSS->uChannel; DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"BSSpSearchBSSList pSelect1[%02X %02X %02X-%02X %02X %02X]\n",*pCurrBSS->abyBSSID,*(pCurrBSS->abyBSSID+1),*(pCurrBSS->abyBSSID+2),*(pCurrBSS->abyBSSID+3),*(pCurrBSS->abyBSSID+4),*(pCurrBSS->abyBSSID+5)); jj++; -//DavidWang + if (pSelect == NULL) { pSelect = pCurrBSS; } else { @@ -254,9 +252,9 @@ PKnownBSS BSSpSearchBSSList(void *hDeviceContext, } } } -//DavidWang + pDevice->bSameBSSMaxNum = jj; -//DavidWang + if (pSelect != NULL) { pSelect->bSelected = TRUE; if (pDevice->bRoaming == FALSE) { @@ -956,7 +954,7 @@ void BSSvSecondCallBack(void *hDeviceContext) unsigned int uSleepySTACnt = 0; unsigned int uNonShortSlotSTACnt = 0; unsigned int uLongPreambleSTACnt = 0; - viawget_wpa_header *wpahdr; //DavidWang + viawget_wpa_header *wpahdr; spin_lock_irq(&pDevice->lock); @@ -1180,7 +1178,7 @@ if((pMgmt->eCurrState!=WMAC_STATE_ASSOC) && pDevice->bIsRoaming = FALSE; DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Lost AP beacon [%d] sec, disconnected !\n", pMgmt->sNodeDBTable[0].uInActiveCount); - //let wpa supplicant know AP may disconnect.//20080717-01,<Add> by James Li + /* let wpa supplicant know AP may disconnect */ if ((pDevice->bWPADEVUp) && (pDevice->skb != NULL)) { wpahdr = (viawget_wpa_header *)pDevice->skb->data; wpahdr->type = VIAWGET_DISASSOC_MSG; diff --git a/drivers/staging/vt6656/card.c b/drivers/staging/vt6656/card.c index 35bf4fd..8de21aa 100644 --- a/drivers/staging/vt6656/card.c +++ b/drivers/staging/vt6656/card.c @@ -1102,7 +1102,7 @@ CARDbChannelSwitch ( //bResult=CARDbStopTxPacket(pDevice, PKT_TYPE_802_11_ALL); pDevice->bStopDataPkt = TRUE; } - return (bResult); + return bResult; } diff --git a/drivers/staging/vt6656/channel.c b/drivers/staging/vt6656/channel.c index 6ad03e4..99e054d2 100644 --- a/drivers/staging/vt6656/channel.c +++ b/drivers/staging/vt6656/channel.c @@ -34,12 +34,13 @@ * */ +#include <linux/kernel.h> #include "country.h" #include "channel.h" #include "rf.h" /*--------------------- Static Definitions -------------------------*/ -static int msglevel =MSG_LEVEL_INFO; +static int msglevel = MSG_LEVEL_INFO; //static int msglevel =MSG_LEVEL_DEBUG; /*--------------------- Static Classes ----------------------------*/ @@ -367,7 +368,7 @@ static struct /* 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 */ }; -#define NUM_RULES (sizeof(ChannelRuleTab) / sizeof(ChannelRuleTab[0])) +#define NUM_RULES ARRAY_SIZE(ChannelRuleTab) /*--------------------- Export function -------------------------*/ /************************************************************************ @@ -515,10 +516,9 @@ BYTE CHbyGetChannelMapping(BYTE byChannelNumber) BYTE ii; BYTE byCHMapping = 0; - for (ii=1; ii<=CB_MAX_CHANNEL; ii++ ) { - if ( sChannelTbl[ii].byChannelNumber == byChannelNumber ) { - byCHMapping = ii; - } + for (ii = 1; ii <= CB_MAX_CHANNEL; ii++) { + if (sChannelTbl[ii].byChannelNumber == byChannelNumber) + byCHMapping = ii; } return byCHMapping; } diff --git a/drivers/staging/vt6656/device.h b/drivers/staging/vt6656/device.h index b9852aa..e8d0b420 100644 --- a/drivers/staging/vt6656/device.h +++ b/drivers/staging/vt6656/device.h @@ -258,8 +258,6 @@ typedef enum _VIA_PKT_TYPE //++ NDIS related -#define NDIS_STATUS int - typedef enum __DEVICE_NDIS_STATUS { STATUS_SUCCESS = 0, STATUS_FAILURE, @@ -267,7 +265,6 @@ typedef enum __DEVICE_NDIS_STATUS { STATUS_PENDING, } DEVICE_NDIS_STATUS, *PDEVICE_NDIS_STATUS; - #define MAX_BSSIDINFO_4_PMKID 16 #define MAX_PMKIDLIST 5 //Flags for PMKID Candidate list structure @@ -713,11 +710,11 @@ typedef struct __device_info { BOOL bCmdClear; BOOL bNeedRadioOFF; - BOOL bEnableRoaming; //DavidWang - BOOL bIsRoaming; //DavidWang - BOOL bFastRoaming; //DavidWang - BYTE bSameBSSMaxNum; //Davidwang - BYTE bSameBSSCurNum; //DavidWang + BOOL bEnableRoaming; + BOOL bIsRoaming; + BOOL bFastRoaming; + BYTE bSameBSSMaxNum; + BYTE bSameBSSCurNum; BOOL bRoaming; BOOL b11hEable; unsigned long ulTxPower; @@ -726,7 +723,6 @@ typedef struct __device_info { NDIS_802_11_WEP_STATUS eEncryptionStatus; BOOL bTransmitKey; -//2007-0925-01<Add>by MikeLiu //mike add :save old Encryption NDIS_802_11_WEP_STATUS eOldEncryptionStatus; @@ -891,11 +887,8 @@ typedef struct __device_info { #define fMP_CONTROL_READS 0x00000400 #define fMP_CONTROL_WRITES 0x00000800 - - #define MP_SET_FLAG(_M, _F) ((_M)->Flags |= (_F)) #define MP_CLEAR_FLAG(_M, _F) ((_M)->Flags &= ~(_F)) -#define MP_TEST_FLAG(_M, _F) (((_M)->Flags & (_F)) != 0) #define MP_TEST_FLAGS(_M, _F) (((_M)->Flags & (_F)) == (_F)) #define MP_IS_READY(_M) (((_M)->Flags & \ @@ -909,5 +902,3 @@ typedef struct __device_info { BOOL device_alloc_frag_buf(PSDevice pDevice, PSDeFragControlBlock pDeF); #endif - - diff --git a/drivers/staging/vt6656/dpc.c b/drivers/staging/vt6656/dpc.c index 5e88349..1f9d2963 100644 --- a/drivers/staging/vt6656/dpc.c +++ b/drivers/staging/vt6656/dpc.c @@ -200,10 +200,9 @@ s_vProcessRxMACHeader ( } else if (!compare_ether_addr(pbyRxBuffer, &pDevice->abySNAP_RFC1042[0])) { cbHeaderSize += 6; pwType = (PWORD) (pbyRxBufferAddr + cbHeaderSize); - if ((*pwType!= TYPE_PKT_IPX) && (*pwType != cpu_to_le16(0xF380))) { - } - else { - cbHeaderSize -= 8; + if ((*pwType == cpu_to_le16(ETH_P_IPX)) || + (*pwType == cpu_to_le16(0xF380))) { + cbHeaderSize -= 8; pwType = (PWORD) (pbyRxBufferAddr + cbHeaderSize); if (bIsWEP) { if (bExtIV) { @@ -377,9 +376,9 @@ RXbBulkInProcessData ( return FALSE; } - if ((BytesToIndicate > 2372)||(BytesToIndicate <= 40)) { + if ((BytesToIndicate > 2372) || (BytesToIndicate <= 40)) { // Frame Size error drop this packet. - DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---------- WRONG Length 2 \n"); + DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "---------- WRONG Length 2\n"); return FALSE; } @@ -865,7 +864,6 @@ RXbBulkInProcessData ( pDevice->dev->name); } } - //2008-0409-07, <Add> by Einsn Liu #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT //send event to wpa_supplicant //if(pDevice->bWPASuppWextEnabled == TRUE) @@ -1524,7 +1522,8 @@ void RXvWorkItem(void *Context) DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---->Rx Polling Thread\n"); spin_lock_irq(&pDevice->lock); - while ( MP_TEST_FLAG(pDevice, fMP_POST_READS) && + + while ((pDevice->Flags & fMP_POST_READS) && MP_IS_READY(pDevice) && (pDevice->NumRecvFreeList != 0) ) { pRCB = pDevice->FirstRecvFreeList; @@ -1569,7 +1568,7 @@ RXvFreeRCB( pDevice->NumRecvFreeList++; - if (MP_TEST_FLAG(pDevice, fMP_POST_READS) && MP_IS_READY(pDevice) && + if ((pDevice->Flags & fMP_POST_READS) && MP_IS_READY(pDevice) && (pDevice->bIsRxWorkItemQueued == FALSE) ) { pDevice->bIsRxWorkItemQueued = TRUE; diff --git a/drivers/staging/vt6656/firmware.c b/drivers/staging/vt6656/firmware.c index ebb9c99..d49ea70 100644 --- a/drivers/staging/vt6656/firmware.c +++ b/drivers/staging/vt6656/firmware.c @@ -773,7 +773,7 @@ FIRMWAREbDownload( PSDevice pDevice ) { - NDIS_STATUS NdisStatus; + int NdisStatus; PBYTE pBuffer = NULL; WORD wLength; int ii; @@ -806,7 +806,7 @@ FIRMWAREbDownload( if (pBuffer) kfree(pBuffer); spin_lock_irq(&pDevice->lock); - return (FALSE); + return FALSE; } } } @@ -823,7 +823,7 @@ FIRMWAREbBrach2Sram( PSDevice pDevice ) { - NDIS_STATUS NdisStatus; + int NdisStatus; DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---->Branch to Sram\n"); diff --git a/drivers/staging/vt6656/iocmd.h b/drivers/staging/vt6656/iocmd.h index 1ce39a4..22710ce 100644 --- a/drivers/staging/vt6656/iocmd.h +++ b/drivers/staging/vt6656/iocmd.h @@ -33,10 +33,6 @@ /*--------------------- Export Definitions -------------------------*/ -#if !defined(DEF) -#define DEF -#endif - // ioctl Command code #define MAGIC_CODE 0x3142 #define IOCTL_CMD_TEST (SIOCDEVPRIVATE + 0) diff --git a/drivers/staging/vt6656/ioctl.c b/drivers/staging/vt6656/ioctl.c index d532618..2fe071c 100644 --- a/drivers/staging/vt6656/ioctl.c +++ b/drivers/staging/vt6656/ioctl.c @@ -670,7 +670,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { pMgmt->Cisco_cckm =1; else pMgmt->Cisco_cckm =0; -//DavidWang + if(wpa_Result.authenticated==TRUE) { { diff --git a/drivers/staging/vt6656/iwctl.c b/drivers/staging/vt6656/iwctl.c index 016b8e7..0004be8 100644 --- a/drivers/staging/vt6656/iwctl.c +++ b/drivers/staging/vt6656/iwctl.c @@ -49,7 +49,6 @@ /*--------------------- Static Definitions -------------------------*/ -//2008-0409-07, <Add> by Einsn Liu #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT #define SUPPORTED_WIRELESS_EXT 18 #else @@ -155,7 +154,6 @@ int iwctl_siwscan(struct net_device *dev, BYTE abyScanSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1]; PWLAN_IE_SSID pItemSSID=NULL; -//2008-0920-01<Add>by MikeLiu if (!(pDevice->flags & DEVICE_FLAGS_OPENED)) return -EINVAL; @@ -285,7 +283,6 @@ int iwctl_giwscan(struct net_device *dev, iwe.u.freq.e = 0; iwe.u.freq.i = 0; current_ev = iwe_stream_add_event(info,current_ev,end_buf, &iwe, IW_EV_FREQ_LEN); - //2008-0409-04, <Add> by Einsn Liu { int f = (int)pBSS->uChannel - 1; if(f < 0)f = 0; @@ -299,7 +296,7 @@ int iwctl_giwscan(struct net_device *dev, RFvRSSITodBm(pDevice, (BYTE)(pBSS->uRSSI), &ldBm); iwe.u.qual.level = ldBm; iwe.u.qual.noise = 0; -//2008-0409-01, <Add> by Einsn Liu + if(-ldBm<50){ iwe.u.qual.qual = 100; }else if(-ldBm > 90) { @@ -803,7 +800,6 @@ int iwctl_siwessid(struct net_device *dev, PSMgmtObject pMgmt = &(pDevice->sMgmtObj); PWLAN_IE_SSID pItemSSID; -//2008-0920-01<Add>by MikeLiu if (!(pDevice->flags & DEVICE_FLAGS_OPENED)) return -EINVAL; @@ -931,11 +927,10 @@ int iwctl_giwessid(struct net_device *dev, //pItemSSID = (PWLAN_IE_SSID)pMgmt->abyDesireSSID; memcpy(extra, pItemSSID->abySSID , pItemSSID->len); extra[pItemSSID->len] = '\0'; - //2008-0409-03, <Add> by Einsn Liu + wrq->length = pItemSSID->len; wrq->flags = 1; // active - return 0; } @@ -1392,8 +1387,6 @@ int iwctl_giwencode(struct net_device *dev, } */ -//2008-0409-06, <Add> by Einsn Liu - int iwctl_giwencode(struct net_device *dev, struct iw_request_info *info, struct iw_point *wrq, @@ -1561,7 +1554,6 @@ int iwctl_giwsens(struct net_device *dev, return 0; } -//2008-0409-07, <Add> by Einsn Liu #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT int iwctl_siwauth(struct net_device *dev, @@ -1598,7 +1590,8 @@ int iwctl_siwauth(struct net_device *dev, pDevice->eEncryptionStatus = Ndis802_11Encryption3Enabled; }else if(pairwise == IW_AUTH_CIPHER_TKIP){ pDevice->eEncryptionStatus = Ndis802_11Encryption2Enabled; - }else if(pairwise == IW_AUTH_CIPHER_WEP40||pairwise == IW_AUTH_CIPHER_WEP104){ + } else if (pairwise == IW_AUTH_CIPHER_WEP40 || + pairwise == IW_AUTH_CIPHER_WEP104) { pDevice->eEncryptionStatus = Ndis802_11Encryption1Enabled; }else if(pairwise == IW_AUTH_CIPHER_NONE){ //do nothing,einsn liu @@ -1726,7 +1719,7 @@ int iwctl_siwgenie(struct net_device *dev, } out://not completely ...not necessary in wpa_supplicant 0.5.8 - return 0; + return ret; } int iwctl_giwgenie(struct net_device *dev, @@ -1933,9 +1926,6 @@ int iwctl_siwmlme(struct net_device *dev, } #endif -//End Add --//2008-0409-07, <Add> by Einsn Liu - - /*------------------------------------------------------------------*/ /* diff --git a/drivers/staging/vt6656/iwctl.h b/drivers/staging/vt6656/iwctl.h index d601e92..cc48954 100644 --- a/drivers/staging/vt6656/iwctl.h +++ b/drivers/staging/vt6656/iwctl.h @@ -178,7 +178,6 @@ int iwctl_siwscan(struct net_device *dev, struct iw_param *wrq, char *extra); -//2008-0409-07, <Add> by Einsn Liu #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT int iwctl_siwauth(struct net_device *dev, struct iw_request_info *info, @@ -215,8 +214,6 @@ int iwctl_siwmlme(struct net_device *dev, struct iw_point *wrq, char *extra); #endif // #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT -//End Add -- //2008-0409-07, <Add> by Einsn Liu - extern const struct iw_handler_def iwctl_handler_def; extern const struct iw_priv_args iwctl_private_args; diff --git a/drivers/staging/vt6656/key.c b/drivers/staging/vt6656/key.c index d181a2f..27bb523 100644 --- a/drivers/staging/vt6656/key.c +++ b/drivers/staging/vt6656/key.c @@ -559,7 +559,7 @@ BOOL KeybGetTransmitKey(PSKeyManagement pTable, PBYTE pbyBSSID, DWORD dwKeyType, int i, ii; *pKey = NULL; - for (i=0;i<MAX_KEY_TABLE;i++) { + for (i = 0; i < MAX_KEY_TABLE; i++) { if ((pTable->KeyTable[i].bInUse == TRUE) && !compare_ether_addr(pTable->KeyTable[i].abyBSSID, pbyBSSID)) { diff --git a/drivers/staging/vt6656/mac.c b/drivers/staging/vt6656/mac.c index 33698ed..26c19d1 100644 --- a/drivers/staging/vt6656/mac.c +++ b/drivers/staging/vt6656/mac.c @@ -471,10 +471,10 @@ BYTE pbyData[2]; pbyData[1] = (BYTE) (wInterval >> 8); CONTROLnsRequestOut(pDevice, - MESSAGE_TYPE_WRITE, - MAC_REG_BI, - MESSAGE_REQUEST_MACREG, - 2, - pbyData - ); + MESSAGE_TYPE_WRITE, + MAC_REG_BI, + MESSAGE_REQUEST_MACREG, + 2, + pbyData + ); } diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c index c528ef0..e992d5d 100644 --- a/drivers/staging/vt6656/main_usb.c +++ b/drivers/staging/vt6656/main_usb.c @@ -282,7 +282,6 @@ static int Config_FileGetParameter(unsigned char *string, unsigned char *dest, unsigned char *source); -//2008-0714<Add>by Mike Liu static BOOL device_release_WPADEV(PSDevice pDevice); static void usb_device_reset(PSDevice pDevice); @@ -771,10 +770,9 @@ vt6656_probe(struct usb_interface *intf, const struct usb_device_id *id) udev = usb_get_dev(udev); netdev = alloc_etherdev(sizeof(DEVICE_INFO)); - if (!netdev) { printk(KERN_ERR DEVICE_NAME ": allocate net device failed\n"); - kfree(pDevice); + rc = -ENOMEM; goto err_nomem; } @@ -800,9 +798,7 @@ vt6656_probe(struct usb_interface *intf, const struct usb_device_id *id) rc = register_netdev(netdev); if (rc) { printk(KERN_ERR DEVICE_NAME " Failed to register netdev\n"); - free_netdev(netdev); - kfree(pDevice); - return -ENODEV; + goto err_netdev; } usb_device_reset(pDevice); @@ -820,10 +816,12 @@ vt6656_probe(struct usb_interface *intf, const struct usb_device_id *id) return 0; +err_netdev: + free_netdev(netdev); err_nomem: usb_put_dev(udev); - return -ENOMEM; + return rc; } static void device_free_tx_bufs(PSDevice pDevice) @@ -869,7 +867,6 @@ static void device_free_rx_bufs(PSDevice pDevice) return; } -//2007-1107-02<Add>by MikeLiu static void usb_device_reset(PSDevice pDevice) { int status; @@ -1091,8 +1088,8 @@ static int device_open(struct net_device *dev) { memcpy(pDevice->dev->dev_addr, pDevice->abyCurrentNetAddr, ETH_ALEN); pDevice->bStopTx0Pkt = FALSE; pDevice->bStopDataPkt = FALSE; - pDevice->bRoaming = FALSE; //DavidWang - pDevice->bIsRoaming = FALSE;//DavidWang + pDevice->bRoaming = FALSE; + pDevice->bIsRoaming = FALSE; pDevice->bEnableRoaming = FALSE; if (pDevice->bDiversityRegCtlON) { device_init_diversity_timer(pDevice); @@ -1195,14 +1192,11 @@ static int device_close(struct net_device *dev) { wireless_send_event(pDevice->dev, IWEVCUSTOM, &wrqu, NULL); } -//2007-1121-02<Add>by EinsnLiu if (pDevice->bLinkPass) { bScheduleCommand((void *) pDevice, WLAN_CMD_DISASSOCIATE, NULL); mdelay(30); } -//End Add -//2008-0714-01<Add>by MikeLiu device_release_WPADEV(pDevice); memset(pMgmt->abyDesireSSID, 0, WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1); @@ -1236,8 +1230,8 @@ device_release_WPADEV(pDevice); tasklet_kill(&pDevice->ReadWorkItem); tasklet_kill(&pDevice->EventWorkItem); - pDevice->bRoaming = FALSE; //DavidWang - pDevice->bIsRoaming = FALSE;//DavidWang + pDevice->bRoaming = FALSE; + pDevice->bIsRoaming = FALSE; pDevice->bEnableRoaming = FALSE; pDevice->bCmdRunning = FALSE; pDevice->bLinkPass = FALSE; @@ -1914,11 +1908,9 @@ static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { */ break; - -//2008-0409-07, <Add> by Einsn Liu #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT case SIOCSIWAUTH: - DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWAUTH \n"); + DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWAUTH\n"); rc = iwctl_siwauth(dev, NULL, &(wrq->u.param), NULL); break; @@ -1970,7 +1962,6 @@ static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { break; #endif // #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT -//End Add -- //2008-0409-07, <Add> by Einsn Liu case IOCTL_CMD_TEST: diff --git a/drivers/staging/vt6656/power.c b/drivers/staging/vt6656/power.c index 4d7d4e0..0c12fd3 100644 --- a/drivers/staging/vt6656/power.c +++ b/drivers/staging/vt6656/power.c @@ -77,12 +77,12 @@ void PSvEnablePowerSaving(void *hDeviceContext, PSMgmtObject pMgmt = &(pDevice->sMgmtObj); WORD wAID = pMgmt->wCurrAID | BIT14 | BIT15; - // set period of power up before TBTT + /* set period of power up before TBTT */ MACvWriteWord(pDevice, MAC_REG_PWBT, C_PWBT); if (pDevice->eOPMode != OP_MODE_ADHOC) { - // set AID - MACvWriteWord(pDevice, MAC_REG_AIDATIM, wAID); + /* set AID */ + MACvWriteWord(pDevice, MAC_REG_AIDATIM, wAID); } else { // set ATIM Window //MACvWriteATIMW(pDevice->PortOffset, pMgmt->wCurrATIMWindow); diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c index deca213..bbdc127 100644 --- a/drivers/staging/vt6656/rxtx.c +++ b/drivers/staging/vt6656/rxtx.c @@ -841,8 +841,8 @@ s_uFillDataHead ( } if (byPktType == PK_TYPE_11GB || byPktType == PK_TYPE_11GA) { - if((uDMAIdx==TYPE_ATIMDMA)||(uDMAIdx==TYPE_BEACONDMA)) { - PSTxDataHead_ab pBuf = (PSTxDataHead_ab)pTxDataHead; + if ((uDMAIdx == TYPE_ATIMDMA) || (uDMAIdx == TYPE_BEACONDMA)) { + PSTxDataHead_ab pBuf = (PSTxDataHead_ab) pTxDataHead; //Get SignalField,ServiceField,Length BBvCaculateParameter(pDevice, cbFrameLength, wCurrentRate, byPktType, (PWORD)&(pBuf->wTransmitLength), (PBYTE)&(pBuf->byServiceField), (PBYTE)&(pBuf->bySignalField) @@ -1701,10 +1701,11 @@ s_bPacketToWirelessUsb( // 802.1H if (ntohs(psEthHeader->wType) > ETH_DATA_LEN) { - if (pDevice->dwDiagRefCount == 0) { - if ( (psEthHeader->wType == TYPE_PKT_IPX) || - (psEthHeader->wType == cpu_to_le16(0xF380))) { - memcpy((PBYTE) (pbyPayloadHead), &abySNAP_Bridgetunnel[0], 6); + if (pDevice->dwDiagRefCount == 0) { + if ((psEthHeader->wType == cpu_to_le16(ETH_P_IPX)) || + (psEthHeader->wType == cpu_to_le16(0xF380))) { + memcpy((PBYTE) (pbyPayloadHead), + abySNAP_Bridgetunnel, 6); } else { memcpy((PBYTE) (pbyPayloadHead), &abySNAP_RFC1042[0], 6); } @@ -2840,9 +2841,10 @@ int nsDMA_tx_packet(PSDevice pDevice, unsigned int uDMAIdx, struct sk_buff *skb) Packet_Type = skb->data[ETH_HLEN+1]; Descriptor_type = skb->data[ETH_HLEN+1+1+2]; Key_info = (skb->data[ETH_HLEN+1+1+2+1] << 8)|(skb->data[ETH_HLEN+1+1+2+2]); - if (pDevice->sTxEthHeader.wType == TYPE_PKT_802_1x) { - if(((Protocol_Version==1) ||(Protocol_Version==2)) && - (Packet_Type==3)) { //802.1x OR eapol-key challenge frame transfer + if (pDevice->sTxEthHeader.wType == cpu_to_le16(ETH_P_PAE)) { + /* 802.1x OR eapol-key challenge frame transfer */ + if (((Protocol_Version == 1) || (Protocol_Version == 2)) && + (Packet_Type == 3)) { bTxeapol_key = TRUE; if(!(Key_info & BIT3) && //WPA or RSN group-key challenge (Key_info & BIT8) && (Key_info & BIT9)) { //send 2/2 key @@ -2988,7 +2990,7 @@ int nsDMA_tx_packet(PSDevice pDevice, unsigned int uDMAIdx, struct sk_buff *skb) } } - if (pDevice->sTxEthHeader.wType == TYPE_PKT_802_1x) { + if (pDevice->sTxEthHeader.wType == cpu_to_le16(ETH_P_PAE)) { if (pDevice->byBBType != BB_TYPE_11A) { pDevice->wCurrentRate = RATE_1M; pDevice->byACKRate = RATE_1M; @@ -3016,8 +3018,8 @@ int nsDMA_tx_packet(PSDevice pDevice, unsigned int uDMAIdx, struct sk_buff *skb) if (bNeedEncryption == TRUE) { DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"ntohs Pkt Type=%04x\n", ntohs(pDevice->sTxEthHeader.wType)); - if ((pDevice->sTxEthHeader.wType) == TYPE_PKT_802_1x) { - bNeedEncryption = FALSE; + if ((pDevice->sTxEthHeader.wType) == cpu_to_le16(ETH_P_PAE)) { + bNeedEncryption = FALSE; DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Pkt Type=%04x\n", (pDevice->sTxEthHeader.wType)); if ((pMgmt->eCurrMode == WMAC_MODE_ESS_STA) && (pMgmt->eCurrState == WMAC_STATE_ASSOC)) { if (pTransmitKey == NULL) { diff --git a/drivers/staging/vt6656/tether.h b/drivers/staging/vt6656/tether.h index be87020..4ec0523 100644 --- a/drivers/staging/vt6656/tether.h +++ b/drivers/staging/vt6656/tether.h @@ -42,22 +42,8 @@ #ifdef __BIG_ENDIAN -#define TYPE_PKT_IP 0x0800 // -#define TYPE_PKT_ARP 0x0806 // -#define TYPE_PKT_RARP 0x8035 // -#define TYPE_PKT_IPX 0x8137 // -#define TYPE_PKT_802_1x 0x888e -#define TYPE_PKT_PreAuth 0x88C7 - -#define TYPE_PKT_PING_M_REQ 0x8011 // master reguest -#define TYPE_PKT_PING_S_GNT 0x8022 // slave grant -#define TYPE_PKT_PING_M 0x8077 // pingpong master packet -#define TYPE_PKT_PING_S 0x8088 // pingpong slave packet -#define TYPE_PKT_WOL_M_REQ 0x8033 // WOL waker request -#define TYPE_PKT_WOL_S_GNT 0x8044 // WOL sleeper grant #define TYPE_MGMT_PROBE_RSP 0x5000 -#define TYPE_PKT_VNT_DIAG 0x8011 // Diag Pkt -#define TYPE_PKT_VNT_PER 0x8888 // Diag PER Pkt + // // wFrameCtl field in the S802_11Header // @@ -94,23 +80,9 @@ // // NOTE.... // in network byte order, high byte is going first -#define TYPE_PKT_IP 0x0008 // -#define TYPE_PKT_ARP 0x0608 // -#define TYPE_PKT_RARP 0x3580 // -#define TYPE_PKT_IPX 0x3781 // - -#define TYPE_PKT_802_1x 0x8e88 -#define TYPE_PKT_PreAuth 0xC788 - -#define TYPE_PKT_PING_M_REQ 0x1180 // master reguest -#define TYPE_PKT_PING_S_GNT 0x2280 // slave grant -#define TYPE_PKT_PING_M 0x7780 // pingpong master packet -#define TYPE_PKT_PING_S 0x8880 // pingpong slave packet -#define TYPE_PKT_WOL_M_REQ 0x3380 // WOL waker request -#define TYPE_PKT_WOL_S_GNT 0x4480 // WOL sleeper grant + #define TYPE_MGMT_PROBE_RSP 0x0050 -#define TYPE_PKT_VNT_DIAG 0x1180 // Diag Pkt -#define TYPE_PKT_VNT_PER 0x8888 // Diag PER Pkt + // // wFrameCtl field in the S802_11Header // diff --git a/drivers/staging/vt6656/usbpipe.c b/drivers/staging/vt6656/usbpipe.c index a32785c..c612ab5 100644 --- a/drivers/staging/vt6656/usbpipe.c +++ b/drivers/staging/vt6656/usbpipe.c @@ -118,13 +118,11 @@ int PIPEnsControlOutAsyn( { int ntStatus; - if (MP_TEST_FLAG(pDevice, fMP_DISCONNECTED)) + if (pDevice->Flags & fMP_DISCONNECTED) return STATUS_FAILURE; - - if (MP_TEST_FLAG(pDevice, fMP_CONTROL_WRITES)) { + if (pDevice->Flags & fMP_CONTROL_WRITES) return STATUS_FAILURE; - } if (in_interrupt()) { DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"in_interrupt return ..byRequest %x\n", byRequest); @@ -164,12 +162,11 @@ int PIPEnsControlOut( int ntStatus = 0; int ii; - if (MP_TEST_FLAG(pDevice, fMP_DISCONNECTED)) + if (pDevice->Flags & fMP_DISCONNECTED) return STATUS_FAILURE; - if (MP_TEST_FLAG(pDevice, fMP_CONTROL_WRITES)) { + if (pDevice->Flags & fMP_CONTROL_WRITES) return STATUS_FAILURE; - } pDevice->sUsbCtlRequest.bRequestType = 0x40; pDevice->sUsbCtlRequest.bRequest = byRequest; @@ -193,12 +190,15 @@ int PIPEnsControlOut( } spin_unlock_irq(&pDevice->lock); for (ii = 0; ii <= USB_CTL_WAIT; ii ++) { - if (MP_TEST_FLAG(pDevice, fMP_CONTROL_WRITES)) - mdelay(1); + + if (pDevice->Flags & fMP_CONTROL_WRITES) + mdelay(1); else - break; + break; + if (ii >= USB_CTL_WAIT) { - DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"control send request submission timeout \n"); + DBG_PRT(MSG_LEVEL_DEBUG, + KERN_INFO "control send request submission timeout\n"); spin_lock_irq(&pDevice->lock); MP_CLEAR_FLAG(pDevice, fMP_CONTROL_WRITES); return STATUS_FAILURE; @@ -221,12 +221,12 @@ int PIPEnsControlIn( int ntStatus = 0; int ii; - if (MP_TEST_FLAG(pDevice, fMP_DISCONNECTED)) + if (pDevice->Flags & fMP_DISCONNECTED) return STATUS_FAILURE; - if (MP_TEST_FLAG(pDevice, fMP_CONTROL_READS)) { - return STATUS_FAILURE; - } + if (pDevice->Flags & fMP_CONTROL_READS) + return STATUS_FAILURE; + pDevice->sUsbCtlRequest.bRequestType = 0xC0; pDevice->sUsbCtlRequest.bRequest = byRequest; pDevice->sUsbCtlRequest.wValue = cpu_to_le16p(&wValue); @@ -247,13 +247,15 @@ int PIPEnsControlIn( spin_unlock_irq(&pDevice->lock); for (ii = 0; ii <= USB_CTL_WAIT; ii ++) { - if (MP_TEST_FLAG(pDevice, fMP_CONTROL_READS)) - mdelay(1); - else { - break; - } - if (ii >= USB_CTL_WAIT) { - DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"control rcv request submission timeout \n"); + + if (pDevice->Flags & fMP_CONTROL_READS) + mdelay(1); + else + break; + + if (ii >= USB_CTL_WAIT) { + DBG_PRT(MSG_LEVEL_DEBUG, + KERN_INFO "control rcv request submission timeout\n"); spin_lock_irq(&pDevice->lock); MP_CLEAR_FLAG(pDevice, fMP_CONTROL_READS); return STATUS_FAILURE; @@ -492,7 +494,7 @@ int PIPEnsBulkInUsbRead(PSDevice pDevice, PRCB pRCB) DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"---->s_nsStartBulkInUsbRead\n"); - if (MP_TEST_FLAG(pDevice, fMP_DISCONNECTED)) + if (pDevice->Flags & fMP_DISCONNECTED) return STATUS_FAILURE; pDevice->ulBulkInPosted++; @@ -618,7 +620,7 @@ s_nsBulkInUsbIoCompleteRead( * Return Value: STATUS_INSUFFICIENT_RESOURCES or result of IoCallDriver * */ -NDIS_STATUS +int PIPEnsSendBulkOut( PSDevice pDevice, PUSB_SEND_CONTEXT pContext @@ -643,7 +645,7 @@ PIPEnsSendBulkOut( DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"s_nsSendBulkOut\n"); - if(MP_IS_READY(pDevice) && MP_TEST_FLAG(pDevice, fMP_POST_WRITES)) { + if (MP_IS_READY(pDevice) && (pDevice->Flags & fMP_POST_WRITES)) { pUrb = pContext->pUrb; pDevice->ulBulkOutPosted++; diff --git a/drivers/staging/vt6656/wcmd.c b/drivers/staging/vt6656/wcmd.c index 686747a..b83b660 100644 --- a/drivers/staging/vt6656/wcmd.c +++ b/drivers/staging/vt6656/wcmd.c @@ -500,7 +500,7 @@ void vRunCommand(void *hDeviceContext) DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Scanning, set back to channel: [%d]\n", pMgmt->uCurrChannel); pMgmt->eScanState = WMAC_NO_SCANNING; pDevice->bStopDataPkt = FALSE; -//2008-0409-07, <Add> by Einsn Liu + #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT if(pMgmt->eScanType == WMAC_SCAN_PASSIVE) { @@ -876,7 +876,7 @@ void vRunCommand(void *hDeviceContext) // CARDbRadioPowerOn(pDevice); // else // CARDbRadioPowerOff(pDevice); - //2008-09-09<Add> BY Mike:Hot Key for Radio On/Off + { int ntStatus = STATUS_SUCCESS; BYTE byTmp; 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) || diff --git a/drivers/staging/vt6656/wmgr.h b/drivers/staging/vt6656/wmgr.h index 683840c..594f3a8 100644 --- a/drivers/staging/vt6656/wmgr.h +++ b/drivers/staging/vt6656/wmgr.h @@ -355,7 +355,7 @@ typedef struct tagSMgmtObject // link list of known bss's (scan results) KnownBSS sBSSList[MAX_BSS_NUM]; - //link list of same bss's //DavidWang + /* link list of same bss's */ KnownBSS pSameBSS[6] ; BOOL Cisco_cckm ; BYTE Roam_dbm; diff --git a/drivers/staging/vt6656/wpa.c b/drivers/staging/vt6656/wpa.c index f492778..7dde3d6 100644 --- a/drivers/staging/vt6656/wpa.c +++ b/drivers/staging/vt6656/wpa.c @@ -69,7 +69,7 @@ const BYTE abyOUI05[4] = { 0x00, 0x50, 0xf2, 0x05 }; -*/ void -WPA_ClearRSN ( +WPA_ClearRSN( PKnownBSS pBSSList ) { @@ -105,7 +105,7 @@ WPA_ClearRSN ( * -*/ void -WPA_ParseRSN ( +WPA_ParseRSN( PKnownBSS pBSSList, PWLAN_IE_RSN_EXT pRSN ) @@ -240,7 +240,7 @@ WPA_ParseRSN ( * -*/ BOOL -WPA_SearchRSN ( +WPA_SearchRSN( BYTE byCmd, BYTE byEncrypt, PKnownBSS pBSSList @@ -300,7 +300,7 @@ WPA_SearchRSN ( * -*/ BOOL -WPAb_Is_RSN ( +WPAb_Is_RSN( PWLAN_IE_RSN_EXT pRSN ) { diff --git a/drivers/staging/vt6656/wpactl.c b/drivers/staging/vt6656/wpactl.c index b407ae5..7fd300f 100644 --- a/drivers/staging/vt6656/wpactl.c +++ b/drivers/staging/vt6656/wpactl.c @@ -515,7 +515,6 @@ static int wpa_set_scan(PSDevice pDevice, { int ret = 0; -//2007-0919-01<Add>by MikeLiu /**set ap_scan=1&&scan_ssid=1 under hidden ssid mode**/ PSMgmtObject pMgmt = &(pDevice->sMgmtObj); PWLAN_IE_SSID pItemSSID; @@ -695,7 +694,7 @@ static int wpa_get_scan(PSDevice pDevice, scan_buf->ssid_len = pItemSSID->len; scan_buf->freq = frequency_list[pBSS->uChannel-1]; scan_buf->caps = pBSS->wCapInfo; //DavidWang for sharemode -//20080717-05,<Add> by James Li + RFvRSSITodBm(pDevice, (BYTE)(pBSS->uRSSI), &ldBm); if(-ldBm<50){ scan_buf->qual = 100; @@ -710,7 +709,7 @@ static int wpa_get_scan(PSDevice pDevice, //scan_buf->qual = scan_buf->noise = 0; scan_buf->level = ldBm; - //20080717-05,<Add> by James Li--End + //scan_buf->maxrate = if (pBSS->wWPALen != 0) { scan_buf->wpa_ie_len = pBSS->wWPALen; @@ -873,7 +872,6 @@ static int wpa_set_associate(PSDevice pDevice, pMgmt->eCurrState = WMAC_STATE_IDLE; netif_stop_queue(pDevice->dev); -//20080701-02,<Add> by Mike Liu /*******search if ap_scan=2 ,which is associating request in hidden ssid mode ****/ { PKnownBSS pCurr = NULL; |
