hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

staging: vt6656: removed not useful comments 

Removed comments about who changed/added lines, they do not seem useful.

Signed-off-by: Andres More <more.andres@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Andres More 2010-08-03 20:25:50 -03:00 committed by Greg Kroah-Hartman
parent 13b631a599
commit 465711b39d
13 changed files with 33 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/staging/vt6656/80211mgr.h
View File

@ -66,9 +66,9 @@
#define WLAN_EID_RSN_WPA 221 #define WLAN_EID_RSN_WPA 221
#ifdef Cisco_ccx #ifdef Cisco_ccx
#define WLAN_EID_CCX 133 //DavidWang #define WLAN_EID_CCX 133
#define WLAN_EID_CCX_IP 149 //DavidWang #define WLAN_EID_CCX_IP 149
#define WLAN_EID_CCX_Ver 221 //DavidWang #define WLAN_EID_CCX_Ver 221
#endif #endif
#define WLAN_EID_ERP_NONERP_PRESENT 0x01 #define WLAN_EID_ERP_NONERP_PRESENT 0x01
@ -348,7 +348,7 @@ typedef struct tagWLAN_IE_RSN {
BYTE abyRSN[WLAN_MIN_ARRAY]; BYTE abyRSN[WLAN_MIN_ARRAY];
} WLAN_IE_RSN, *PWLAN_IE_RSN; } WLAN_IE_RSN, *PWLAN_IE_RSN;
//DavidWang
// CCX Identity DavidWang // CCX Identity DavidWang
#pragma pack(1) #pragma pack(1)
typedef struct tagWLAN_IE_CCX { typedef struct tagWLAN_IE_CCX {
@ -371,7 +371,7 @@ BYTE len;
BYTE abyCCXVer[5]; BYTE abyCCXVer[5];
} WLAN_IE_CCX_Ver, *PWLAN_IE_CCX_Ver; } WLAN_IE_CCX_Ver, *PWLAN_IE_CCX_Ver;
//DavidWang
// ERP // ERP
#pragma pack(1) #pragma pack(1)

2
drivers/staging/vt6656/baseband.c
View File

