From 24fe608a2d4d78cc1a5f5424a4db5c13e3a00983 Mon Sep 17 00:00:00 2001 From: Andres More Date: Mon, 12 Jul 2010 14:11:27 -0300 Subject: [PATCH 359/524] staging: vt6656: removed WPA_SM_Transtatus 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/device.h | 2 -- drivers/staging/vt6656/iocmd.h | 2 -- drivers/staging/vt6656/ioctl.c | 4 ---- drivers/staging/vt6656/main_usb.c | 2 -- drivers/staging/vt6656/rxtx.c | 6 ------ drivers/staging/vt6656/ttype.h | 4 ---- 6 files changed, 0 insertions(+), 20 deletions(-) diff --git a/drivers/staging/vt6656/device.h b/drivers/staging/vt6656/device.h index 8a91d93..9986bad 100644 --- a/drivers/staging/vt6656/device.h +++ b/drivers/staging/vt6656/device.h @@ -795,9 +795,7 @@ typedef struct __device_info { BOOL fTxDataInSleep; BOOL IsTxDataTrigger; -#ifdef WPA_SM_Transtatus BOOL fWPA_Authened; //is WPA/WPA-PSK or WPA2/WPA2-PSK authen?? -#endif BYTE byReAssocCount; //mike add:re-association retry times! BYTE byLinkWaitCount; diff --git a/drivers/staging/vt6656/iocmd.h b/drivers/staging/vt6656/iocmd.h index ec55eb0..1ce39a4 100644 --- a/drivers/staging/vt6656/iocmd.h +++ b/drivers/staging/vt6656/iocmd.h @@ -143,7 +143,6 @@ typedef struct tagSCmdZoneTypeSet { } SCmdZoneTypeSet, *PSCmdZoneTypeSet; -#ifdef WPA_SM_Transtatus typedef struct tagSWPAResult { char ifname[100]; u8 proto; @@ -151,7 +150,6 @@ typedef struct tagSWPAResult { u8 eap_type; BOOL authenticated; } SWPAResult, *PSWPAResult; -#endif typedef struct tagSCmdStartAP { diff --git a/drivers/staging/vt6656/ioctl.c b/drivers/staging/vt6656/ioctl.c index fc4554f..d532618 100644 --- a/drivers/staging/vt6656/ioctl.c +++ b/drivers/staging/vt6656/ioctl.c @@ -48,9 +48,7 @@ //static int msglevel =MSG_LEVEL_DEBUG; static int msglevel =MSG_LEVEL_INFO; -#ifdef WPA_SM_Transtatus SWPAResult wpa_Result; -#endif /*--------------------- Static Functions --------------------------*/ @@ -656,7 +654,6 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { pReq->wResult = 0; break; -#ifdef WPA_SM_Transtatus case 0xFF: memset(wpa_Result.ifname,0,sizeof(wpa_Result.ifname)); wpa_Result.proto = 0; @@ -698,7 +695,6 @@ if(wpa_Result.authenticated==TRUE) { pReq->wResult = 0; break; -#endif default: DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Private command not support..\n"); diff --git a/drivers/staging/vt6656/main_usb.c b/drivers/staging/vt6656/main_usb.c index d943fb9..217e8a6 100644 --- a/drivers/staging/vt6656/main_usb.c +++ b/drivers/staging/vt6656/main_usb.c @@ -1046,7 +1046,6 @@ BOOL device_alloc_frag_buf(PSDevice pDevice, PSDeFragControlBlock pDeF) { static int device_open(struct net_device *dev) { PSDevice pDevice=(PSDevice) netdev_priv(dev); -#ifdef WPA_SM_Transtatus extern SWPAResult wpa_Result; memset(wpa_Result.ifname,0,sizeof(wpa_Result.ifname)); wpa_Result.proto = 0; @@ -1054,7 +1053,6 @@ static int device_open(struct net_device *dev) { wpa_Result.eap_type = 0; wpa_Result.authenticated = FALSE; pDevice->fWPA_Authened = FALSE; -#endif DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " device_open...\n"); diff --git a/drivers/staging/vt6656/rxtx.c b/drivers/staging/vt6656/rxtx.c index 24437a0..6461d55 100644 --- a/drivers/staging/vt6656/rxtx.c +++ b/drivers/staging/vt6656/rxtx.c @@ -61,10 +61,7 @@ #include "rf.h" #include "datarate.h" #include "usbpipe.h" - -#ifdef WPA_SM_Transtatus #include "iocmd.h" -#endif /*--------------------- Static Definitions -------------------------*/ @@ -2766,9 +2763,6 @@ nsDMA_tx_packet( unsigned int status; WORD wKeepRate = pDevice->wCurrentRate; struct net_device_stats* pStats = &pDevice->stats; -//#ifdef WPA_SM_Transtatus - // extern SWPAResult wpa_Result; -//#endif BOOL bTxeapol_key = FALSE; diff --git a/drivers/staging/vt6656/ttype.h b/drivers/staging/vt6656/ttype.h index 5677e80..a7517a7 100644 --- a/drivers/staging/vt6656/ttype.h +++ b/drivers/staging/vt6656/ttype.h @@ -40,10 +40,6 @@ typedef int BOOL; #define FALSE 0 #endif -#ifndef WPA_SM_Transtatus -#define WPA_SM_Transtatus -#endif - #ifndef Calcu_LinkQual #define Calcu_LinkQual #endif -- 1.7.1