Commit 04fbf979 authored by Paul Gortmaker's avatar Paul Gortmaker Committed by Greg Kroah-Hartman
Browse files

rtl8188eu: don't duplicate ieee80211 constants for status/reason 



These are all defined as a part of the standard and should not be
duplicated on a per-driver basis.  Use the global ones and delete the
local ones.

Note that a couple of them had slight wording differences, things like
INVALID vs. NOT_VALID or similar, so they are aligned with the global
naming conventions here, as dictated by compile testing.

This isn't the totality of duplicated data removed, but it is a start.

Signed-off-by: default avatarPaul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent d4855fe1

drivers/staging/rtl8188eu/core/rtw_ap.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -19,6 +19,8 @@ 
 ******************************************************************************/

 ******************************************************************************/

#define _RTW_AP_C_

#define _RTW_AP_C_





#include <linux/ieee80211.h>



#include <osdep_service.h>

#include <osdep_service.h>

#include <drv_types.h>

#include <drv_types.h>

#include <wifi.h>

#include <wifi.h>

drivers/staging/rtl8188eu/core/rtw_mlme_ext.c

+6 −4
Original line number Original line Diff line number Diff line
@@ -19,6 +19,8 @@ 
 ******************************************************************************/

 ******************************************************************************/

#define _RTW_MLME_EXT_C_

#define _RTW_MLME_EXT_C_





#include <linux/ieee80211.h>



#include <osdep_service.h>

#include <osdep_service.h>

#include <drv_types.h>

#include <drv_types.h>

#include <wifi.h>

#include <wifi.h>
@@ -1048,10 +1050,10 @@ unsigned int OnAssocReq(struct adapter *padapter, struct recv_frame *precv_frame 
			pstat->wpa2_pairwise_cipher = pairwise_cipher&psecuritypriv->wpa2_pairwise_cipher;

			pstat->wpa2_pairwise_cipher = pairwise_cipher&psecuritypriv->wpa2_pairwise_cipher;





			if (!pstat->wpa2_group_cipher)

			if (!pstat->wpa2_group_cipher)

				status = WLAN_STATUS_GROUP_CIPHER_NOT_VALID;

				status = WLAN_STATUS_INVALID_GROUP_CIPHER;





			if (!pstat->wpa2_pairwise_cipher)

			if (!pstat->wpa2_pairwise_cipher)

				status = WLAN_STATUS_PAIRWISE_CIPHER_NOT_VALID;

				status = WLAN_STATUS_INVALID_PAIRWISE_CIPHER;

		} else {

		} else {

			status = WLAN_STATUS_INVALID_IE;

			status = WLAN_STATUS_INVALID_IE;

		}

		}
@@ -1069,10 +1071,10 @@ unsigned int OnAssocReq(struct adapter *padapter, struct recv_frame *precv_frame 
			pstat->wpa_pairwise_cipher = pairwise_cipher&psecuritypriv->wpa_pairwise_cipher;

			pstat->wpa_pairwise_cipher = pairwise_cipher&psecuritypriv->wpa_pairwise_cipher;





			if (!pstat->wpa_group_cipher)

			if (!pstat->wpa_group_cipher)

				status = WLAN_STATUS_GROUP_CIPHER_NOT_VALID;

				status = WLAN_STATUS_INVALID_GROUP_CIPHER;





			if (!pstat->wpa_pairwise_cipher)

			if (!pstat->wpa_pairwise_cipher)

				status = WLAN_STATUS_PAIRWISE_CIPHER_NOT_VALID;

				status = WLAN_STATUS_INVALID_PAIRWISE_CIPHER;

		} else {

		} else {

			status = WLAN_STATUS_INVALID_IE;

			status = WLAN_STATUS_INVALID_IE;

		}

		}

drivers/staging/rtl8188eu/core/rtw_recv.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -19,6 +19,8 @@ 
 ******************************************************************************/

 ******************************************************************************/

#define _RTW_RECV_C_

#define _RTW_RECV_C_





#include <linux/ieee80211.h>



#include <osdep_service.h>

#include <osdep_service.h>

#include <drv_types.h>

#include <drv_types.h>

#include <recv_osdep.h>

#include <recv_osdep.h>

drivers/staging/rtl8188eu/include/ieee80211.h

