Commit 24fe608a authored by Andres More's avatar Andres More Committed by Greg Kroah-Hartman

staging: vt6656: removed WPA_SM_Transtatus definition

Removed an always defined macro, perhaps used to patch the driver
Signed-off-by: default avatarAndres More <more.andres@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent b7526f14
...@@ -795,9 +795,7 @@ typedef struct __device_info { ...@@ -795,9 +795,7 @@ typedef struct __device_info {
BOOL fTxDataInSleep; BOOL fTxDataInSleep;
BOOL IsTxDataTrigger; BOOL IsTxDataTrigger;
#ifdef WPA_SM_Transtatus
BOOL fWPA_Authened; //is WPA/WPA-PSK or WPA2/WPA2-PSK authen?? BOOL fWPA_Authened; //is WPA/WPA-PSK or WPA2/WPA2-PSK authen??
#endif
BYTE byReAssocCount; //mike add:re-association retry times! BYTE byReAssocCount; //mike add:re-association retry times!
BYTE byLinkWaitCount; BYTE byLinkWaitCount;
......
...@@ -143,7 +143,6 @@ typedef struct tagSCmdZoneTypeSet { ...@@ -143,7 +143,6 @@ typedef struct tagSCmdZoneTypeSet {
} SCmdZoneTypeSet, *PSCmdZoneTypeSet; } SCmdZoneTypeSet, *PSCmdZoneTypeSet;
#ifdef WPA_SM_Transtatus
typedef struct tagSWPAResult { typedef struct tagSWPAResult {
char ifname[100]; char ifname[100];
u8 proto; u8 proto;
...@@ -151,7 +150,6 @@ typedef struct tagSWPAResult { ...@@ -151,7 +150,6 @@ typedef struct tagSWPAResult {
u8 eap_type; u8 eap_type;
BOOL authenticated; BOOL authenticated;
} SWPAResult, *PSWPAResult; } SWPAResult, *PSWPAResult;
#endif
typedef struct tagSCmdStartAP { typedef struct tagSCmdStartAP {
......
...@@ -48,9 +48,7 @@ ...@@ -48,9 +48,7 @@
//static int msglevel =MSG_LEVEL_DEBUG; //static int msglevel =MSG_LEVEL_DEBUG;
static int msglevel =MSG_LEVEL_INFO; static int msglevel =MSG_LEVEL_INFO;
#ifdef WPA_SM_Transtatus
SWPAResult wpa_Result; SWPAResult wpa_Result;
#endif
/*--------------------- Static Functions --------------------------*/ /*--------------------- Static Functions --------------------------*/
...@@ -656,7 +654,6 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) { ...@@ -656,7 +654,6 @@ int private_ioctl(PSDevice pDevice, struct ifreq *rq) {
pReq->wResult = 0; pReq->wResult = 0;
break; break;
#ifdef WPA_SM_Transtatus
case 0xFF: case 0xFF:
memset(wpa_Result.ifname,0,sizeof(wpa_Result.ifname)); memset(wpa_Result.ifname,0,sizeof(wpa_Result.ifname));
wpa_Result.proto = 0; wpa_Result.proto = 0;
...@@ -698,7 +695,6 @@ if(wpa_Result.authenticated==TRUE) { ...@@ -698,7 +695,6 @@ if(wpa_Result.authenticated==TRUE) {
pReq->wResult = 0; pReq->wResult = 0;
break; break;
#endif
default: default:
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Private command not support..\n"); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO "Private command not support..\n");
......
...@@ -1046,7 +1046,6 @@ BOOL device_alloc_frag_buf(PSDevice pDevice, PSDeFragControlBlock pDeF) { ...@@ -1046,7 +1046,6 @@ BOOL device_alloc_frag_buf(PSDevice pDevice, PSDeFragControlBlock pDeF) {
static int device_open(struct net_device *dev) { static int device_open(struct net_device *dev) {
PSDevice pDevice=(PSDevice) netdev_priv(dev); PSDevice pDevice=(PSDevice) netdev_priv(dev);
#ifdef WPA_SM_Transtatus
extern SWPAResult wpa_Result; extern SWPAResult wpa_Result;
memset(wpa_Result.ifname,0,sizeof(wpa_Result.ifname)); memset(wpa_Result.ifname,0,sizeof(wpa_Result.ifname));
wpa_Result.proto = 0; wpa_Result.proto = 0;
...@@ -1054,7 +1053,6 @@ static int device_open(struct net_device *dev) { ...@@ -1054,7 +1053,6 @@ static int device_open(struct net_device *dev) {
wpa_Result.eap_type = 0; wpa_Result.eap_type = 0;
wpa_Result.authenticated = FALSE; wpa_Result.authenticated = FALSE;
pDevice->fWPA_Authened = FALSE; pDevice->fWPA_Authened = FALSE;
#endif
DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " device_open...\n"); DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO " device_open...\n");
......
...@@ -61,10 +61,7 @@ ...@@ -61,10 +61,7 @@
#include "rf.h" #include "rf.h"
#include "datarate.h" #include "datarate.h"
#include "usbpipe.h" #include "usbpipe.h"
#ifdef WPA_SM_Transtatus
#include "iocmd.h" #include "iocmd.h"
#endif
/*--------------------- Static Definitions -------------------------*/ /*--------------------- Static Definitions -------------------------*/
...@@ -2766,9 +2763,6 @@ nsDMA_tx_packet( ...@@ -2766,9 +2763,6 @@ nsDMA_tx_packet(
unsigned int status; unsigned int status;
WORD wKeepRate = pDevice->wCurrentRate; WORD wKeepRate = pDevice->wCurrentRate;
struct net_device_stats* pStats = &pDevice->stats; struct net_device_stats* pStats = &pDevice->stats;
//#ifdef WPA_SM_Transtatus
// extern SWPAResult wpa_Result;
//#endif
BOOL bTxeapol_key = FALSE; BOOL bTxeapol_key = FALSE;
......
...@@ -40,10 +40,6 @@ typedef int BOOL; ...@@ -40,10 +40,6 @@ typedef int BOOL;
#define FALSE 0 #define FALSE 0
#endif #endif
#ifndef WPA_SM_Transtatus
#define WPA_SM_Transtatus
#endif
#ifndef Calcu_LinkQual #ifndef Calcu_LinkQual
#define Calcu_LinkQual #define Calcu_LinkQual
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment