Commit 5ed3e6f2 authored by Ross Schmidt's avatar Ross Schmidt Committed by Greg Kroah-Hartman
Browse files

staging: rtl8723bs: replace WIFI_REASON_CODE 



Replace unique macros and WIFI_REASON_CODE enum with the kernel provided
ieee80211_reasoncode.

Signed-off-by: default avatarRoss Schmidt <ross.schm.dev@gmail.com>
Link: https://lore.kernel.org/r/20201206034517.4276-2-ross.schm.dev@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6d75b504

drivers/staging/rtl8723bs/core/rtw_mlme_ext.c

+2 −2
Original line number Diff line number Diff line
@@ -1210,7 +1210,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame) 


	pstat = rtw_get_stainfo(pstapriv, GetAddr2Ptr(pframe));

	if (!pstat) {

		status = _RSON_CLS2_;

		status = WLAN_REASON_CLASS2_FRAME_FROM_NONAUTH_STA;

		goto asoc_class2_error;

	}
@@ -1226,7 +1226,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame) 
	/*  check if this stat has been successfully authenticated/assocated */

	if (!((pstat->state) & WIFI_FW_AUTH_SUCCESS)) {

		if (!((pstat->state) & WIFI_FW_ASSOC_SUCCESS)) {

			status = _RSON_CLS2_;

			status = WLAN_REASON_CLASS2_FRAME_FROM_NONAUTH_STA;

			goto asoc_class2_error;

		} else {

			pstat->state &= (~WIFI_FW_ASSOC_SUCCESS);

drivers/staging/rtl8723bs/include/wifi.h

+0 −36
Original line number Diff line number Diff line
@@ -88,42 +88,6 @@ enum WIFI_FRAME_SUBTYPE { 
    WIFI_QOS_DATA_NULL	= (BIT(6) | WIFI_QOS_DATA_TYPE),

};



enum WIFI_REASON_CODE	{

	_RSON_RESERVED_					= 0,

	_RSON_UNSPECIFIED_				= 1,

	_RSON_AUTH_NO_LONGER_VALID_		= 2,

	_RSON_DEAUTH_STA_LEAVING_		= 3,

	_RSON_INACTIVITY_				= 4,

	_RSON_UNABLE_HANDLE_			= 5,

	_RSON_CLS2_						= 6,

	_RSON_CLS3_						= 7,

	_RSON_DISAOC_STA_LEAVING_		= 8,

	_RSON_ASOC_NOT_AUTH_			= 9,



	/*  WPA reason */

	_RSON_INVALID_IE_				= 13,

	_RSON_MIC_FAILURE_				= 14,

	_RSON_4WAY_HNDSHK_TIMEOUT_		= 15,

	_RSON_GROUP_KEY_UPDATE_TIMEOUT_	= 16,

	_RSON_DIFF_IE_					= 17,

	_RSON_MLTCST_CIPHER_NOT_VALID_	= 18,

	_RSON_UNICST_CIPHER_NOT_VALID_	= 19,

	_RSON_AKMP_NOT_VALID_			= 20,

	_RSON_UNSUPPORT_RSNE_VER_		= 21,

	_RSON_INVALID_RSNE_CAP_			= 22,

	_RSON_IEEE_802DOT1X_AUTH_FAIL_	= 23,



	/* belowing are Realtek definition */

	_RSON_PMK_NOT_AVAILABLE_		= 24,

	_RSON_TDLS_TEAR_TOOFAR_			= 25,

	_RSON_TDLS_TEAR_UN_RSN_			= 26,

};



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

/* IEEE 802.11h */

#define WLAN_REASON_PWR_CAPABILITY_NOT_VALID 10

#define WLAN_REASON_SUPPORTED_CHANNEL_NOT_VALID 11



enum WIFI_REG_DOMAIN {

	DOMAIN_FCC		= 1,

	DOMAIN_IC		= 2,