Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38ad4a00 authored by Malcolm Priestley's avatar Malcolm Priestley Committed by Greg Kroah-Hartman
Browse files

staging: vt6655: dead code remove ndis and pmkid strutures. 



struct pmkid_candidate
typedef struct _BSSID_INFO
typedef struct tagSPMKID
typedef struct tagSPMKIDCandidateEvent
NDIS_802_11_MAC_ADDRESS
typedef struct _NDIS_802_11_AI_REQFI
typedef struct _NDIS_802_11_AI_RESFI
typedef struct _NDIS_802_11_ASSOCIATION_INFORMATION
typedef struct tagSAssocInfo

Signed-off-by: default avatarMalcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ab2eb50a

drivers/staging/vt6655/device.h

+0 −26
Original line number Original line Diff line number Diff line
@@ -216,29 +216,6 @@ typedef enum _NDIS_802_11_STATUS_TYPE { 
	Ndis802_11StatusTypeMax    /* defined as an upper bound */

	Ndis802_11StatusTypeMax    /* defined as an upper bound */

} NDIS_802_11_STATUS_TYPE, *PNDIS_802_11_STATUS_TYPE;

} NDIS_802_11_STATUS_TYPE, *PNDIS_802_11_STATUS_TYPE;





/* Added new types for PMKID Candidate lists. */

struct pmkid_candidate {

	NDIS_802_11_MAC_ADDRESS BSSID;

	unsigned long Flags;

};



typedef struct _BSSID_INFO {

	NDIS_802_11_MAC_ADDRESS BSSID;

	NDIS_802_11_PMKID_VALUE PMKID;

} BSSID_INFO, *PBSSID_INFO;



typedef struct tagSPMKID {

	unsigned long Length;

	unsigned long BSSIDInfoCount;

	BSSID_INFO BSSIDInfo[MAX_BSSIDINFO_4_PMKID];

} SPMKID, *PSPMKID;



typedef struct tagSPMKIDCandidateEvent {

	NDIS_802_11_STATUS_TYPE     StatusType;

	unsigned long Version;       /* Version of the structure */

	unsigned long NumCandidates; /* No. of pmkid candidates */

	struct pmkid_candidate CandidateList[MAX_PMKIDLIST];

} SPMKIDCandidateEvent, *PSPMKIDCandidateEvent;





/* 802.11h related */

/* 802.11h related */

#define MAX_QUIET_COUNT     8

#define MAX_QUIET_COUNT     8
@@ -667,9 +644,6 @@ struct vnt_private { 
	unsigned char abySNAP_RFC1042[ETH_ALEN];

	unsigned char abySNAP_RFC1042[ETH_ALEN];

	unsigned char abySNAP_Bridgetunnel[ETH_ALEN];

	unsigned char abySNAP_Bridgetunnel[ETH_ALEN];

	unsigned char abyEEPROM[EEP_MAX_CONTEXT_SIZE]; /* unsigned long alignment */

	unsigned char abyEEPROM[EEP_MAX_CONTEXT_SIZE]; /* unsigned long alignment */

	/* Pre-Authentication & PMK cache */

	SPMKID                  gsPMKID;

	SPMKIDCandidateEvent    gsPMKIDCandidate;





	/* for 802.11h */

	/* for 802.11h */

	bool b11hEnable;

	bool b11hEnable;

drivers/staging/vt6655/wmgr.h

+0 −35
Original line number Original line Diff line number Diff line
@@ -78,39 +78,4 @@ 
#define timer_expire(timer, next_tick)   mod_timer(&timer, RUN_AT(next_tick))

#define timer_expire(timer, next_tick)   mod_timer(&timer, RUN_AT(next_tick))

typedef void (*TimerFunction)(unsigned long);

typedef void (*TimerFunction)(unsigned long);





//+++ NDIS related



typedef unsigned char NDIS_802_11_MAC_ADDRESS[6];

typedef struct _NDIS_802_11_AI_REQFI {

	unsigned short Capabilities;

	unsigned short ListenInterval;

	NDIS_802_11_MAC_ADDRESS  CurrentAPAddress;

} NDIS_802_11_AI_REQFI, *PNDIS_802_11_AI_REQFI;



typedef struct _NDIS_802_11_AI_RESFI {

	unsigned short Capabilities;

	unsigned short StatusCode;

	unsigned short AssociationId;

} NDIS_802_11_AI_RESFI, *PNDIS_802_11_AI_RESFI;



typedef struct _NDIS_802_11_ASSOCIATION_INFORMATION {

	unsigned long Length;

	unsigned short          AvailableRequestFixedIEs;

	NDIS_802_11_AI_REQFI    RequestFixedIEs;

	unsigned long RequestIELength;

	unsigned long OffsetRequestIEs;

	unsigned short          AvailableResponseFixedIEs;

	NDIS_802_11_AI_RESFI    ResponseFixedIEs;

	unsigned long ResponseIELength;

	unsigned long OffsetResponseIEs;

} NDIS_802_11_ASSOCIATION_INFORMATION, *PNDIS_802_11_ASSOCIATION_INFORMATION;



typedef struct tagSAssocInfo {

	NDIS_802_11_ASSOCIATION_INFORMATION     AssocInfo;

	unsigned char abyIEs[WLAN_BEACON_FR_MAXLEN+WLAN_BEACON_FR_MAXLEN];

	// store ReqIEs set by OID_802_11_ASSOCIATION_INFORMATION

	unsigned long RequestIELength;

	unsigned char abyReqIEs[WLAN_BEACON_FR_MAXLEN];

} SAssocInfo, *PSAssocInfo;



#endif // __WMGR_H__
 
#endif // __WMGR_H__