From 0ce4977846f1d3990845e82eda9bdd5c51bbfedd Mon Sep 17 00:00:00 2001 From: Larry Finger Date: Fri, 26 Jul 2013 17:02:03 -0500 Subject: [PATCH] rtl8188eu: Convert typedef statements in include/rtw_security.h Signed-off-by: Larry Finger --- include/rtw_security.h | 40 +++++++++++----------------------------- os_dep/ioctl_linux.c | 2 +- os_dep/mlme_linux.c | 11 +++++------ 3 files changed, 17 insertions(+), 36 deletions(-) diff --git a/include/rtw_security.h b/include/rtw_security.h index 83dd962..cdeae4c 100644 --- a/include/rtw_security.h +++ b/include/rtw_security.h @@ -41,14 +41,14 @@ #define AES_BLOCK_SIZE 16 #define AES_PRIV_SIZE (4 * 44) -typedef enum { +enum { ENCRYP_PROTOCOL_OPENSYS, //open system ENCRYP_PROTOCOL_WEP, //WEP ENCRYP_PROTOCOL_WPA, //WPA ENCRYP_PROTOCOL_WPA2, //WPA2 ENCRYP_PROTOCOL_WAPI, //WAPI: Not support in this version ENCRYP_PROTOCOL_MAX -}ENCRYP_PROTOCOL_E; +}; #ifndef Ndis802_11AuthModeWPA2 @@ -99,27 +99,23 @@ union Keytype { }; -typedef struct _RT_PMKID_LIST -{ - u8 bUsed; - u8 Bssid[6]; - u8 PMKID[16]; - u8 SsidBuf[33]; - u8* ssid_octet; - u16 ssid_length; -} RT_PMKID_LIST, *PRT_PMKID_LIST; - +struct rt_pmkid_list { + u8 bUsed; + u8 Bssid[6]; + u8 PMKID[16]; + u8 SsidBuf[33]; + u8* ssid_octet; + u16 ssid_length; +}; struct security_priv { u32 dot11AuthAlgrthm; // 802.11 auth, could be open, shared, 8021x and authswitch u32 dot11PrivacyAlgrthm; // This specify the privacy for shared auth. algorithm. - /* WEP */ u32 dot11PrivacyKeyIndex; // this is only valid for legendary wep, 0~3 for key id. (tx key index) union Keytype dot11DefKey[4]; // this is only valid for def. key u32 dot11DefKeylen[4]; - u32 dot118021XGrpPrivacy; // This specify the privacy algthm. used for Grp key u32 dot118021XGrpKeyid; // key id used for Grp Key ( tx key index) union Keytype dot118021XGrpKey[4]; // 802.1x Group Key, for inx0 and inx1 @@ -127,7 +123,6 @@ struct security_priv union Keytype dot118021XGrprxmickey[4]; union pn48 dot11Grptxpn; // PN48 used for Grp Key xmit. union pn48 dot11Grprxpn; // PN48 used for Grp Key recv. - #ifdef CONFIG_AP_MODE //extend security capabilities for AP_MODE unsigned int dot8021xalg;//0:disable, 1:psk, 2:802.1x @@ -137,28 +132,20 @@ struct security_priv unsigned int wpa_pairwise_cipher; unsigned int wpa2_pairwise_cipher; #endif - u8 wps_ie[MAX_WPS_IE_LEN];//added in assoc req int wps_ie_len; - - u8 binstallGrpkey; u8 busetkipkey; u8 bcheck_grpkey; u8 bgrpkey_handshake; - s32 sw_encrypt;//from registry_priv s32 sw_decrypt;//from registry_priv - s32 hw_decrypted;//if the rx packets is hw_decrypted==false, it means the hw has not been ready. - //keeps the auth_type & enc_status from upper layer ioctl(wpa_supplicant or wzc) u32 ndisauthtype; // NDIS_802_11_AUTHENTICATION_MODE u32 ndisencryptstatus; // NDIS_802_11_ENCRYPTION_STATUS - struct wlan_bssid_ex sec_bss; //for joinbss (h2c buffer) usage - struct ndis_802_11_wep ndiswep; u8 assoc_info[600]; u8 szofcapability[256]; //for wpa2 usage @@ -166,7 +153,6 @@ struct security_priv u8 authenticator_ie[256]; //store ap security information element u8 supplicant_ie[256]; //store sta security information element - //for tkip countermeasure u32 last_mic_err_time; u8 btkip_countermeasure; @@ -177,12 +163,8 @@ struct security_priv // For WPA2 Pre-Authentication. //--------------------------------------------------------------------------- //u8 RegEnablePreAuth; // Default value: Pre-Authentication enabled or not, from registry "EnablePreAuth". Added by Annie, 2005-11-01. - //u8 EnablePreAuthentication; // Current Value: Pre-Authentication enabled or not. - RT_PMKID_LIST PMKIDList[NUM_PMKID_CACHE]; // Renamed from PreAuthKey[NUM_PRE_AUTH_KEY]. Annie, 2006-10-13. + struct rt_pmkid_list PMKIDList[NUM_PMKID_CACHE]; // Renamed from PreAuthKey[NUM_PRE_AUTH_KEY]. Annie, 2006-10-13. u8 PMKIDIndex; - //u32 PMKIDCount; // Added by Annie, 2006-10-13. - //u8 szCapability[256]; // For WPA2-PSK using zero-config, by Annie, 2005-09-20. - u8 bWepDefaultKeyIdxSet; }; diff --git a/os_dep/ioctl_linux.c b/os_dep/ioctl_linux.c index 72bb3c6..e6ed167 100644 --- a/os_dep/ioctl_linux.c +++ b/os_dep/ioctl_linux.c @@ -1254,7 +1254,7 @@ static int rtw_wx_set_pmkid(struct net_device *dev, else if (pPMK->cmd == IW_PMKSA_FLUSH) { DBG_88E("[rtw_wx_set_pmkid] IW_PMKSA_FLUSH!\n"); - _rtw_memset(&psecuritypriv->PMKIDList[ 0 ], 0x00, sizeof(RT_PMKID_LIST) * NUM_PMKID_CACHE); + _rtw_memset(&psecuritypriv->PMKIDList[ 0 ], 0x00, sizeof(struct rt_pmkid_list) * NUM_PMKID_CACHE); psecuritypriv->PMKIDIndex = 0; intReturn = true; } diff --git a/os_dep/mlme_linux.c b/os_dep/mlme_linux.c index 4eda216..41d4eba 100644 --- a/os_dep/mlme_linux.c +++ b/os_dep/mlme_linux.c @@ -90,7 +90,8 @@ void rtw_os_indicate_scan_done( _adapter *padapter, bool aborted) indicate_wx_scan_complete_event(padapter); } -static RT_PMKID_LIST backupPMKIDList[ NUM_PMKID_CACHE ]; +static struct rt_pmkid_list backupPMKIDList[ NUM_PMKID_CACHE ]; + void rtw_reset_securitypriv( _adapter *adapter ) { u8 backupPMKIDIndex = 0; @@ -105,9 +106,9 @@ void rtw_reset_securitypriv( _adapter *adapter ) // Backup the btkip_countermeasure information. // When the countermeasure is trigger, the driver have to disconnect with AP for 60 seconds. - _rtw_memset( &backupPMKIDList[ 0 ], 0x00, sizeof( RT_PMKID_LIST ) * NUM_PMKID_CACHE ); + _rtw_memset( &backupPMKIDList[ 0 ], 0x00, sizeof(struct rt_pmkid_list) * NUM_PMKID_CACHE); - _rtw_memcpy( &backupPMKIDList[ 0 ], &adapter->securitypriv.PMKIDList[ 0 ], sizeof( RT_PMKID_LIST ) * NUM_PMKID_CACHE ); + _rtw_memcpy( &backupPMKIDList[ 0 ], &adapter->securitypriv.PMKIDList[ 0 ], sizeof(struct rt_pmkid_list) * NUM_PMKID_CACHE); backupPMKIDIndex = adapter->securitypriv.PMKIDIndex; backupTKIPCountermeasure = adapter->securitypriv.btkip_countermeasure; backupTKIPcountermeasure_time = adapter->securitypriv.btkip_countermeasure_time; @@ -117,7 +118,7 @@ void rtw_reset_securitypriv( _adapter *adapter ) // Added by Albert 2009/02/18 // Restore the PMK information to securitypriv structure for the following connection. - _rtw_memcpy( &adapter->securitypriv.PMKIDList[ 0 ], &backupPMKIDList[ 0 ], sizeof( RT_PMKID_LIST ) * NUM_PMKID_CACHE ); + _rtw_memcpy( &adapter->securitypriv.PMKIDList[ 0 ], &backupPMKIDList[ 0 ], sizeof(struct rt_pmkid_list) * NUM_PMKID_CACHE); adapter->securitypriv.PMKIDIndex = backupPMKIDIndex; adapter->securitypriv.btkip_countermeasure = backupTKIPCountermeasure; adapter->securitypriv.btkip_countermeasure_time = backupTKIPcountermeasure_time; @@ -147,8 +148,6 @@ void rtw_reset_securitypriv( _adapter *adapter ) void rtw_os_indicate_disconnect( _adapter *adapter ) { - //RT_PMKID_LIST backupPMKIDList[ NUM_PMKID_CACHE ]; - _func_enter_; netif_carrier_off(adapter->pnetdev); // Do it first for tx broadcast pkt after disconnection issue!