openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Staging: vt6656: removed '#if 0' definitions 

Removed code in .c files that was being skipped by the preprocessor

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-06-21 11:27:24 -03:00 committed by Greg Kroah-Hartman
parent ae6eb75c63
commit 2a1a17498b
6 changed files with 0 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -716,28 +716,6 @@ BOOL BSSbUpdateToBSSList(void *hDeviceContext,
pBSSList->uIELength = WLAN_BEACON_FR_MAXLEN;
memcpy(pBSSList->abyIEs, pbyIEs, pBSSList->uIELength);
//mike add: if the AP in this pBSSList is hidden ssid and we can find two of them,
// you need upgrade the other related pBSSList of which ssid is obvious,
// for these two AP is the same one!!!!
/********judge by:BSSID is the same,but ssid is different!*****************/
#if 0
for (ii = 0; ii < MAX_BSS_NUM; ii++) {
if (IS_ETH_ADDRESS_EQUAL(pMgmt->sBSSList[ii].abyBSSID, pBSSList->abyBSSID)) { //BSSID is the same!
if (memcmp(((PWLAN_IE_SSID)pMgmt->sBSSList[ii].abySSID)->abySSID, //ssid is different??
((PWLAN_IE_SSID)pBSSList->abySSID)->abySSID,
((PWLAN_IE_SSID)pBSSList->abySSID)->len) != 0) {
//reserve temp
memset(abyTmpSSID,0,sizeof(abyTmpSSID));
memcpy(abyTmpSSID,pMgmt->sBSSList[ii].abySSID,sizeof(abyTmpSSID));
//upgrade the other one pBSSList
memcpy(&(pMgmt->sBSSList[ii]),pBSSList,sizeof(KnownBSS));
//recover ssid info
memcpy(pMgmt->sBSSList[ii].abySSID,abyTmpSSID,sizeof(abyTmpSSID));
}
}
}
#endif
return TRUE;
}

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

@ -1926,26 +1926,6 @@ param->u.wpa_key.key = (u8 *)key_array;
param->u.wpa_key.seq = (u8 *)seq;
param->u.wpa_key.seq_len = seq_len;
#if 0
printk("param->u.wpa_key.alg_name =%d\n",param->u.wpa_key.alg_name);
printk("param->addr=%02x:%02x:%02x:%02x:%02x:%02x\n",
param->addr[0],param->addr[1],param->addr[2],
param->addr[3],param->addr[4],param->addr[5]);
printk("param->u.wpa_key.set_tx =%d\n",param->u.wpa_key.set_tx);
printk("param->u.wpa_key.key_index =%d\n",param->u.wpa_key.key_index);
printk("param->u.wpa_key.key_len =%d\n",param->u.wpa_key.key_len);
printk("param->u.wpa_key.key =");
for (ii = 0; ii < param->u.wpa_key.key_len; ii++)
printk(KERN_DEBUG "%02x:", param->u.wpa_key.key[ii]);
printk("\n");
printk("param->u.wpa_key.seq_len =%d\n",param->u.wpa_key.seq_len);
printk("param->u.wpa_key.seq =");
for (ii = 0; ii < param->u.wpa_key.seq_len; ii++)
printk(KERN_DEBUG "%02x:", param->u.wpa_key.seq[ii]);
printk("\n");
printk("...........\n");
#endif
//****set if current action is Network Manager count??
//****this method is so foolish,but there is no other way???
if(param->u.wpa_key.alg_name == WPA_ALG_NONE) {

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

@ -812,16 +812,6 @@ vt6656_probe(struct usb_interface *intf, const struct usb_device_id *id)
return -ENODEV;
}
//2008-07-21-01<Add>by MikeLiu
//register wpadev
#if 0
if(wpa_set_wpadev(pDevice, 1)!=0) {
printk("Fail to Register WPADEV?\n");
unregister_netdev(pDevice->dev);
free_netdev(netdev);
kfree(pDevice);
}
#endif
usb_device_reset(pDevice);
#ifdef SndEvt_ToAPI

16
drivers/staging/vt6656/rxtx.c
View File

@ -3071,28 +3071,12 @@ nsDMA_tx_packet(
}
else {
#if 0
if((pDevice->fWPA_Authened == FALSE) &&
((pMgmt->eAuthenMode == WMAC_AUTH_WPAPSK)||(pMgmt->eAuthenMode = WMAC_AUTH_WPA2PSK))){
dev_kfree_skb_irq(skb);
pStats->tx_dropped++;
return STATUS_FAILURE;
}
else if (pTransmitKey == NULL) {
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"return no tx key\n");
dev_kfree_skb_irq(skb);
pStats->tx_dropped++;
return STATUS_FAILURE;
}
#else
if (pTransmitKey == NULL) {
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"return no tx key\n");
dev_kfree_skb_irq(skb);
pStats->tx_dropped++;
return STATUS_FAILURE;
}
#endif
}
}

19
drivers/staging/vt6656/usbpipe.c
View File

@ -381,17 +381,6 @@ PIPEnsInterruptRead(
// Now that we have created the urb, we will send a
// request to the USB device object.
//
#if 0 //reserve int URB submit
usb_fill_int_urb(pDevice->pInterruptURB,
pDevice->usb,
usb_rcvintpipe(pDevice->usb, 1),
(void *) pDevice->intBuf.pDataBuf,
MAX_INTERRUPT_SIZE,
s_nsInterruptUsbIoCompleteRead,
pDevice,
pDevice->int_interval
);
#else //replace int URB submit by bulk transfer
#ifndef Safe_Close
usb_fill_int_urb(pDevice->pInterruptURB,
pDevice->usb,
@ -413,7 +402,6 @@ usb_fill_bulk_urb(pDevice->pInterruptURB,
MAX_INTERRUPT_SIZE,
s_nsInterruptUsbIoCompleteRead,
pDevice);
#endif
#endif
ntStatus = usb_submit_urb(pDevice->pInterruptURB, GFP_ATOMIC);
@ -495,12 +483,6 @@ s_nsInterruptUsbIoCompleteRead(
if (pDevice->fKillEventPollingThread != TRUE) {
#if 0 //reserve int URB submit
ntStatus = usb_submit_urb(urb, GFP_ATOMIC);
if (ntStatus != 0) {
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Re-Submit int URB failed %d\n", ntStatus);
}
#else //replace int URB submit by bulk transfer
#ifdef Safe_Close
usb_fill_bulk_urb(pDevice->pInterruptURB,
pDevice->usb,
@ -518,7 +500,6 @@ s_nsInterruptUsbIoCompleteRead(
#else
tasklet_schedule(&pDevice->EventWorkItem);
#endif
#endif
}
//
// We return STATUS_MORE_PROCESSING_REQUIRED so that the completion

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

@ -716,18 +716,6 @@ void vRunCommand(void *hDeviceContext)
return;
}
pDevice->byLinkWaitCount = 0;
#if 0
#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
// if(pDevice->bWPASuppWextEnabled == TRUE)
{
union iwreq_data wrqu;
memset(&wrqu, 0, sizeof (wrqu));
wrqu.ap_addr.sa_family = ARPHRD_ETHER;
printk("wireless_send_event--->SIOCGIWAP(disassociated:AUTHENTICATE_WAIT_timeout)\n");
wireless_send_event(pDevice->dev, SIOCGIWAP, &wrqu, NULL);
}
#endif
#endif
s_bCommandComplete(pDevice);
break;
@ -785,18 +773,6 @@ void vRunCommand(void *hDeviceContext)
return;
}
pDevice->byLinkWaitCount = 0;
#if 0
#ifdef WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT
// if(pDevice->bWPASuppWextEnabled == TRUE)
{
union iwreq_data wrqu;
memset(&wrqu, 0, sizeof (wrqu));
wrqu.ap_addr.sa_family = ARPHRD_ETHER;
printk("wireless_send_event--->SIOCGIWAP(disassociated:ASSOCIATE_WAIT_timeout)\n");
wireless_send_event(pDevice->dev, SIOCGIWAP, &wrqu, NULL);
}
#endif
#endif
s_bCommandComplete(pDevice);
break;