+1 −28
Original line number Original line Diff line number Diff line
@@ -493,34 +493,7 @@ struct ieee80211_snap_hdr { 
#define WLAN_CAPABILITY_CHANNEL_AGILITY (1<<7)

#define WLAN_CAPABILITY_CHANNEL_AGILITY (1<<7)

#define WLAN_CAPABILITY_SHORT_SLOT (1<<10)

#define WLAN_CAPABILITY_SHORT_SLOT (1<<10)





/* Status codes */

/* Non standard?  Not in <linux/ieee80211.h> */

#define WLAN_STATUS_SUCCESS 0

#define WLAN_STATUS_UNSPECIFIED_FAILURE 1

#define WLAN_STATUS_CAPS_UNSUPPORTED 10

#define WLAN_STATUS_REASSOC_NO_ASSOC 11

#define WLAN_STATUS_ASSOC_DENIED_UNSPEC 12

#define WLAN_STATUS_NOT_SUPPORTED_AUTH_ALG 13

#define WLAN_STATUS_UNKNOWN_AUTH_TRANSACTION 14

#define WLAN_STATUS_CHALLENGE_FAIL 15

#define WLAN_STATUS_AUTH_TIMEOUT 16

#define WLAN_STATUS_AP_UNABLE_TO_HANDLE_NEW_STA 17

#define WLAN_STATUS_ASSOC_DENIED_RATES 18

/* 802.11b */

#define WLAN_STATUS_ASSOC_DENIED_NOSHORT 19

#define WLAN_STATUS_ASSOC_DENIED_NOPBCC 20

#define WLAN_STATUS_ASSOC_DENIED_NOAGILITY 21



/* Reason codes */

#define WLAN_REASON_UNSPECIFIED 1

#define WLAN_REASON_PREV_AUTH_NOT_VALID 2

#define WLAN_REASON_DEAUTH_LEAVING 3

#define WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY 4

#define WLAN_REASON_DISASSOC_AP_BUSY 5

#define WLAN_REASON_CLASS2_FRAME_FROM_NONAUTH_STA 6

#define WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA 7

#define WLAN_REASON_DISASSOC_STA_HAS_LEFT 8

#define WLAN_REASON_STA_REQ_ASSOC_WITHOUT_AUTH 9

#define WLAN_REASON_JOIN_WRONG_CHANNEL       65534

#define WLAN_REASON_EXPIRATION_CHK 65535

#define WLAN_REASON_EXPIRATION_CHK 65535





/* Information Element IDs */

/* Information Element IDs */

drivers/staging/rtl8188eu/include/wifi.h

+0 −77
Original line number Original line Diff line number Diff line
@@ -130,35 +130,6 @@ enum WIFI_REASON_CODE { 
	_RSON_TDLS_TEAR_UN_RSN_		= 26,

	_RSON_TDLS_TEAR_UN_RSN_		= 26,

};

};





/* Reason codes (IEEE 802.11-2007, 7.3.1.7, Table 7-22)



#define WLAN_REASON_UNSPECIFIED 1

#define WLAN_REASON_PREV_AUTH_NOT_VALID 2

#define WLAN_REASON_DEAUTH_LEAVING 3

#define WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY 4

#define WLAN_REASON_DISASSOC_AP_BUSY 5

#define WLAN_REASON_CLASS2_FRAME_FROM_NONAUTH_STA 6

#define WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA 7

#define WLAN_REASON_DISASSOC_STA_HAS_LEFT 8

#define WLAN_REASON_STA_REQ_ASSOC_WITHOUT_AUTH 9 */

/* IEEE 802.11h */

#define WLAN_REASON_PWR_CAPABILITY_NOT_VALID 10

#define WLAN_REASON_SUPPORTED_CHANNEL_NOT_VALID 11



/* IEEE 802.11i

#define WLAN_REASON_INVALID_IE 13

#define WLAN_REASON_MICHAEL_MIC_FAILURE 14

#define WLAN_REASON_4WAY_HANDSHAKE_TIMEOUT 15

#define WLAN_REASON_GROUP_KEY_UPDATE_TIMEOUT 16

#define WLAN_REASON_IE_IN_4WAY_DIFFERS 17

#define WLAN_REASON_GROUP_CIPHER_NOT_VALID 18

#define WLAN_REASON_PAIRWISE_CIPHER_NOT_VALID 19

#define WLAN_REASON_AKMP_NOT_VALID 20

#define WLAN_REASON_UNSUPPORTED_RSN_IE_VERSION 21

#define WLAN_REASON_INVALID_RSN_IE_CAPAB 22

#define WLAN_REASON_IEEE_802_1X_AUTH_FAILED 23

#define WLAN_REASON_CIPHER_SUITE_REJECTED 24 */