@ -1010,11 +1010,9 @@ BOOL BBbVT3184Init(PSDevice pDevice)
} }
//20080215-01,<Add> by Mike Liu
// if ((pDevice->abyEEPROM[EEP_OFS_RADIOCTL]&0x06)==0x04) // if ((pDevice->abyEEPROM[EEP_OFS_RADIOCTL]&0x06)==0x04)
// return FALSE; // return FALSE;
//20080804-01,<Add> by Mike Liu
//zonetype initial //zonetype initial
pDevice->byOriginalZonetype = pDevice->abyEEPROM[EEP_OFS_ZONETYPE]; pDevice->byOriginalZonetype = pDevice->abyEEPROM[EEP_OFS_ZONETYPE];
if(pDevice->config_file.ZoneType >= 0) { //read zonetype file ok! if(pDevice->config_file.ZoneType >= 0) { //read zonetype file ok!

14
drivers/staging/vt6656/bssdb.c
View File

@ -148,7 +148,6 @@ PKnownBSS BSSpSearchBSSList(void *hDeviceContext,
for (ii = 0; ii <MAX_BSS_NUM; ii++) { for (ii = 0; ii <MAX_BSS_NUM; ii++) {
pCurrBSS = &(pMgmt->sBSSList[ii]); pCurrBSS = &(pMgmt->sBSSList[ii]);
//2008-0718-01<Add>by MikeLiu
pCurrBSS->bSelected = FALSE; pCurrBSS->bSelected = FALSE;
if ((pCurrBSS->bActive) && if ((pCurrBSS->bActive) &&
@ -188,7 +187,6 @@ PKnownBSS BSSpSearchBSSList(void *hDeviceContext,
// if ((pCurrBSS->bActive) && // if ((pCurrBSS->bActive) &&
// (pCurrBSS->bSelected == FALSE)) { // (pCurrBSS->bSelected == FALSE)) {
//2007-0721-01<Add>by MikeLiu
pCurrBSS->bSelected = FALSE; pCurrBSS->bSelected = FALSE;
if (pCurrBSS->bActive) { if (pCurrBSS->bActive) {
@ -238,12 +236,12 @@ PKnownBSS BSSpSearchBSSList(void *hDeviceContext,
} }
} }
*/ */
//DavidWang
pMgmt->pSameBSS[jj].uChannel = pCurrBSS->uChannel; 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)); 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++; jj++;
//DavidWang
if (pSelect == NULL) { if (pSelect == NULL) {
pSelect = pCurrBSS; pSelect = pCurrBSS;
} else { } else {
@ -254,9 +252,9 @@ PKnownBSS BSSpSearchBSSList(void *hDeviceContext,
} }
} }
} }
//DavidWang
pDevice->bSameBSSMaxNum = jj; pDevice->bSameBSSMaxNum = jj;
//DavidWang
if (pSelect != NULL) { if (pSelect != NULL) {
pSelect->bSelected = TRUE; pSelect->bSelected = TRUE;
if (pDevice->bRoaming == FALSE) { if (pDevice->bRoaming == FALSE) {
@ -956,7 +954,7 @@ void BSSvSecondCallBack(void *hDeviceContext)
unsigned int uSleepySTACnt = 0; unsigned int uSleepySTACnt = 0;
unsigned int uNonShortSlotSTACnt = 0; unsigned int uNonShortSlotSTACnt = 0;
unsigned int uLongPreambleSTACnt = 0; unsigned int uLongPreambleSTACnt = 0;
viawget_wpa_header *wpahdr; //DavidWang viawget_wpa_header *wpahdr;
spin_lock_irq(&pDevice->lock); spin_lock_irq(&pDevice->lock);
@ -1180,7 +1178,7 @@ if((pMgmt->eCurrState!=WMAC_STATE_ASSOC) &&
pDevice->bIsRoaming = FALSE; pDevice->bIsRoaming = FALSE;
DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Lost AP beacon [%d] sec, disconnected !\n", pMgmt->sNodeDBTable[0].uInActiveCount); 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)) { if ((pDevice->bWPADEVUp) && (pDevice->skb != NULL)) {
wpahdr = (viawget_wpa_header *)pDevice->skb->data; wpahdr = (viawget_wpa_header *)pDevice->skb->data;
wpahdr->type = VIAWGET_DISASSOC_MSG; wpahdr->type = VIAWGET_DISASSOC_MSG;

11
drivers/staging/vt6656/device.h
View File

@ -713,11 +713,11 @@ typedef struct __device_info {
BOOL bCmdClear; BOOL bCmdClear;
BOOL bNeedRadioOFF; BOOL bNeedRadioOFF;
BOOL bEnableRoaming; //DavidWang BOOL bEnableRoaming;
BOOL bIsRoaming; //DavidWang BOOL bIsRoaming;
BOOL bFastRoaming; //DavidWang BOOL bFastRoaming;
BYTE bSameBSSMaxNum; //Davidwang BYTE bSameBSSMaxNum;
BYTE bSameBSSCurNum; //DavidWang BYTE bSameBSSCurNum;
BOOL bRoaming; BOOL bRoaming;
BOOL b11hEable; BOOL b11hEable;
unsigned long ulTxPower; unsigned long ulTxPower;
@ -726,7 +726,6 @@ typedef struct __device_info {
NDIS_802_11_WEP_STATUS eEncryptionStatus; NDIS_802_11_WEP_STATUS eEncryptionStatus;
BOOL bTransmitKey; BOOL bTransmitKey;
//2007-0925-01<Add>by MikeLiu
//mike add :save old Encryption //mike add :save old Encryption
NDIS_802_11_WEP_STATUS eOldEncryptionStatus; NDIS_802_11_WEP_STATUS eOldEncryptionStatus;

1
drivers/staging/vt6656/dpc.c
View File

@ -865,7 +865,6 @@ RXbBulkInProcessData (
pDevice->dev->name); pDevice->dev->name);
} }
} }
//2008-0409-07, <Add> by Einsn Liu
#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
//send event to wpa_supplicant //send event to wpa_supplicant
//if(pDevice->bWPASuppWextEnabled == TRUE) //if(pDevice->bWPASuppWextEnabled == TRUE)

2
drivers/staging/vt6656/ioctl.c
View File

@ -670,7 +670,7 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) {
pMgmt->Cisco_cckm =1; pMgmt->Cisco_cckm =1;
else else
pMgmt->Cisco_cckm =0; pMgmt->Cisco_cckm =0;
//DavidWang
if(wpa_Result.authenticated==TRUE) { if(wpa_Result.authenticated==TRUE) {
{ {

15
drivers/staging/vt6656/iwctl.c
View File

@ -49,7 +49,6 @@
/*--------------------- Static Definitions -------------------------*/ /*--------------------- Static Definitions -------------------------*/
//2008-0409-07, <Add> by Einsn Liu
#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
#define SUPPORTED_WIRELESS_EXT 18 #define SUPPORTED_WIRELESS_EXT 18
#else #else
@ -155,7 +154,6 @@ int iwctl_siwscan(struct net_device *dev,
BYTE abyScanSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1]; BYTE abyScanSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1];
PWLAN_IE_SSID pItemSSID=NULL; PWLAN_IE_SSID pItemSSID=NULL;
//2008-0920-01<Add>by MikeLiu
if (!(pDevice->flags & DEVICE_FLAGS_OPENED)) if (!(pDevice->flags & DEVICE_FLAGS_OPENED))
return -EINVAL; return -EINVAL;
@ -285,7 +283,6 @@ int iwctl_giwscan(struct net_device *dev,
iwe.u.freq.e = 0; iwe.u.freq.e = 0;
iwe.u.freq.i = 0; iwe.u.freq.i = 0;
current_ev = iwe_stream_add_event(info,current_ev,end_buf, &iwe, IW_EV_FREQ_LEN); 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; int f = (int)pBSS->uChannel - 1;
if(f < 0)f = 0; if(f < 0)f = 0;
@ -299,7 +296,7 @@ int iwctl_giwscan(struct net_device *dev,
RFvRSSITodBm(pDevice, (BYTE)(pBSS->uRSSI), &ldBm); RFvRSSITodBm(pDevice, (BYTE)(pBSS->uRSSI), &ldBm);
iwe.u.qual.level = ldBm; iwe.u.qual.level = ldBm;
iwe.u.qual.noise = 0; iwe.u.qual.noise = 0;
//2008-0409-01, <Add> by Einsn Liu
if(-ldBm<50){ if(-ldBm<50){
iwe.u.qual.qual = 100; iwe.u.qual.qual = 100;
}else if(-ldBm > 90) { }else if(-ldBm > 90) {
@ -803,7 +800,6 @@ int iwctl_siwessid(struct net_device *dev,
PSMgmtObject pMgmt = &(pDevice->sMgmtObj); PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
PWLAN_IE_SSID pItemSSID; PWLAN_IE_SSID pItemSSID;
//2008-0920-01<Add>by MikeLiu
if (!(pDevice->flags & DEVICE_FLAGS_OPENED)) if (!(pDevice->flags & DEVICE_FLAGS_OPENED))
return -EINVAL; return -EINVAL;
@ -931,11 +927,10 @@ int iwctl_giwessid(struct net_device *dev,
//pItemSSID = (PWLAN_IE_SSID)pMgmt->abyDesireSSID; //pItemSSID = (PWLAN_IE_SSID)pMgmt->abyDesireSSID;
memcpy(extra, pItemSSID->abySSID , pItemSSID->len); memcpy(extra, pItemSSID->abySSID , pItemSSID->len);
extra[pItemSSID->len] = '\0'; extra[pItemSSID->len] = '\0';
//2008-0409-03, <Add> by Einsn Liu
wrq->length = pItemSSID->len; wrq->length = pItemSSID->len;
wrq->flags = 1; // active wrq->flags = 1; // active
return 0; 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, int iwctl_giwencode(struct net_device *dev,
struct iw_request_info *info, struct iw_request_info *info,
struct iw_point *wrq, struct iw_point *wrq,
@ -1561,7 +1554,6 @@ int iwctl_giwsens(struct net_device *dev,
return 0; return 0;
} }
//2008-0409-07, <Add> by Einsn Liu
#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
int iwctl_siwauth(struct net_device *dev, int iwctl_siwauth(struct net_device *dev,
@ -1934,9 +1926,6 @@ int iwctl_siwmlme(struct net_device *dev,
} }
#endif #endif
//End Add --//2008-0409-07, <Add> by Einsn Liu
/*------------------------------------------------------------------*/ /*------------------------------------------------------------------*/
/* /*

3
drivers/staging/vt6656/iwctl.h
View File

@ -178,7 +178,6 @@ int iwctl_siwscan(struct net_device *dev,
struct iw_param *wrq, struct iw_param *wrq,
char *extra); char *extra);
//2008-0409-07, <Add> by Einsn Liu
#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
int iwctl_siwauth(struct net_device *dev, int iwctl_siwauth(struct net_device *dev,
struct iw_request_info *info, struct iw_request_info *info,
@ -215,8 +214,6 @@ int iwctl_siwmlme(struct net_device *dev,
struct iw_point *wrq, struct iw_point *wrq,
char *extra); char *extra);
#endif // #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT #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_handler_def iwctl_handler_def;
extern const struct iw_priv_args iwctl_private_args; extern const struct iw_priv_args iwctl_private_args;

18
drivers/staging/vt6656/main_usb.c
View File

@ -282,7 +282,6 @@ static int Config_FileGetParameter(unsigned char *string,
unsigned char *dest, unsigned char *dest,
unsigned char *source); unsigned char *source);
//2008-0714<Add>by Mike Liu
static BOOL device_release_WPADEV(PSDevice pDevice); static BOOL device_release_WPADEV(PSDevice pDevice);
static void usb_device_reset(PSDevice pDevice); static void usb_device_reset(PSDevice pDevice);
@ -869,7 +868,6 @@ static void device_free_rx_bufs(PSDevice pDevice)
return; return;
} }
//2007-1107-02<Add>by MikeLiu
static void usb_device_reset(PSDevice pDevice) static void usb_device_reset(PSDevice pDevice)
{ {
int status; int status;
@ -1091,8 +1089,8 @@ static int device_open(struct net_device *dev) {
memcpy(pDevice->dev->dev_addr, pDevice->abyCurrentNetAddr, ETH_ALEN); memcpy(pDevice->dev->dev_addr, pDevice->abyCurrentNetAddr, ETH_ALEN);
pDevice->bStopTx0Pkt = FALSE; pDevice->bStopTx0Pkt = FALSE;
pDevice->bStopDataPkt = FALSE; pDevice->bStopDataPkt = FALSE;
pDevice->bRoaming = FALSE; //DavidWang pDevice->bRoaming = FALSE;
pDevice->bIsRoaming = FALSE;//DavidWang pDevice->bIsRoaming = FALSE;
pDevice->bEnableRoaming = FALSE; pDevice->bEnableRoaming = FALSE;
if (pDevice->bDiversityRegCtlON) { if (pDevice->bDiversityRegCtlON) {
device_init_diversity_timer(pDevice); device_init_diversity_timer(pDevice);
@ -1195,14 +1193,11 @@ static int device_close(struct net_device *dev) {
wireless_send_event(pDevice->dev, IWEVCUSTOM, &wrqu, NULL); wireless_send_event(pDevice->dev, IWEVCUSTOM, &wrqu, NULL);
} }
//2007-1121-02<Add>by EinsnLiu
if (pDevice->bLinkPass) { if (pDevice->bLinkPass) {
bScheduleCommand((void *) pDevice, WLAN_CMD_DISASSOCIATE, NULL); bScheduleCommand((void *) pDevice, WLAN_CMD_DISASSOCIATE, NULL);
mdelay(30); mdelay(30);
} }
//End Add
//2008-0714-01<Add>by MikeLiu
device_release_WPADEV(pDevice); device_release_WPADEV(pDevice);
memset(pMgmt->abyDesireSSID, 0, WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1); memset(pMgmt->abyDesireSSID, 0, WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1);
@ -1236,8 +1231,8 @@ device_release_WPADEV(pDevice);
tasklet_kill(&pDevice->ReadWorkItem); tasklet_kill(&pDevice->ReadWorkItem);
tasklet_kill(&pDevice->EventWorkItem); tasklet_kill(&pDevice->EventWorkItem);
pDevice->bRoaming = FALSE; //DavidWang pDevice->bRoaming = FALSE;
pDevice->bIsRoaming = FALSE;//DavidWang pDevice->bIsRoaming = FALSE;
pDevice->bEnableRoaming = FALSE; pDevice->bEnableRoaming = FALSE;
pDevice->bCmdRunning = FALSE; pDevice->bCmdRunning = FALSE;
pDevice->bLinkPass = FALSE; pDevice->bLinkPass = FALSE;
@ -1914,11 +1909,9 @@ static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) {
*/ */
break; break;
//2008-0409-07, <Add> by Einsn Liu
#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
case SIOCSIWAUTH: 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); rc = iwctl_siwauth(dev, NULL, &(wrq->u.param), NULL);
break; break;
@ -1970,7 +1963,6 @@ static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) {
break; break;
#endif // #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT #endif // #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
//End Add -- //2008-0409-07, <Add> by Einsn Liu
case IOCTL_CMD_TEST: case IOCTL_CMD_TEST:

4
drivers/staging/vt6656/wcmd.c
View File

@ -500,7 +500,7 @@ void vRunCommand(void *hDeviceContext)
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Scanning, set back to channel: [%d]\n", pMgmt->uCurrChannel); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Scanning, set back to channel: [%d]\n", pMgmt->uCurrChannel);
pMgmt->eScanState = WMAC_NO_SCANNING; pMgmt->eScanState = WMAC_NO_SCANNING;
pDevice->bStopDataPkt = FALSE; pDevice->bStopDataPkt = FALSE;
//2008-0409-07, <Add> by Einsn Liu
#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
if(pMgmt->eScanType == WMAC_SCAN_PASSIVE) if(pMgmt->eScanType == WMAC_SCAN_PASSIVE)
{ {
@ -876,7 +876,7 @@ void vRunCommand(void *hDeviceContext)
// CARDbRadioPowerOn(pDevice); // CARDbRadioPowerOn(pDevice);
// else // else
// CARDbRadioPowerOff(pDevice); // CARDbRadioPowerOff(pDevice);
//2008-09-09<Add> BY Mike:Hot Key for Radio On/Off
{ {
int ntStatus = STATUS_SUCCESS; int ntStatus = STATUS_SUCCESS;
BYTE byTmp; BYTE byTmp;

11
drivers/staging/vt6656/wmgr.c
View File

@ -92,7 +92,7 @@ static int msglevel =MSG_LEVEL_INFO;
//static int msglevel =MSG_LEVEL_DEBUG; //static int msglevel =MSG_LEVEL_DEBUG;
/*--------------------- Static Functions --------------------------*/ /*--------------------- Static Functions --------------------------*/
//2008-0730-01<Add>by MikeLiu
static BOOL ChannelExceedZoneType( static BOOL ChannelExceedZoneType(
PSDevice pDevice, PSDevice pDevice,
BYTE byCurrChannel BYTE byCurrChannel
@ -997,7 +997,7 @@ s_vMgrRxAssocResponse(
netif_rx(pDevice->skb); netif_rx(pDevice->skb);
pDevice->skb = dev_alloc_skb((int)pDevice->rx_buf_sz); pDevice->skb = dev_alloc_skb((int)pDevice->rx_buf_sz);
} }
//2008-0409-07, <Add> by Einsn Liu
#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
//if(pDevice->bWPASuppWextEnabled == TRUE) //if(pDevice->bWPASuppWextEnabled == TRUE)
{ {
@ -1038,7 +1038,7 @@ s_vMgrRxAssocResponse(
} }
#endif //#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT #endif //#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
//End Add -- //2008-0409-07, <Add> by Einsn Liu
} }
else { else {
if (bReAssocType) { if (bReAssocType) {
@ -1745,7 +1745,6 @@ s_vMgrRxDeauthentication(
return; return;
} }
//2008-0730-01<Add>by MikeLiu
/*+ /*+
* *
* Routine Description: * Routine Description:
@ -1868,7 +1867,6 @@ s_vMgrRxBeacon(
} }
} }
//2008-0730-01<Add>by MikeLiu
if(ChannelExceedZoneType(pDevice,byCurrChannel)==TRUE) if(ChannelExceedZoneType(pDevice,byCurrChannel)==TRUE)
return; return;
@ -4240,7 +4238,6 @@ s_vMgrRxProbeResponse(
} }
//RobertYu:20050201 //RobertYu:20050201
//2008-0730-01<Add>by MikeLiu
if(ChannelExceedZoneType(pDevice,byCurrChannel)==TRUE) if(ChannelExceedZoneType(pDevice,byCurrChannel)==TRUE)
return; return;
@ -4768,7 +4765,7 @@ s_bCipherMatch (
if ((WLAN_GET_CAP_INFO_PRIVACY(pBSSNode->wCapInfo) != 0) && if ((WLAN_GET_CAP_INFO_PRIVACY(pBSSNode->wCapInfo) != 0) &&
(pBSSNode->bWPA2Valid == TRUE) && (pBSSNode->bWPA2Valid == TRUE) &&
//20080123-01,<Add> by Einsn Liu
((EncStatus == Ndis802_11Encryption3Enabled) || ((EncStatus == Ndis802_11Encryption3Enabled) ||
(EncStatus == Ndis802_11Encryption2Enabled))) { (EncStatus == Ndis802_11Encryption2Enabled))) {
//WPA2 //WPA2

2
drivers/staging/vt6656/wmgr.h
View File

@ -355,7 +355,7 @@ typedef struct tagSMgmtObject
// link list of known bss's (scan results) // link list of known bss's (scan results)
KnownBSS sBSSList[MAX_BSS_NUM]; KnownBSS sBSSList[MAX_BSS_NUM];
//link list of same bss's //DavidWang /* link list of same bss's */
KnownBSS pSameBSS[6] ; KnownBSS pSameBSS[6] ;
BOOL Cisco_cckm ; BOOL Cisco_cckm ;
BYTE Roam_dbm; BYTE Roam_dbm;

6
drivers/staging/vt6656/wpactl.c
View File

@ -515,7 +515,6 @@ static int wpa_set_scan(PSDevice pDevice,
{ {
int ret = 0; int ret = 0;
//2007-0919-01<Add>by MikeLiu
/**set ap_scan=1&&scan_ssid=1 under hidden ssid mode**/ /**set ap_scan=1&&scan_ssid=1 under hidden ssid mode**/
PSMgmtObject pMgmt = &(pDevice->sMgmtObj); PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
PWLAN_IE_SSID pItemSSID; PWLAN_IE_SSID pItemSSID;
@ -695,7 +694,7 @@ static int wpa_get_scan(PSDevice pDevice,
scan_buf->ssid_len = pItemSSID->len; scan_buf->ssid_len = pItemSSID->len;
scan_buf->freq = frequency_list[pBSS->uChannel-1]; scan_buf->freq = frequency_list[pBSS->uChannel-1];
scan_buf->caps = pBSS->wCapInfo; //DavidWang for sharemode scan_buf->caps = pBSS->wCapInfo; //DavidWang for sharemode
//20080717-05,<Add> by James Li
RFvRSSITodBm(pDevice, (BYTE)(pBSS->uRSSI), &ldBm); RFvRSSITodBm(pDevice, (BYTE)(pBSS->uRSSI), &ldBm);
if(-ldBm<50){ if(-ldBm<50){
scan_buf->qual = 100; scan_buf->qual = 100;
@ -710,7 +709,7 @@ static int wpa_get_scan(PSDevice pDevice,
//scan_buf->qual = //scan_buf->qual =
scan_buf->noise = 0; scan_buf->noise = 0;
scan_buf->level = ldBm; scan_buf->level = ldBm;
//20080717-05,<Add> by James Li--End
//scan_buf->maxrate = //scan_buf->maxrate =
if (pBSS->wWPALen != 0) { if (pBSS->wWPALen != 0) {
scan_buf->wpa_ie_len = pBSS->wWPALen; scan_buf->wpa_ie_len = pBSS->wWPALen;
@ -873,7 +872,6 @@ static int wpa_set_associate(PSDevice pDevice,
pMgmt->eCurrState = WMAC_STATE_IDLE; pMgmt->eCurrState = WMAC_STATE_IDLE;
netif_stop_queue(pDevice->dev); netif_stop_queue(pDevice->dev);
//20080701-02,<Add> by Mike Liu
/*******search if ap_scan=2 ,which is associating request in hidden ssid mode ****/ /*******search if ap_scan=2 ,which is associating request in hidden ssid mode ****/
{ {
PKnownBSS pCurr = NULL; PKnownBSS pCurr = NULL;