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

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

drivers/staging/vt6656/device.h

+0 −2
Original line number Diff line number Diff line
@@ -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;

drivers/staging/vt6656/iocmd.h

+0 −2
Original line number Diff line number Diff line
@@ -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 {

drivers/staging/vt6656/ioctl.c

+0 −4
Original line number Diff line number Diff line
@@ -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");

drivers/staging/vt6656/main_usb.c

+0 −2
Original line number Diff line number Diff line
@@ -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");

drivers/staging/vt6656/rxtx.c

+0 −6
Original line number Diff line number Diff line
@@ -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;