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

staging: vt6656: removed Safe_Close definition 

Removed an always defined macro, perhaps used to patch the driver

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-07-12 13:47:47 -03:00 committed by Greg Kroah-Hartman
parent e1669ed0d4
commit 68746744b1
3 changed files with 3 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -115,18 +115,9 @@ static int iwctl_commit(struct net_device *dev,
void *wrq, void *wrq,
char *extra) char *extra)
{ {
//2008-0409-02, <Mark> by Einsn Liu DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWCOMMIT\n");
/*
#ifdef Safe_Close
PSDevice pDevice = (PSDevice)netdev_priv(dev);
if (!(pDevice->flags & DEVICE_FLAGS_OPENED))
return -EINVAL;
#endif
*/
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCSIWCOMMIT \n");
return 0; return 0;
} }
/* /*
@ -255,14 +246,7 @@ int iwctl_giwscan(struct net_device *dev,
long ldBm; long ldBm;
char buf[MAX_WPA_IE_LEN * 2 + 30]; char buf[MAX_WPA_IE_LEN * 2 + 30];
//2008-0409-02, <Mark> by Einsn Liu DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWSCAN\n");
/*
#ifdef Safe_Close
if (!(pDevice->flags & DEVICE_FLAGS_OPENED))
return -EINVAL;
#endif
*/
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWSCAN \n");
if (pMgmt->eScanState == WMAC_IS_SCANNING) { if (pMgmt->eScanState == WMAC_IS_SCANNING) {
// In scanning.. // In scanning..
@ -583,16 +567,8 @@ int iwctl_giwrange(struct net_device *dev,
struct iw_range *range = (struct iw_range *) extra; struct iw_range *range = (struct iw_range *) extra;
int i,k; int i,k;
BYTE abySupportedRates[13]= {0x02, 0x04, 0x0B, 0x16, 0x0c, 0x12, 0x18, 0x24, 0x30, 0x48, 0x60, 0x6C, 0x90}; BYTE abySupportedRates[13]= {0x02, 0x04, 0x0B, 0x16, 0x0c, 0x12, 0x18, 0x24, 0x30, 0x48, 0x60, 0x6C, 0x90};
//2008-0409-02, <Mark> by Einsn Liu
/*
#ifdef Safe_Close
PSDevice pDevice = (PSDevice)netdev_priv(dev);
if (!(pDevice->flags & DEVICE_FLAGS_OPENED))
return -EINVAL;
#endif
*/
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWRANGE \n"); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " SIOCGIWRANGE\n");
if (wrq->pointer) { if (wrq->pointer) {
wrq->length = sizeof(struct iw_range); wrq->length = sizeof(struct iw_range);
memset(range, 0, sizeof(struct iw_range)); memset(range, 0, sizeof(struct iw_range));

5
drivers/staging/vt6656/ttype.h
View File

@ -31,11 +31,6 @@
/******* Common definitions and typedefs ***********************************/ /******* Common definitions and typedefs ***********************************/
//2007-0814-01<Add>by MikeLiu
#ifndef Safe_Close
#define Safe_Close
#endif
//2008-0131-02<Add>by MikeLiu //2008-0131-02<Add>by MikeLiu
#ifndef Adhoc_STA #ifndef Adhoc_STA
#define Adhoc_STA #define Adhoc_STA

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

@ -381,18 +381,6 @@ PIPEnsInterruptRead(
// Now that we have created the urb, we will send a // Now that we have created the urb, we will send a
// request to the USB device object. // request to the USB device object.
// //
#ifndef Safe_Close
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
pDevice->pInterruptURB->interval = pDevice->int_interval; pDevice->pInterruptURB->interval = pDevice->int_interval;
usb_fill_bulk_urb(pDevice->pInterruptURB, usb_fill_bulk_urb(pDevice->pInterruptURB,
@ -402,7 +390,6 @@ usb_fill_bulk_urb(pDevice->pInterruptURB,
MAX_INTERRUPT_SIZE, MAX_INTERRUPT_SIZE,
s_nsInterruptUsbIoCompleteRead, s_nsInterruptUsbIoCompleteRead,
pDevice); pDevice);
#endif
ntStatus = usb_submit_urb(pDevice->pInterruptURB, GFP_ATOMIC); ntStatus = usb_submit_urb(pDevice->pInterruptURB, GFP_ATOMIC);
if (ntStatus != 0) { if (ntStatus != 0) {
@ -483,7 +470,6 @@ s_nsInterruptUsbIoCompleteRead(
if (pDevice->fKillEventPollingThread != TRUE) { if (pDevice->fKillEventPollingThread != TRUE) {
#ifdef Safe_Close
usb_fill_bulk_urb(pDevice->pInterruptURB, usb_fill_bulk_urb(pDevice->pInterruptURB,
pDevice->usb, pDevice->usb,
usb_rcvbulkpipe(pDevice->usb, 1), usb_rcvbulkpipe(pDevice->usb, 1),
@ -496,10 +482,6 @@ s_nsInterruptUsbIoCompleteRead(
if (ntStatus != 0) { if (ntStatus != 0) {
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Submit int URB failed %d\n", ntStatus); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"Submit int URB failed %d\n", ntStatus);
} }
#else
tasklet_schedule(&pDevice->EventWorkItem);
#endif
} }
// //
// We return STATUS_MORE_PROCESSING_REQUIRED so that the completion // We return STATUS_MORE_PROCESSING_REQUIRED so that the completion