Commit 21b8461f authored by Ivan Safonov's avatar Ivan Safonov Committed by Greg Kroah-Hartman

staging: r8188eu: remove some structure definitions from wlan_bssdef.h

ndis_802_11_ai_reqfi, ndis_802_11_ai_resfi, ndis_802_11_assoc_info,
ndis_802_11_remove_key, ndis_802_11_auth_req, ndis_802_11_status_ind,
ndis_802_11_auth_evt, ndis_802_11_test, pmkid_candidate, ndis_802_11_pmkid_list,
ndis_802_11_auth_encrypt and ndis_802_11_cap structures are not used.
Signed-off-by: default avatarIvan Safonov <insafonov@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 50a619d5
...@@ -123,40 +123,10 @@ enum ndis_802_11_wep_status { ...@@ -123,40 +123,10 @@ enum ndis_802_11_wep_status {
#define NDIS_802_11_AI_RESFI_STATUSCODE 2 #define NDIS_802_11_AI_RESFI_STATUSCODE 2
#define NDIS_802_11_AI_RESFI_ASSOCIATIONID 4 #define NDIS_802_11_AI_RESFI_ASSOCIATIONID 4
struct ndis_802_11_ai_reqfi {
u16 Capabilities;
u16 ListenInterval;
unsigned char CurrentAPAddress[ETH_ALEN];
};
struct ndis_802_11_ai_resfi {
u16 Capabilities;
u16 StatusCode;
u16 AssociationId;
};
struct ndis_802_11_assoc_info {
u32 Length;
u16 AvailableRequestFixedIEs;
struct ndis_802_11_ai_reqfi RequestFixedIEs;
u32 RequestIELength;
u32 OffsetRequestIEs;
u16 AvailableResponseFixedIEs;
struct ndis_802_11_ai_resfi ResponseFixedIEs;
u32 ResponseIELength;
u32 OffsetResponseIEs;
};
enum ndis_802_11_reload_def { enum ndis_802_11_reload_def {
Ndis802_11ReloadWEPKeys Ndis802_11ReloadWEPKeys
}; };
struct ndis_802_11_remove_key {
u32 Length; /* Length */
u32 KeyIndex;
unsigned char BSSID[ETH_ALEN];
};
struct ndis_802_11_wep { struct ndis_802_11_wep {
u32 Length; /* Length of this structure */ u32 Length; /* Length of this structure */
u32 KeyIndex; /* 0 is the per-client key, u32 KeyIndex; /* 0 is the per-client key,
...@@ -165,12 +135,6 @@ struct ndis_802_11_wep { ...@@ -165,12 +135,6 @@ struct ndis_802_11_wep {
u8 KeyMaterial[16];/* variable len depending on above field */ u8 KeyMaterial[16];/* variable len depending on above field */
}; };
struct ndis_802_11_auth_req {
u32 Length; /* Length of structure */
unsigned char Bssid[ETH_ALEN];
u32 Flags;
};
enum ndis_802_11_status_type { enum ndis_802_11_status_type {
Ndis802_11StatusType_Authentication, Ndis802_11StatusType_Authentication,
Ndis802_11StatusType_MediaStreamMode, Ndis802_11StatusType_MediaStreamMode,
...@@ -179,10 +143,6 @@ enum ndis_802_11_status_type { ...@@ -179,10 +143,6 @@ enum ndis_802_11_status_type {
* an upper bound */ * an upper bound */
}; };
struct ndis_802_11_status_ind {
enum ndis_802_11_status_type StatusType;
};
/* mask for authentication/integrity fields */ /* mask for authentication/integrity fields */
#define NDIS_802_11_AUTH_REQUEST_AUTH_FIELDS 0x0f #define NDIS_802_11_AUTH_REQUEST_AUTH_FIELDS 0x0f
#define NDIS_802_11_AUTH_REQUEST_REAUTH 0x01 #define NDIS_802_11_AUTH_REQUEST_REAUTH 0x01
...@@ -193,21 +153,6 @@ struct ndis_802_11_status_ind { ...@@ -193,21 +153,6 @@ struct ndis_802_11_status_ind {
/* MIC check time, 60 seconds. */ /* MIC check time, 60 seconds. */
#define MIC_CHECK_TIME 60000000 #define MIC_CHECK_TIME 60000000
struct ndis_802_11_auth_evt {
struct ndis_802_11_status_ind Status;
struct ndis_802_11_auth_req Request[1];
};
struct ndis_802_11_test {
u32 Length;
u32 Type;
union {
struct ndis_802_11_auth_evt AuthenticationEvent;
NDIS_802_11_RSSI RssiTrigger;
} tt;
};
#ifndef Ndis802_11APMode #ifndef Ndis802_11APMode
#define Ndis802_11APMode (Ndis802_11InfrastructureMax+1) #define Ndis802_11APMode (Ndis802_11InfrastructureMax+1)
#endif #endif
...@@ -297,32 +242,4 @@ enum UAPSD_MAX_SP { ...@@ -297,32 +242,4 @@ enum UAPSD_MAX_SP {
#define NUM_PRE_AUTH_KEY 16 #define NUM_PRE_AUTH_KEY 16
#define NUM_PMKID_CACHE NUM_PRE_AUTH_KEY #define NUM_PMKID_CACHE NUM_PRE_AUTH_KEY
/*
* WPA2
*/
struct pmkid_candidate {
unsigned char BSSID[ETH_ALEN];
u32 Flags;
};
struct ndis_802_11_pmkid_list {
u32 Version; /* Version of the structure */
u32 NumCandidates; /* No. of pmkid candidates */
struct pmkid_candidate CandidateList[1];
};
struct ndis_802_11_auth_encrypt {
enum ndis_802_11_auth_mode AuthModeSupported;
enum ndis_802_11_wep_status EncryptStatusSupported;
};
struct ndis_802_11_cap {
u32 Length;
u32 Version;
u32 NoOfPMKIDs;
u32 NoOfAuthEncryptPairsSupported;
struct ndis_802_11_auth_encrypt AuthenticationEncryptionSupported[1];
};
#endif /* ifndef WLAN_BSSDEF_H_ */ #endif /* ifndef WLAN_BSSDEF_H_ */
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