enum WIFI_STATUS_CODE {

enum WIFI_STATUS_CODE {

	_STATS_SUCCESSFUL_		= 0,

	_STATS_SUCCESSFUL_		= 0,

	_STATS_FAILURE_			= 1,

	_STATS_FAILURE_			= 1,
@@ -173,54 +144,6 @@ enum WIFI_STATUS_CODE { 
	_STATS_RATE_FAIL_		= 18,

	_STATS_RATE_FAIL_		= 18,

};

};





/* Status codes (IEEE 802.11-2007, 7.3.1.9, Table 7-23)

#define WLAN_STATUS_SUCCESS 0

#define WLAN_STATUS_UNSPECIFIED_FAILURE 1

#define WLAN_STATUS_CAPS_UNSUPPORTED 10

#define WLAN_STATUS_REASSOC_NO_ASSOC 11

#define WLAN_STATUS_ASSOC_DENIED_UNSPEC 12

#define WLAN_STATUS_NOT_SUPPORTED_AUTH_ALG 13

#define WLAN_STATUS_UNKNOWN_AUTH_TRANSACTION 14

#define WLAN_STATUS_CHALLENGE_FAIL 15

#define WLAN_STATUS_AUTH_TIMEOUT 16

#define WLAN_STATUS_AP_UNABLE_TO_HANDLE_NEW_STA 17

#define WLAN_STATUS_ASSOC_DENIED_RATES 18 */



/* entended */

/* IEEE 802.11b */

#define WLAN_STATUS_ASSOC_DENIED_NOSHORT 19

#define WLAN_STATUS_ASSOC_DENIED_NOPBCC 20

#define WLAN_STATUS_ASSOC_DENIED_NOAGILITY 21

/* IEEE 802.11h */

#define WLAN_STATUS_SPEC_MGMT_REQUIRED 22

#define WLAN_STATUS_PWR_CAPABILITY_NOT_VALID 23

#define WLAN_STATUS_SUPPORTED_CHANNEL_NOT_VALID 24

/* IEEE 802.11g */

#define WLAN_STATUS_ASSOC_DENIED_NO_SHORT_SLOT_TIME 25

#define WLAN_STATUS_ASSOC_DENIED_NO_ER_PBCC 26

#define WLAN_STATUS_ASSOC_DENIED_NO_DSSS_OFDM 27

/* IEEE 802.11w */

#define WLAN_STATUS_ASSOC_REJECTED_TEMPORARILY 30

#define WLAN_STATUS_ROBUST_MGMT_FRAME_POLICY_VIOLATION 31

/* IEEE 802.11i */

#define WLAN_STATUS_INVALID_IE 40

#define WLAN_STATUS_GROUP_CIPHER_NOT_VALID 41

#define WLAN_STATUS_PAIRWISE_CIPHER_NOT_VALID 42

#define WLAN_STATUS_AKMP_NOT_VALID 43

#define WLAN_STATUS_UNSUPPORTED_RSN_IE_VERSION 44

#define WLAN_STATUS_INVALID_RSN_IE_CAPAB 45

#define WLAN_STATUS_CIPHER_REJECTED_PER_POLICY 46

#define WLAN_STATUS_TS_NOT_CREATED 47

#define WLAN_STATUS_DIRECT_LINK_NOT_ALLOWED 48

#define WLAN_STATUS_DEST_STA_NOT_PRESENT 49

#define WLAN_STATUS_DEST_STA_NOT_QOS_STA 50

#define WLAN_STATUS_ASSOC_DENIED_LISTEN_INT_TOO_LARGE 51

/* IEEE 802.11r */

#define WLAN_STATUS_INVALID_FT_ACTION_FRAME_COUNT 52

#define WLAN_STATUS_INVALID_PMKID 53

#define WLAN_STATUS_INVALID_MDIE 54

#define WLAN_STATUS_INVALID_FTIE 55



enum WIFI_REG_DOMAIN {

enum WIFI_REG_DOMAIN {

	DOMAIN_FCC	= 1,

	DOMAIN_FCC	= 1,

	DOMAIN_IC	= 2,

	DOMAIN_IC	= 2,