From 5583dcf587fa59a5de10b554815f3121919f2648 Mon Sep 17 00:00:00 2001 From: Andres More Date: Sat, 26 Jun 2010 14:08:04 -0300 Subject: [PATCH] staging: vt6656: removed SndEvt_ToAPI definition Removed an always defined macro, perhaps used to patch the driver Signed-off-by: Andres More Signed-off-by: Greg Kroah-Hartman --- drivers/staging/vt6656/bssdb.c | 2 -- drivers/staging/vt6656/device.h | 4 ---- drivers/staging/vt6656/ioctl.c | 2 -- drivers/staging/vt6656/main_usb.c | 8 -------- drivers/staging/vt6656/wmgr.h | 2 -- 5 files changed, 18 deletions(-) diff --git a/drivers/staging/vt6656/bssdb.c b/drivers/staging/vt6656/bssdb.c index be5455326262..830dd23b9279 100644 --- a/drivers/staging/vt6656/bssdb.c +++ b/drivers/staging/vt6656/bssdb.c @@ -1005,7 +1005,6 @@ if(pDevice->byReAssocCount > 0) { pDevice->byReAssocCount = 0; } -#ifdef SndEvt_ToAPI if((pMgmt->eCurrState!=WMAC_STATE_ASSOC) && (pMgmt->eLastState==WMAC_STATE_ASSOC)) { @@ -1015,7 +1014,6 @@ if((pMgmt->eCurrState!=WMAC_STATE_ASSOC) && wireless_send_event(pDevice->dev, IWEVCUSTOM, &wrqu, NULL); } pMgmt->eLastState = pMgmt->eCurrState ; -#endif #ifdef Calcu_LinkQual s_uCalculateLinkQual((void *)pDevice); diff --git a/drivers/staging/vt6656/device.h b/drivers/staging/vt6656/device.h index 628a96948774..8a91d9321a74 100644 --- a/drivers/staging/vt6656/device.h +++ b/drivers/staging/vt6656/device.h @@ -71,9 +71,6 @@ #define WPA_SUPPLICANT_DRIVER_WEXT_SUPPORT #endif -//2007-0920-01by MikeLiu -#ifndef SndEvt_ToAPI -#define SndEvt_ToAPI //please copy below macro to driver_event.c for API #define RT_INSMOD_EVENT_FLAG 0x0101 #define RT_UPDEV_EVENT_FLAG 0x0102 @@ -81,7 +78,6 @@ #define RT_WPACONNECTED_EVENT_FLAG 0x0104 #define RT_DOWNDEV_EVENT_FLAG 0x0105 #define RT_RMMOD_EVENT_FLAG 0x0106 -#endif // // device specific diff --git a/drivers/staging/vt6656/ioctl.c b/drivers/staging/vt6656/ioctl.c index 7c32125fbd51..fc4554f2b420 100644 --- a/drivers/staging/vt6656/ioctl.c +++ b/drivers/staging/vt6656/ioctl.c @@ -676,7 +676,6 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { //DavidWang if(wpa_Result.authenticated==TRUE) { - #ifdef SndEvt_ToAPI { union iwreq_data wrqu; @@ -687,7 +686,6 @@ if(wpa_Result.authenticated==TRUE) { wrqu.data.length =pItemSSID->len; wireless_send_event(pDevice->dev, IWEVCUSTOM, &wrqu, pItemSSID->abySSID); } - #endif pDevice->fWPA_Authened = TRUE; //is successful peer to wpa_Result.authenticated? } diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c index 5dbd61d0c701..37bb5a04c8bd 100644 --- a/drivers/staging/vt6656/main_usb.c +++ b/drivers/staging/vt6656/main_usb.c @@ -813,7 +813,6 @@ vt6656_probe(struct usb_interface *intf, const struct usb_device_id *id) usb_device_reset(pDevice); -#ifdef SndEvt_ToAPI { union iwreq_data wrqu; memset(&wrqu, 0, sizeof(wrqu)); @@ -821,7 +820,6 @@ vt6656_probe(struct usb_interface *intf, const struct usb_device_id *id) wrqu.data.length =IFNAMSIZ; wireless_send_event(pDevice->dev, IWEVCUSTOM, &wrqu, pDevice->dev->name); } -#endif return 0; @@ -1161,14 +1159,12 @@ static int device_open(struct net_device *dev) { netif_stop_queue(pDevice->dev); pDevice->flags |= DEVICE_FLAGS_OPENED; -#ifdef SndEvt_ToAPI { union iwreq_data wrqu; memset(&wrqu, 0, sizeof(wrqu)); wrqu.data.flags = RT_UPDEV_EVENT_FLAG; wireless_send_event(pDevice->dev, IWEVCUSTOM, &wrqu, NULL); } -#endif DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "device_open success.. \n"); return 0; @@ -1200,14 +1196,12 @@ static int device_close(struct net_device *dev) { if (pDevice == NULL) return -ENODEV; -#ifdef SndEvt_ToAPI { union iwreq_data wrqu; memset(&wrqu, 0, sizeof(wrqu)); wrqu.data.flags = RT_DOWNDEV_EVENT_FLAG; wireless_send_event(pDevice->dev, IWEVCUSTOM, &wrqu, NULL); } -#endif //2007-1121-02by EinsnLiu if (pDevice->bLinkPass) { @@ -1283,14 +1277,12 @@ static void __devexit vt6656_disconnect(struct usb_interface *intf) if (!device) return; -#ifdef SndEvt_ToAPI { union iwreq_data req; memset(&req, 0, sizeof(req)); req.data.flags = RT_RMMOD_EVENT_FLAG; wireless_send_event(device->dev, IWEVCUSTOM, &req, NULL); } -#endif device_release_WPADEV(device); diff --git a/drivers/staging/vt6656/wmgr.h b/drivers/staging/vt6656/wmgr.h index 9aa9de399cbf..28f8ad421fde 100644 --- a/drivers/staging/vt6656/wmgr.h +++ b/drivers/staging/vt6656/wmgr.h @@ -259,9 +259,7 @@ typedef struct tagSMgmtObject // Operation state variables WMAC_CURRENT_MODE eCurrMode; // MAC current connection mode WMAC_BSS_STATE eCurrState; // MAC current BSS state - #ifdef SndEvt_ToAPI WMAC_BSS_STATE eLastState; // MAC last BSS state - #endif PKnownBSS pCurrBSS; BYTE byCSSGK; -- 2.34.1