From 465711b39d2fb326c5be27a4f69f70b2a41612cf Mon Sep 17 00:00:00 2001 From: Andres More Date: Tue, 3 Aug 2010 20:25:50 -0300 Subject: staging: vt6656: removed not useful comments Removed comments about who changed/added lines, they do not seem useful. Signed-off-by: Andres More Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6656/80211mgr.h | 10 +++++----- drivers/staging/vt6656/baseband.c | 2 -- drivers/staging/vt6656/bssdb.c | 14 ++++++-------- drivers/staging/vt6656/device.h | 11 +++++------ drivers/staging/vt6656/dpc.c | 1 - drivers/staging/vt6656/ioctl.c | 2 +- drivers/staging/vt6656/iwctl.c | 15 ++------------- drivers/staging/vt6656/iwctl.h | 3 --- drivers/staging/vt6656/main_usb.c | 18 +++++------------- drivers/staging/vt6656/wcmd.c | 4 ++-- drivers/staging/vt6656/wmgr.c | 11 ++++------- drivers/staging/vt6656/wmgr.h | 2 +- drivers/staging/vt6656/wpactl.c | 6 ++---- 13 files changed, 33 insertions(+), 66 deletions(-) (limited to 'drivers/staging/vt6656') diff --git a/drivers/staging/vt6656/80211mgr.h b/drivers/staging/vt6656/80211mgr.h index 3d57f793986d..515b9c1d4d10 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/baseband.c b/drivers/staging/vt6656/baseband.c index 29902492975c..e5add2046375 100644 --- a/drivers/staging/vt6656/baseband.c +++ b/drivers/staging/vt6656/baseband.c @@ -1010,11 +1010,9 @@ BOOL BBbVT3184Init(PSDevice pDevice) } - //20080215-01, by Mike Liu // if ((pDevice->abyEEPROM[EEP_OFS_RADIOCTL]&0x06)==0x04) // return FALSE; -//20080804-01, 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 a9f68bd5afa6..2bdd0a2028d2 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 sBSSList[ii]); - //2008-0718-01by MikeLiu pCurrBSS->bSelected = FALSE; if ((pCurrBSS->bActive) && @@ -188,7 +187,6 @@ PKnownBSS BSSpSearchBSSList(void *hDeviceContext, // if ((pCurrBSS->bActive) && // (pCurrBSS->bSelected == FALSE)) { - //2007-0721-01by 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, 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/device.h b/drivers/staging/vt6656/device.h index b9852aa22c06..a9a95d45a235 100644 --- a/drivers/staging/vt6656/device.h +++ b/drivers/staging/vt6656/device.h @@ -713,11 +713,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 +726,6 @@ typedef struct __device_info { NDIS_802_11_WEP_STATUS eEncryptionStatus; BOOL bTransmitKey; -//2007-0925-01by MikeLiu //mike add :save old Encryption NDIS_802_11_WEP_STATUS eOldEncryptionStatus; diff --git a/drivers/staging/vt6656/dpc.c b/drivers/staging/vt6656/dpc.c index 7e794a207aed..8ec071427439 100644 --- a/drivers/staging/vt6656/dpc.c +++ b/drivers/staging/vt6656/dpc.c @@ -865,7 +865,6 @@ RXbBulkInProcessData ( pDevice->dev->name); } } - //2008-0409-07, by Einsn Liu #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT //send event to wpa_supplicant //if(pDevice->bWPASuppWextEnabled == TRUE) diff --git a/drivers/staging/vt6656/ioctl.c b/drivers/staging/vt6656/ioctl.c index d532618639bc..2fe071ca42fa 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 3922a81d30db..9c855f0ffced 100644 --- a/drivers/staging/vt6656/iwctl.c +++ b/drivers/staging/vt6656/iwctl.c @@ -49,7 +49,6 @@ /*--------------------- Static Definitions -------------------------*/ -//2008-0409-07, 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-01by 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, 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, 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-01by 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, 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, 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, by Einsn Liu #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT int iwctl_siwauth(struct net_device *dev, @@ -1934,9 +1926,6 @@ int iwctl_siwmlme(struct net_device *dev, } #endif -//End Add --//2008-0409-07, by Einsn Liu - - /*------------------------------------------------------------------*/ /* diff --git a/drivers/staging/vt6656/iwctl.h b/drivers/staging/vt6656/iwctl.h index d601e9220219..cc48954783fc 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, 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, 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/main_usb.c b/drivers/staging/vt6656/main_usb.c index c528ef0f8ed4..3a58214c2744 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-0714by Mike Liu static BOOL device_release_WPADEV(PSDevice pDevice); static void usb_device_reset(PSDevice pDevice); @@ -869,7 +868,6 @@ static void device_free_rx_bufs(PSDevice pDevice) return; } -//2007-1107-02by MikeLiu static void usb_device_reset(PSDevice pDevice) { int status; @@ -1091,8 +1089,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 +1193,11 @@ static int device_close(struct net_device *dev) { wireless_send_event(pDevice->dev, IWEVCUSTOM, &wrqu, NULL); } -//2007-1121-02by EinsnLiu if (pDevice->bLinkPass) { bScheduleCommand((void *) pDevice, WLAN_CMD_DISASSOCIATE, NULL); mdelay(30); } -//End Add -//2008-0714-01by MikeLiu device_release_WPADEV(pDevice); 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->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 +1909,9 @@ static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { */ break; - -//2008-0409-07, 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 +1963,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, by Einsn Liu case IOCTL_CMD_TEST: diff --git a/drivers/staging/vt6656/wcmd.c b/drivers/staging/vt6656/wcmd.c index 686747a09294..b83b660b1f0f 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, 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 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 f70e13bdfe6c..2ec200d8b736 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-01by 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, 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, by Einsn Liu + } else { if (bReAssocType) { @@ -1745,7 +1745,6 @@ s_vMgrRxDeauthentication( return; } -//2008-0730-01by MikeLiu /*+ * * Routine Description: @@ -1868,7 +1867,6 @@ s_vMgrRxBeacon( } } -//2008-0730-01by MikeLiu if(ChannelExceedZoneType(pDevice,byCurrChannel)==TRUE) return; @@ -4240,7 +4238,6 @@ s_vMgrRxProbeResponse( } //RobertYu:20050201 -//2008-0730-01by MikeLiu if(ChannelExceedZoneType(pDevice,byCurrChannel)==TRUE) return; @@ -4768,7 +4765,7 @@ s_bCipherMatch ( if ((WLAN_GET_CAP_INFO_PRIVACY(pBSSNode->wCapInfo) != 0) && (pBSSNode->bWPA2Valid == TRUE) && - //20080123-01, by Einsn Liu + ((EncStatus == Ndis802_11Encryption3Enabled) || (EncStatus == Ndis802_11Encryption2Enabled))) { //WPA2 diff --git a/drivers/staging/vt6656/wmgr.h b/drivers/staging/vt6656/wmgr.h index 683840c0ac45..594f3a89d8a7 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/wpactl.c b/drivers/staging/vt6656/wpactl.c index b407ae536bf5..7fd300f2e7c3 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-01by 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, 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, 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, by Mike Liu /*******search if ap_scan=2 ,which is associating request in hidden ssid mode ****/ { PKnownBSS pCurr = NULL; -- cgit v1.2.3