aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging
diff options
context:
space:
mode:
authorAndres More <more.andres@gmail.com>2010-08-03 19:25:50 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-08-31 14:14:39 -0400
commit465711b39d2fb326c5be27a4f69f70b2a41612cf (patch)
treef6901cdc5c6865abd397a8b72e2e67c14e22d55d /drivers/staging
parent13b631a599cddabc1cbb3a2fb862aee5ceb6e427 (diff)
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>
Diffstat (limited to 'drivers/staging')
-rw-r--r--drivers/staging/vt6656/80211mgr.h10
-rw-r--r--drivers/staging/vt6656/baseband.c2
-rw-r--r--drivers/staging/vt6656/bssdb.c14
-rw-r--r--drivers/staging/vt6656/device.h11
-rw-r--r--drivers/staging/vt6656/dpc.c1
-rw-r--r--drivers/staging/vt6656/ioctl.c2
-rw-r--r--drivers/staging/vt6656/iwctl.c15
-rw-r--r--drivers/staging/vt6656/iwctl.h3
-rw-r--r--drivers/staging/vt6656/main_usb.c18
-rw-r--r--drivers/staging/vt6656/wcmd.c4
-rw-r--r--drivers/staging/vt6656/wmgr.c11
-rw-r--r--drivers/staging/vt6656/wmgr.h2
-rw-r--r--drivers/staging/vt6656/wpactl.c6
13 files changed, 33 insertions, 66 deletions
diff --git a/drivers/staging/vt6656/80211mgr.h b/drivers/staging/vt6656/80211mgr.h
index 3d57f793986..515b9c1d4d1 100644
--- a/drivers/staging/vt6656/80211mgr.h
+++ b/drivers/staging/vt6656/80211mgr.h
@@ -66,9 +66,9 @@
66#define WLAN_EID_RSN_WPA 221 66#define WLAN_EID_RSN_WPA 221
67 67
68#ifdef Cisco_ccx 68#ifdef Cisco_ccx
69#define WLAN_EID_CCX 133 //DavidWang 69#define WLAN_EID_CCX 133
70#define WLAN_EID_CCX_IP 149 //DavidWang 70#define WLAN_EID_CCX_IP 149
71#define WLAN_EID_CCX_Ver 221 //DavidWang 71#define WLAN_EID_CCX_Ver 221
72#endif 72#endif
73 73
74#define WLAN_EID_ERP_NONERP_PRESENT 0x01 74#define WLAN_EID_ERP_NONERP_PRESENT 0x01
@@ -348,7 +348,7 @@ typedef struct tagWLAN_IE_RSN {
348 BYTE abyRSN[WLAN_MIN_ARRAY]; 348 BYTE abyRSN[WLAN_MIN_ARRAY];
349} WLAN_IE_RSN, *PWLAN_IE_RSN; 349} WLAN_IE_RSN, *PWLAN_IE_RSN;
350 350
351//DavidWang 351
352// CCX Identity DavidWang 352// CCX Identity DavidWang
353#pragma pack(1) 353#pragma pack(1)
354typedef struct tagWLAN_IE_CCX { 354typedef struct tagWLAN_IE_CCX {
@@ -371,7 +371,7 @@ BYTE len;
371BYTE abyCCXVer[5]; 371BYTE abyCCXVer[5];
372} WLAN_IE_CCX_Ver, *PWLAN_IE_CCX_Ver; 372} WLAN_IE_CCX_Ver, *PWLAN_IE_CCX_Ver;
373 373
374//DavidWang 374
375 375
376// ERP 376// ERP
377#pragma pack(1) 377#pragma pack(1)
diff --git a/drivers/staging/vt6656/baseband.c b/drivers/staging/vt6656/baseband.c
index 29902492975..e5add204637 100644
--- a/drivers/staging/vt6656/baseband.c
+++ b/drivers/staging/vt6656/baseband.c
@@ -1010,11 +1010,9 @@ BOOL BBbVT3184Init(PSDevice pDevice)
1010 } 1010 }
1011 1011
1012 1012
1013 //20080215-01,<Add> by Mike Liu
1014// if ((pDevice->abyEEPROM[EEP_OFS_RADIOCTL]&0x06)==0x04) 1013// if ((pDevice->abyEEPROM[EEP_OFS_RADIOCTL]&0x06)==0x04)
1015// return FALSE; 1014// return FALSE;
1016 1015
1017//20080804-01,<Add> by Mike Liu
1018//zonetype initial 1016//zonetype initial
1019 pDevice->byOriginalZonetype = pDevice->abyEEPROM[EEP_OFS_ZONETYPE]; 1017 pDevice->byOriginalZonetype = pDevice->abyEEPROM[EEP_OFS_ZONETYPE];
1020 if(pDevice->config_file.ZoneType >= 0) { //read zonetype file ok! 1018 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 a9f68bd5afa..2bdd0a2028d 100644
--- a/drivers/staging/vt6656/bssdb.c
+++ b/drivers/staging/vt6656/bssdb.c
@@ -148,7 +148,6 @@ PKnownBSS BSSpSearchBSSList(void *hDeviceContext,
148 for (ii = 0; ii <MAX_BSS_NUM; ii++) { 148 for (ii = 0; ii <MAX_BSS_NUM; ii++) {
149 pCurrBSS = &(pMgmt->sBSSList[ii]); 149 pCurrBSS = &(pMgmt->sBSSList[ii]);
150 150
151 //2008-0718-01<Add>by MikeLiu
152 pCurrBSS->bSelected = FALSE; 151 pCurrBSS->bSelected = FALSE;
153 152
154 if ((pCurrBSS->bActive) && 153 if ((pCurrBSS->bActive) &&
@@ -188,7 +187,6 @@ PKnownBSS BSSpSearchBSSList(void *hDeviceContext,
188 // if ((pCurrBSS->bActive) && 187 // if ((pCurrBSS->bActive) &&
189 // (pCurrBSS->bSelected == FALSE)) { 188 // (pCurrBSS->bSelected == FALSE)) {
190 189
191 //2007-0721-01<Add>by MikeLiu
192 pCurrBSS->bSelected = FALSE; 190 pCurrBSS->bSelected = FALSE;
193 if (pCurrBSS->bActive) { 191 if (pCurrBSS->bActive) {
194 192
@@ -238,12 +236,12 @@ PKnownBSS BSSpSearchBSSList(void *hDeviceContext,
238 } 236 }
239 } 237 }
240*/ 238*/
241//DavidWang 239
242 pMgmt->pSameBSS[jj].uChannel = pCurrBSS->uChannel; 240 pMgmt->pSameBSS[jj].uChannel = pCurrBSS->uChannel;
243 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)); 241 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));
244 jj++; 242 jj++;
245 243
246//DavidWang 244
247 if (pSelect == NULL) { 245 if (pSelect == NULL) {
248 pSelect = pCurrBSS; 246 pSelect = pCurrBSS;
249 } else { 247 } else {
@@ -254,9 +252,9 @@ PKnownBSS BSSpSearchBSSList(void *hDeviceContext,
254 } 252 }
255 } 253 }
256 } 254 }
257//DavidWang 255
258pDevice->bSameBSSMaxNum = jj; 256pDevice->bSameBSSMaxNum = jj;
259//DavidWang 257
260 if (pSelect != NULL) { 258 if (pSelect != NULL) {
261 pSelect->bSelected = TRUE; 259 pSelect->bSelected = TRUE;
262 if (pDevice->bRoaming == FALSE) { 260 if (pDevice->bRoaming == FALSE) {
@@ -956,7 +954,7 @@ void BSSvSecondCallBack(void *hDeviceContext)
956 unsigned int uSleepySTACnt = 0; 954 unsigned int uSleepySTACnt = 0;
957 unsigned int uNonShortSlotSTACnt = 0; 955 unsigned int uNonShortSlotSTACnt = 0;
958 unsigned int uLongPreambleSTACnt = 0; 956 unsigned int uLongPreambleSTACnt = 0;
959 viawget_wpa_header *wpahdr; //DavidWang 957 viawget_wpa_header *wpahdr;
960 958
961 spin_lock_irq(&pDevice->lock); 959 spin_lock_irq(&pDevice->lock);
962 960
@@ -1180,7 +1178,7 @@ if((pMgmt->eCurrState!=WMAC_STATE_ASSOC) &&
1180 pDevice->bIsRoaming = FALSE; 1178 pDevice->bIsRoaming = FALSE;
1181 1179
1182 DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Lost AP beacon [%d] sec, disconnected !\n", pMgmt->sNodeDBTable[0].uInActiveCount); 1180 DBG_PRT(MSG_LEVEL_NOTICE, KERN_INFO "Lost AP beacon [%d] sec, disconnected !\n", pMgmt->sNodeDBTable[0].uInActiveCount);
1183 //let wpa supplicant know AP may disconnect.//20080717-01,<Add> by James Li 1181 /* let wpa supplicant know AP may disconnect */
1184 if ((pDevice->bWPADEVUp) && (pDevice->skb != NULL)) { 1182 if ((pDevice->bWPADEVUp) && (pDevice->skb != NULL)) {
1185 wpahdr = (viawget_wpa_header *)pDevice->skb->data; 1183 wpahdr = (viawget_wpa_header *)pDevice->skb->data;
1186 wpahdr->type = VIAWGET_DISASSOC_MSG; 1184 wpahdr->type = VIAWGET_DISASSOC_MSG;
diff --git a/drivers/staging/vt6656/device.h b/drivers/staging/vt6656/device.h
index b9852aa22c0..a9a95d45a23 100644
--- a/drivers/staging/vt6656/device.h
+++ b/drivers/staging/vt6656/device.h
@@ -713,11 +713,11 @@ typedef struct __device_info {
713 BOOL bCmdClear; 713 BOOL bCmdClear;
714 BOOL bNeedRadioOFF; 714 BOOL bNeedRadioOFF;
715 715
716 BOOL bEnableRoaming; //DavidWang 716 BOOL bEnableRoaming;
717 BOOL bIsRoaming; //DavidWang 717 BOOL bIsRoaming;
718 BOOL bFastRoaming; //DavidWang 718 BOOL bFastRoaming;
719 BYTE bSameBSSMaxNum; //Davidwang 719 BYTE bSameBSSMaxNum;
720 BYTE bSameBSSCurNum; //DavidWang 720 BYTE bSameBSSCurNum;
721 BOOL bRoaming; 721 BOOL bRoaming;
722 BOOL b11hEable; 722 BOOL b11hEable;
723 unsigned long ulTxPower; 723 unsigned long ulTxPower;
@@ -726,7 +726,6 @@ typedef struct __device_info {
726 NDIS_802_11_WEP_STATUS eEncryptionStatus; 726 NDIS_802_11_WEP_STATUS eEncryptionStatus;
727 BOOL bTransmitKey; 727 BOOL bTransmitKey;
728 728
729//2007-0925-01<Add>by MikeLiu
730//mike add :save old Encryption 729//mike add :save old Encryption
731 NDIS_802_11_WEP_STATUS eOldEncryptionStatus; 730 NDIS_802_11_WEP_STATUS eOldEncryptionStatus;
732 731
diff --git a/drivers/staging/vt6656/dpc.c b/drivers/staging/vt6656/dpc.c
index 7e794a207ae..8ec07142743 100644
--- a/drivers/staging/vt6656/dpc.c
+++ b/drivers/staging/vt6656/dpc.c
@@ -865,7 +865,6 @@ RXbBulkInProcessData (
865 pDevice->dev->name); 865 pDevice->dev->name);
866 } 866 }
867 } 867 }
868 //2008-0409-07, <Add> by Einsn Liu
869 #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT 868 #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
870 //send event to wpa_supplicant 869 //send event to wpa_supplicant
871 //if(pDevice->bWPASuppWextEnabled == TRUE) 870 //if(pDevice->bWPASuppWextEnabled == TRUE)
diff --git a/drivers/staging/vt6656/ioctl.c b/drivers/staging/vt6656/ioctl.c
index d532618639b..2fe071ca42f 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) {
670 pMgmt->Cisco_cckm =1; 670 pMgmt->Cisco_cckm =1;
671 else 671 else
672 pMgmt->Cisco_cckm =0; 672 pMgmt->Cisco_cckm =0;
673//DavidWang 673
674 674
675if(wpa_Result.authenticated==TRUE) { 675if(wpa_Result.authenticated==TRUE) {
676 { 676 {
diff --git a/drivers/staging/vt6656/iwctl.c b/drivers/staging/vt6656/iwctl.c
index 3922a81d30d..9c855f0ffce 100644
--- a/drivers/staging/vt6656/iwctl.c
+++ b/drivers/staging/vt6656/iwctl.c
@@ -49,7 +49,6 @@
49 49
50/*--------------------- Static Definitions -------------------------*/ 50/*--------------------- Static Definitions -------------------------*/
51 51
52//2008-0409-07, <Add> by Einsn Liu
53#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT 52#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
54#define SUPPORTED_WIRELESS_EXT 18 53#define SUPPORTED_WIRELESS_EXT 18
55#else 54#else
@@ -155,7 +154,6 @@ int iwctl_siwscan(struct net_device *dev,
155 BYTE abyScanSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1]; 154 BYTE abyScanSSID[WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1];
156 PWLAN_IE_SSID pItemSSID=NULL; 155 PWLAN_IE_SSID pItemSSID=NULL;
157 156
158//2008-0920-01<Add>by MikeLiu
159 if (!(pDevice->flags & DEVICE_FLAGS_OPENED)) 157 if (!(pDevice->flags & DEVICE_FLAGS_OPENED))
160 return -EINVAL; 158 return -EINVAL;
161 159
@@ -285,7 +283,6 @@ int iwctl_giwscan(struct net_device *dev,
285 iwe.u.freq.e = 0; 283 iwe.u.freq.e = 0;
286 iwe.u.freq.i = 0; 284 iwe.u.freq.i = 0;
287 current_ev = iwe_stream_add_event(info,current_ev,end_buf, &iwe, IW_EV_FREQ_LEN); 285 current_ev = iwe_stream_add_event(info,current_ev,end_buf, &iwe, IW_EV_FREQ_LEN);
288 //2008-0409-04, <Add> by Einsn Liu
289 { 286 {
290 int f = (int)pBSS->uChannel - 1; 287 int f = (int)pBSS->uChannel - 1;
291 if(f < 0)f = 0; 288 if(f < 0)f = 0;
@@ -299,7 +296,7 @@ int iwctl_giwscan(struct net_device *dev,
299 RFvRSSITodBm(pDevice, (BYTE)(pBSS->uRSSI), &ldBm); 296 RFvRSSITodBm(pDevice, (BYTE)(pBSS->uRSSI), &ldBm);
300 iwe.u.qual.level = ldBm; 297 iwe.u.qual.level = ldBm;
301 iwe.u.qual.noise = 0; 298 iwe.u.qual.noise = 0;
302//2008-0409-01, <Add> by Einsn Liu 299
303 if(-ldBm<50){ 300 if(-ldBm<50){
304 iwe.u.qual.qual = 100; 301 iwe.u.qual.qual = 100;
305 }else if(-ldBm > 90) { 302 }else if(-ldBm > 90) {
@@ -803,7 +800,6 @@ int iwctl_siwessid(struct net_device *dev,
803 PSMgmtObject pMgmt = &(pDevice->sMgmtObj); 800 PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
804 PWLAN_IE_SSID pItemSSID; 801 PWLAN_IE_SSID pItemSSID;
805 802
806//2008-0920-01<Add>by MikeLiu
807 if (!(pDevice->flags & DEVICE_FLAGS_OPENED)) 803 if (!(pDevice->flags & DEVICE_FLAGS_OPENED))
808 return -EINVAL; 804 return -EINVAL;
809 805
@@ -931,11 +927,10 @@ int iwctl_giwessid(struct net_device *dev,
931 //pItemSSID = (PWLAN_IE_SSID)pMgmt->abyDesireSSID; 927 //pItemSSID = (PWLAN_IE_SSID)pMgmt->abyDesireSSID;
932 memcpy(extra, pItemSSID->abySSID , pItemSSID->len); 928 memcpy(extra, pItemSSID->abySSID , pItemSSID->len);
933 extra[pItemSSID->len] = '\0'; 929 extra[pItemSSID->len] = '\0';
934 //2008-0409-03, <Add> by Einsn Liu 930
935 wrq->length = pItemSSID->len; 931 wrq->length = pItemSSID->len;
936 wrq->flags = 1; // active 932 wrq->flags = 1; // active
937 933
938
939 return 0; 934 return 0;
940} 935}
941 936
@@ -1392,8 +1387,6 @@ int iwctl_giwencode(struct net_device *dev,
1392} 1387}
1393*/ 1388*/
1394 1389
1395//2008-0409-06, <Add> by Einsn Liu
1396
1397int iwctl_giwencode(struct net_device *dev, 1390int iwctl_giwencode(struct net_device *dev,
1398 struct iw_request_info *info, 1391 struct iw_request_info *info,
1399 struct iw_point *wrq, 1392 struct iw_point *wrq,
@@ -1561,7 +1554,6 @@ int iwctl_giwsens(struct net_device *dev,
1561 return 0; 1554 return 0;
1562} 1555}
1563 1556
1564//2008-0409-07, <Add> by Einsn Liu
1565#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT 1557#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
1566 1558
1567int iwctl_siwauth(struct net_device *dev, 1559int iwctl_siwauth(struct net_device *dev,
@@ -1934,9 +1926,6 @@ int iwctl_siwmlme(struct net_device *dev,
1934} 1926}
1935 1927
1936#endif 1928#endif
1937//End Add --//2008-0409-07, <Add> by Einsn Liu
1938
1939
1940 1929
1941/*------------------------------------------------------------------*/ 1930/*------------------------------------------------------------------*/
1942/* 1931/*
diff --git a/drivers/staging/vt6656/iwctl.h b/drivers/staging/vt6656/iwctl.h
index d601e922021..cc48954783f 100644
--- a/drivers/staging/vt6656/iwctl.h
+++ b/drivers/staging/vt6656/iwctl.h
@@ -178,7 +178,6 @@ int iwctl_siwscan(struct net_device *dev,
178 struct iw_param *wrq, 178 struct iw_param *wrq,
179 char *extra); 179 char *extra);
180 180
181//2008-0409-07, <Add> by Einsn Liu
182#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT 181#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
183int iwctl_siwauth(struct net_device *dev, 182int iwctl_siwauth(struct net_device *dev,
184 struct iw_request_info *info, 183 struct iw_request_info *info,
@@ -215,8 +214,6 @@ int iwctl_siwmlme(struct net_device *dev,
215 struct iw_point *wrq, 214 struct iw_point *wrq,
216 char *extra); 215 char *extra);
217#endif // #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT 216#endif // #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
218//End Add -- //2008-0409-07, <Add> by Einsn Liu
219
220 217
221extern const struct iw_handler_def iwctl_handler_def; 218extern const struct iw_handler_def iwctl_handler_def;
222extern const struct iw_priv_args iwctl_private_args; 219extern 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 c528ef0f8ed..3a58214c274 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,
282 unsigned char *dest, 282 unsigned char *dest,
283 unsigned char *source); 283 unsigned char *source);
284 284
285//2008-0714<Add>by Mike Liu
286static BOOL device_release_WPADEV(PSDevice pDevice); 285static BOOL device_release_WPADEV(PSDevice pDevice);
287 286
288static void usb_device_reset(PSDevice pDevice); 287static void usb_device_reset(PSDevice pDevice);
@@ -869,7 +868,6 @@ static void device_free_rx_bufs(PSDevice pDevice)
869 return; 868 return;
870} 869}
871 870
872//2007-1107-02<Add>by MikeLiu
873static void usb_device_reset(PSDevice pDevice) 871static void usb_device_reset(PSDevice pDevice)
874{ 872{
875 int status; 873 int status;
@@ -1091,8 +1089,8 @@ static int device_open(struct net_device *dev) {
1091 memcpy(pDevice->dev->dev_addr, pDevice->abyCurrentNetAddr, ETH_ALEN); 1089 memcpy(pDevice->dev->dev_addr, pDevice->abyCurrentNetAddr, ETH_ALEN);
1092 pDevice->bStopTx0Pkt = FALSE; 1090 pDevice->bStopTx0Pkt = FALSE;
1093 pDevice->bStopDataPkt = FALSE; 1091 pDevice->bStopDataPkt = FALSE;
1094 pDevice->bRoaming = FALSE; //DavidWang 1092 pDevice->bRoaming = FALSE;
1095 pDevice->bIsRoaming = FALSE;//DavidWang 1093 pDevice->bIsRoaming = FALSE;
1096 pDevice->bEnableRoaming = FALSE; 1094 pDevice->bEnableRoaming = FALSE;
1097 if (pDevice->bDiversityRegCtlON) { 1095 if (pDevice->bDiversityRegCtlON) {
1098 device_init_diversity_timer(pDevice); 1096 device_init_diversity_timer(pDevice);
@@ -1195,14 +1193,11 @@ static int device_close(struct net_device *dev) {
1195 wireless_send_event(pDevice->dev, IWEVCUSTOM, &wrqu, NULL); 1193 wireless_send_event(pDevice->dev, IWEVCUSTOM, &wrqu, NULL);
1196} 1194}
1197 1195
1198//2007-1121-02<Add>by EinsnLiu
1199 if (pDevice->bLinkPass) { 1196 if (pDevice->bLinkPass) {
1200 bScheduleCommand((void *) pDevice, WLAN_CMD_DISASSOCIATE, NULL); 1197 bScheduleCommand((void *) pDevice, WLAN_CMD_DISASSOCIATE, NULL);
1201 mdelay(30); 1198 mdelay(30);
1202 } 1199 }
1203//End Add
1204 1200
1205//2008-0714-01<Add>by MikeLiu
1206device_release_WPADEV(pDevice); 1201device_release_WPADEV(pDevice);
1207 1202
1208 memset(pMgmt->abyDesireSSID, 0, WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1); 1203 memset(pMgmt->abyDesireSSID, 0, WLAN_IEHDR_LEN + WLAN_SSID_MAXLEN + 1);
@@ -1236,8 +1231,8 @@ device_release_WPADEV(pDevice);
1236 tasklet_kill(&pDevice->ReadWorkItem); 1231 tasklet_kill(&pDevice->ReadWorkItem);
1237 tasklet_kill(&pDevice->EventWorkItem); 1232 tasklet_kill(&pDevice->EventWorkItem);
1238 1233
1239 pDevice->bRoaming = FALSE; //DavidWang 1234 pDevice->bRoaming = FALSE;
1240 pDevice->bIsRoaming = FALSE;//DavidWang 1235 pDevice->bIsRoaming = FALSE;
1241 pDevice->bEnableRoaming = FALSE; 1236 pDevice->bEnableRoaming = FALSE;
1242 pDevice->bCmdRunning = FALSE; 1237 pDevice->bCmdRunning = FALSE;
1243 pDevice->bLinkPass = FALSE; 1238 pDevice->bLinkPass = FALSE;
@@ -1914,11 +1909,9 @@ static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) {
1914*/ 1909*/
1915 break; 1910 break;
1916 1911
1917
1918//2008-0409-07, <Add> by Einsn Liu
1919#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT 1912#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
1920 case SIOCSIWAUTH: 1913 case SIOCSIWAUTH:
1921 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWAUTH \n"); 1914 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWAUTH\n");
1922 rc = iwctl_siwauth(dev, NULL, &(wrq->u.param), NULL); 1915 rc = iwctl_siwauth(dev, NULL, &(wrq->u.param), NULL);
1923 break; 1916 break;
1924 1917
@@ -1970,7 +1963,6 @@ static int device_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) {
1970 break; 1963 break;
1971 1964
1972#endif // #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT 1965#endif // #ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
1973//End Add -- //2008-0409-07, <Add> by Einsn Liu
1974 1966
1975 case IOCTL_CMD_TEST: 1967 case IOCTL_CMD_TEST:
1976 1968
diff --git a/drivers/staging/vt6656/wcmd.c b/drivers/staging/vt6656/wcmd.c
index 686747a0929..b83b660b1f0 100644
--- a/drivers/staging/vt6656/wcmd.c
+++ b/drivers/staging/vt6656/wcmd.c
@@ -500,7 +500,7 @@ void vRunCommand(void *hDeviceContext)
500 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Scanning, set back to channel: [%d]\n", pMgmt->uCurrChannel); 500 DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Scanning, set back to channel: [%d]\n", pMgmt->uCurrChannel);
501 pMgmt->eScanState = WMAC_NO_SCANNING; 501 pMgmt->eScanState = WMAC_NO_SCANNING;
502 pDevice->bStopDataPkt = FALSE; 502 pDevice->bStopDataPkt = FALSE;
503//2008-0409-07, <Add> by Einsn Liu 503
504#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT 504#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
505 if(pMgmt->eScanType == WMAC_SCAN_PASSIVE) 505 if(pMgmt->eScanType == WMAC_SCAN_PASSIVE)
506 { 506 {
@@ -876,7 +876,7 @@ void vRunCommand(void *hDeviceContext)
876 // CARDbRadioPowerOn(pDevice); 876 // CARDbRadioPowerOn(pDevice);
877 // else 877 // else
878 // CARDbRadioPowerOff(pDevice); 878 // CARDbRadioPowerOff(pDevice);
879 //2008-09-09<Add> BY Mike:Hot Key for Radio On/Off 879
880 { 880 {
881 int ntStatus = STATUS_SUCCESS; 881 int ntStatus = STATUS_SUCCESS;
882 BYTE byTmp; 882 BYTE byTmp;
diff --git a/drivers/staging/vt6656/wmgr.c b/drivers/staging/vt6656/wmgr.c
index f70e13bdfe6..2ec200d8b73 100644
--- a/drivers/staging/vt6656/wmgr.c
+++ b/drivers/staging/vt6656/wmgr.c
@@ -92,7 +92,7 @@ static int msglevel =MSG_LEVEL_INFO;
92//static int msglevel =MSG_LEVEL_DEBUG; 92//static int msglevel =MSG_LEVEL_DEBUG;
93 93
94/*--------------------- Static Functions --------------------------*/ 94/*--------------------- Static Functions --------------------------*/
95//2008-0730-01<Add>by MikeLiu 95
96static BOOL ChannelExceedZoneType( 96static BOOL ChannelExceedZoneType(
97 PSDevice pDevice, 97 PSDevice pDevice,
98 BYTE byCurrChannel 98 BYTE byCurrChannel
@@ -997,7 +997,7 @@ s_vMgrRxAssocResponse(
997 netif_rx(pDevice->skb); 997 netif_rx(pDevice->skb);
998 pDevice->skb = dev_alloc_skb((int)pDevice->rx_buf_sz); 998 pDevice->skb = dev_alloc_skb((int)pDevice->rx_buf_sz);
999 } 999 }
1000//2008-0409-07, <Add> by Einsn Liu 1000
1001#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT 1001#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
1002 //if(pDevice->bWPASuppWextEnabled == TRUE) 1002 //if(pDevice->bWPASuppWextEnabled == TRUE)
1003 { 1003 {
@@ -1038,7 +1038,7 @@ s_vMgrRxAssocResponse(
1038 1038
1039 } 1039 }
1040#endif //#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT 1040#endif //#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
1041//End Add -- //2008-0409-07, <Add> by Einsn Liu 1041
1042 } 1042 }
1043 else { 1043 else {
1044 if (bReAssocType) { 1044 if (bReAssocType) {
@@ -1745,7 +1745,6 @@ s_vMgrRxDeauthentication(
1745 return; 1745 return;
1746} 1746}
1747 1747
1748//2008-0730-01<Add>by MikeLiu
1749/*+ 1748/*+
1750 * 1749 *
1751 * Routine Description: 1750 * Routine Description:
@@ -1868,7 +1867,6 @@ s_vMgrRxBeacon(
1868 } 1867 }
1869 } 1868 }
1870 1869
1871//2008-0730-01<Add>by MikeLiu
1872if(ChannelExceedZoneType(pDevice,byCurrChannel)==TRUE) 1870if(ChannelExceedZoneType(pDevice,byCurrChannel)==TRUE)
1873 return; 1871 return;
1874 1872
@@ -4240,7 +4238,6 @@ s_vMgrRxProbeResponse(
4240 } 4238 }
4241 //RobertYu:20050201 4239 //RobertYu:20050201
4242 4240
4243//2008-0730-01<Add>by MikeLiu
4244if(ChannelExceedZoneType(pDevice,byCurrChannel)==TRUE) 4241if(ChannelExceedZoneType(pDevice,byCurrChannel)==TRUE)
4245 return; 4242 return;
4246 4243
@@ -4768,7 +4765,7 @@ s_bCipherMatch (
4768 4765
4769 if ((WLAN_GET_CAP_INFO_PRIVACY(pBSSNode->wCapInfo) != 0) && 4766 if ((WLAN_GET_CAP_INFO_PRIVACY(pBSSNode->wCapInfo) != 0) &&
4770 (pBSSNode->bWPA2Valid == TRUE) && 4767 (pBSSNode->bWPA2Valid == TRUE) &&
4771 //20080123-01,<Add> by Einsn Liu 4768
4772 ((EncStatus == Ndis802_11Encryption3Enabled) || 4769 ((EncStatus == Ndis802_11Encryption3Enabled) ||
4773 (EncStatus == Ndis802_11Encryption2Enabled))) { 4770 (EncStatus == Ndis802_11Encryption2Enabled))) {
4774 //WPA2 4771 //WPA2
diff --git a/drivers/staging/vt6656/wmgr.h b/drivers/staging/vt6656/wmgr.h
index 683840c0ac4..594f3a89d8a 100644
--- a/drivers/staging/vt6656/wmgr.h
+++ b/drivers/staging/vt6656/wmgr.h
@@ -355,7 +355,7 @@ typedef struct tagSMgmtObject
355 355
356 // link list of known bss's (scan results) 356 // link list of known bss's (scan results)
357 KnownBSS sBSSList[MAX_BSS_NUM]; 357 KnownBSS sBSSList[MAX_BSS_NUM];
358 //link list of same bss's //DavidWang 358 /* link list of same bss's */
359 KnownBSS pSameBSS[6] ; 359 KnownBSS pSameBSS[6] ;
360 BOOL Cisco_cckm ; 360 BOOL Cisco_cckm ;
361 BYTE Roam_dbm; 361 BYTE Roam_dbm;
diff --git a/drivers/staging/vt6656/wpactl.c b/drivers/staging/vt6656/wpactl.c
index b407ae536bf..7fd300f2e7c 100644
--- a/drivers/staging/vt6656/wpactl.c
+++ b/drivers/staging/vt6656/wpactl.c
@@ -515,7 +515,6 @@ static int wpa_set_scan(PSDevice pDevice,
515{ 515{
516 int ret = 0; 516 int ret = 0;
517 517
518//2007-0919-01<Add>by MikeLiu
519/**set ap_scan=1&&scan_ssid=1 under hidden ssid mode**/ 518/**set ap_scan=1&&scan_ssid=1 under hidden ssid mode**/
520 PSMgmtObject pMgmt = &(pDevice->sMgmtObj); 519 PSMgmtObject pMgmt = &(pDevice->sMgmtObj);
521 PWLAN_IE_SSID pItemSSID; 520 PWLAN_IE_SSID pItemSSID;
@@ -695,7 +694,7 @@ static int wpa_get_scan(PSDevice pDevice,
695 scan_buf->ssid_len = pItemSSID->len; 694 scan_buf->ssid_len = pItemSSID->len;
696 scan_buf->freq = frequency_list[pBSS->uChannel-1]; 695 scan_buf->freq = frequency_list[pBSS->uChannel-1];
697 scan_buf->caps = pBSS->wCapInfo; //DavidWang for sharemode 696 scan_buf->caps = pBSS->wCapInfo; //DavidWang for sharemode
698//20080717-05,<Add> by James Li 697
699 RFvRSSITodBm(pDevice, (BYTE)(pBSS->uRSSI), &ldBm); 698 RFvRSSITodBm(pDevice, (BYTE)(pBSS->uRSSI), &ldBm);
700 if(-ldBm<50){ 699 if(-ldBm<50){
701 scan_buf->qual = 100; 700 scan_buf->qual = 100;
@@ -710,7 +709,7 @@ static int wpa_get_scan(PSDevice pDevice,
710 //scan_buf->qual = 709 //scan_buf->qual =
711 scan_buf->noise = 0; 710 scan_buf->noise = 0;
712 scan_buf->level = ldBm; 711 scan_buf->level = ldBm;
713 //20080717-05,<Add> by James Li--End 712
714 //scan_buf->maxrate = 713 //scan_buf->maxrate =
715 if (pBSS->wWPALen != 0) { 714 if (pBSS->wWPALen != 0) {
716 scan_buf->wpa_ie_len = pBSS->wWPALen; 715 scan_buf->wpa_ie_len = pBSS->wWPALen;
@@ -873,7 +872,6 @@ static int wpa_set_associate(PSDevice pDevice,
873 pMgmt->eCurrState = WMAC_STATE_IDLE; 872 pMgmt->eCurrState = WMAC_STATE_IDLE;
874 netif_stop_queue(pDevice->dev); 873 netif_stop_queue(pDevice->dev);
875 874
876//20080701-02,<Add> by Mike Liu
877/*******search if ap_scan=2 ,which is associating request in hidden ssid mode ****/ 875/*******search if ap_scan=2 ,which is associating request in hidden ssid mode ****/
878{ 876{
879 PKnownBSS pCurr = NULL; 877 PKnownBSS pCurr = NULL;