OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

staging: vt6656: removed WPA_SM_Transtatus 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 14:11:27 -03:00 committed by Greg Kroah-Hartman
parent b7526f1460
commit 24fe608a2d
6 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/vt6656/device.h
View File

@ -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;

2
drivers/staging/vt6656/iocmd.h
View File

@ -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 {

4
drivers/staging/vt6656/ioctl.c
View File

@ -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");

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

@ -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");

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

@ -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;

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

@ -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