staging: rtl8723bs: replace unique macros and WIFI_STATUS_CODE
Replace many unique macros and WIFI_STATUS_CODE enum with kernel provided ieee80211_statuscode. A duplicate WLAN_STATUS_ASSOC_DENIED_NOSHORT macro is also removed. Signed-off-by: Ross Schmidt <ross.schm.dev@gmail.com> Link: https://lore.kernel.org/r/20201206034517.4276-1-ross.schm.dev@gmail.com Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ross Schmidt
Greg Kroah-Hartman
Родитель
e77b259f67
Коммит
6d75b5044b
|
|
@ -940,13 +940,13 @@ unsigned int OnAuth(struct adapter *padapter, union recv_frame *precv_frame)
|
|||
DBG_871X("auth rejected due to bad alg [alg =%d, auth_mib =%d] %02X%02X%02X%02X%02X%02X\n",
|
||||
algorithm, auth_mode, sa[0], sa[1], sa[2], sa[3], sa[4], sa[5]);
|
||||
|
||||
status = _STATS_NO_SUPP_ALG_;
|
||||
status = WLAN_STATUS_NOT_SUPPORTED_AUTH_ALG;
|
||||
|
||||
goto auth_fail;
|
||||
}
|
||||
|
||||
if (rtw_access_ctrl(padapter, sa) == false) {
|
||||
status = _STATS_UNABLE_HANDLE_STA_;
|
||||
status = WLAN_STATUS_AP_UNABLE_TO_HANDLE_NEW_STA;
|
||||
goto auth_fail;
|
||||
}
|
||||
|
||||
|
|
@ -958,7 +958,7 @@ unsigned int OnAuth(struct adapter *padapter, union recv_frame *precv_frame)
|
|||
pstat = rtw_alloc_stainfo(pstapriv, sa);
|
||||
if (pstat == NULL) {
|
||||
DBG_871X(" Exceed the upper limit of supported clients...\n");
|
||||
status = _STATS_UNABLE_HANDLE_STA_;
|
||||
status = WLAN_STATUS_AP_UNABLE_TO_HANDLE_NEW_STA;
|
||||
goto auth_fail;
|
||||
}
|
||||
|
||||
|
|
@ -999,7 +999,7 @@ unsigned int OnAuth(struct adapter *padapter, union recv_frame *precv_frame)
|
|||
if ((pstat->auth_seq + 1) != seq) {
|
||||
DBG_871X("(1)auth rejected because out of seq [rx_seq =%d, exp_seq =%d]!\n",
|
||||
seq, pstat->auth_seq+1);
|
||||
status = _STATS_OUT_OF_AUTH_SEQ_;
|
||||
status = WLAN_STATUS_UNKNOWN_AUTH_TRANSACTION;
|
||||
goto auth_fail;
|
||||
}
|
||||
|
||||
|
|
@ -1012,7 +1012,7 @@ unsigned int OnAuth(struct adapter *padapter, union recv_frame *precv_frame)
|
|||
} else {
|
||||
DBG_871X("(2)auth rejected because out of seq [rx_seq =%d, exp_seq =%d]!\n",
|
||||
seq, pstat->auth_seq+1);
|
||||
status = _STATS_OUT_OF_AUTH_SEQ_;
|
||||
status = WLAN_STATUS_UNKNOWN_AUTH_TRANSACTION;
|
||||
goto auth_fail;
|
||||
}
|
||||
} else { /* shared system or auto authentication */
|
||||
|
|
@ -1033,7 +1033,7 @@ unsigned int OnAuth(struct adapter *padapter, union recv_frame *precv_frame)
|
|||
|
||||
if ((p == NULL) || (ie_len <= 0)) {
|
||||
DBG_871X("auth rejected because challenge failure!(1)\n");
|
||||
status = _STATS_CHALLENGE_FAIL_;
|
||||
status = WLAN_STATUS_CHALLENGE_FAIL;
|
||||
goto auth_fail;
|
||||
}
|
||||
|
||||
|
|
@ -1044,13 +1044,13 @@ unsigned int OnAuth(struct adapter *padapter, union recv_frame *precv_frame)
|
|||
pstat->expire_to = pstapriv->assoc_to;
|
||||
} else {
|
||||
DBG_871X("auth rejected because challenge failure!\n");
|
||||
status = _STATS_CHALLENGE_FAIL_;
|
||||
status = WLAN_STATUS_CHALLENGE_FAIL;
|
||||
goto auth_fail;
|
||||
}
|
||||
} else {
|
||||
DBG_871X("(3)auth rejected because out of seq [rx_seq =%d, exp_seq =%d]!\n",
|
||||
seq, pstat->auth_seq+1);
|
||||
status = _STATS_OUT_OF_AUTH_SEQ_;
|
||||
status = WLAN_STATUS_UNKNOWN_AUTH_TRANSACTION;
|
||||
goto auth_fail;
|
||||
}
|
||||
}
|
||||
|
|
@ -1059,7 +1059,7 @@ unsigned int OnAuth(struct adapter *padapter, union recv_frame *precv_frame)
|
|||
/* Now, we are going to issue_auth... */
|
||||
pstat->auth_seq = seq + 1;
|
||||
|
||||
issue_auth(padapter, pstat, (unsigned short)(_STATS_SUCCESSFUL_));
|
||||
issue_auth(padapter, pstat, (unsigned short)(WLAN_STATUS_SUCCESS));
|
||||
|
||||
if (pstat->state & WIFI_FW_AUTH_SUCCESS)
|
||||
pstat->auth_seq = 0;
|
||||
|
|
@ -1178,7 +1178,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)
|
|||
int i, ie_len, wpa_ie_len, left;
|
||||
unsigned char supportRate[16];
|
||||
int supportRateNum;
|
||||
unsigned short status = _STATS_SUCCESSFUL_;
|
||||
unsigned short status = WLAN_STATUS_SUCCESS;
|
||||
unsigned short frame_type, ie_offset = 0;
|
||||
struct mlme_priv *pmlmepriv = &padapter->mlmepriv;
|
||||
struct security_priv *psecuritypriv = &padapter->securitypriv;
|
||||
|
|
@ -1245,7 +1245,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)
|
|||
!elems.ssid) {
|
||||
DBG_871X("STA %pM sent invalid association request\n",
|
||||
MAC_ARG(pstat->hwaddr));
|
||||
status = _STATS_FAILURE_;
|
||||
status = WLAN_STATUS_CHALLENGE_FAIL;
|
||||
goto OnAssocReqFail;
|
||||
}
|
||||
|
||||
|
|
@ -1256,18 +1256,18 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)
|
|||
|
||||
if (!p || ie_len == 0) {
|
||||
/* broadcast ssid, however it is not allowed in assocreq */
|
||||
status = _STATS_FAILURE_;
|
||||
status = WLAN_STATUS_CHALLENGE_FAIL;
|
||||
goto OnAssocReqFail;
|
||||
} else {
|
||||
/* check if ssid match */
|
||||
if (memcmp((void *)(p+2), cur->Ssid.Ssid, cur->Ssid.SsidLength))
|
||||
status = _STATS_FAILURE_;
|
||||
status = WLAN_STATUS_CHALLENGE_FAIL;
|
||||
|
||||
if (ie_len != cur->Ssid.SsidLength)
|
||||
status = _STATS_FAILURE_;
|
||||
status = WLAN_STATUS_CHALLENGE_FAIL;
|
||||
}
|
||||
|
||||
if (status != _STATS_SUCCESSFUL_)
|
||||
if (status != WLAN_STATUS_SUCCESS)
|
||||
goto OnAssocReqFail;
|
||||
|
||||
/* check if the supported rate is ok */
|
||||
|
|
@ -1278,7 +1278,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)
|
|||
/* memcpy(supportRate, AP_BSSRATE, AP_BSSRATE_LEN); */
|
||||
/* supportRateNum = AP_BSSRATE_LEN; */
|
||||
|
||||
status = _STATS_FAILURE_;
|
||||
status = WLAN_STATUS_CHALLENGE_FAIL;
|
||||
goto OnAssocReqFail;
|
||||
} else {
|
||||
memcpy(supportRate, p+2, ie_len);
|
||||
|
|
@ -1326,10 +1326,10 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)
|
|||
pstat->wpa2_pairwise_cipher = pairwise_cipher&psecuritypriv->wpa2_pairwise_cipher;
|
||||
|
||||
if (!pstat->wpa2_group_cipher)
|
||||
status = WLAN_STATUS_GROUP_CIPHER_NOT_VALID;
|
||||
status = WLAN_STATUS_INVALID_GROUP_CIPHER;
|
||||
|
||||
if (!pstat->wpa2_pairwise_cipher)
|
||||
status = WLAN_STATUS_PAIRWISE_CIPHER_NOT_VALID;
|
||||
status = WLAN_STATUS_INVALID_PAIRWISE_CIPHER;
|
||||
} else {
|
||||
status = WLAN_STATUS_INVALID_IE;
|
||||
}
|
||||
|
|
@ -1349,10 +1349,10 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)
|
|||
pstat->wpa_pairwise_cipher = pairwise_cipher&psecuritypriv->wpa_pairwise_cipher;
|
||||
|
||||
if (!pstat->wpa_group_cipher)
|
||||
status = WLAN_STATUS_GROUP_CIPHER_NOT_VALID;
|
||||
status = WLAN_STATUS_INVALID_GROUP_CIPHER;
|
||||
|
||||
if (!pstat->wpa_pairwise_cipher)
|
||||
status = WLAN_STATUS_PAIRWISE_CIPHER_NOT_VALID;
|
||||
status = WLAN_STATUS_INVALID_PAIRWISE_CIPHER;
|
||||
|
||||
} else {
|
||||
status = WLAN_STATUS_INVALID_IE;
|
||||
|
|
@ -1363,7 +1363,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)
|
|||
wpa_ie_len = 0;
|
||||
}
|
||||
|
||||
if (status != _STATS_SUCCESSFUL_)
|
||||
if (status != WLAN_STATUS_SUCCESS)
|
||||
goto OnAssocReqFail;
|
||||
|
||||
pstat->flags &= ~(WLAN_STA_WPS | WLAN_STA_MAYBE_WPS);
|
||||
|
|
@ -1396,7 +1396,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)
|
|||
if (!selected_registrar) {
|
||||
DBG_871X("selected_registrar is false , or AP is not ready to do WPS\n");
|
||||
|
||||
status = _STATS_UNABLE_HANDLE_STA_;
|
||||
status = WLAN_STATUS_AP_UNABLE_TO_HANDLE_NEW_STA;
|
||||
|
||||
goto OnAssocReqFail;
|
||||
}
|
||||
|
|
@ -1507,7 +1507,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)
|
|||
|
||||
|
||||
if ((pmlmepriv->htpriv.ht_option == false) && (pstat->flags&WLAN_STA_HT)) {
|
||||
status = _STATS_FAILURE_;
|
||||
status = WLAN_STATUS_CHALLENGE_FAIL;
|
||||
goto OnAssocReqFail;
|
||||
}
|
||||
|
||||
|
|
@ -1517,7 +1517,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)
|
|||
(pstat->wpa_pairwise_cipher&WPA_CIPHER_TKIP))) {
|
||||
DBG_871X("HT: %pM tried to use TKIP with HT association\n", MAC_ARG(pstat->hwaddr));
|
||||
|
||||
/* status = WLAN_STATUS_CIPHER_REJECTED_PER_POLICY; */
|
||||
/* status = WLAN_STATUS_CIPHER_SUITE_REJECTED; */
|
||||
/* goto OnAssocReqFail; */
|
||||
}
|
||||
pstat->flags |= WLAN_STA_NONERP;
|
||||
|
|
@ -1535,7 +1535,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)
|
|||
|
||||
|
||||
|
||||
if (status != _STATS_SUCCESSFUL_)
|
||||
if (status != WLAN_STATUS_SUCCESS)
|
||||
goto OnAssocReqFail;
|
||||
|
||||
/* TODO: identify_proprietary_vendor_ie(); */
|
||||
|
|
@ -1592,7 +1592,7 @@ unsigned int OnAssocReq(struct adapter *padapter, union recv_frame *precv_frame)
|
|||
spin_unlock_bh(&pstapriv->asoc_list_lock);
|
||||
|
||||
/* now the station is qualified to join our BSS... */
|
||||
if (pstat && (pstat->state & WIFI_FW_ASSOC_SUCCESS) && (_STATS_SUCCESSFUL_ == status)) {
|
||||
if (pstat && (pstat->state & WIFI_FW_ASSOC_SUCCESS) && (WLAN_STATUS_SUCCESS == status)) {
|
||||
/* 1 bss_cap_update & sta_info_update */
|
||||
bss_cap_update_on_sta_join(padapter, pstat);
|
||||
sta_info_update(padapter, pstat);
|
||||
|
|
@ -3004,7 +3004,7 @@ void issue_auth(struct adapter *padapter, struct sta_info *psta, unsigned short
|
|||
/* setting auth algo number */
|
||||
val16 = (u16)psta->authalg;
|
||||
|
||||
if (status != _STATS_SUCCESSFUL_)
|
||||
if (status != WLAN_STATUS_SUCCESS)
|
||||
val16 = 0;
|
||||
|
||||
if (val16)
|
||||
|
|
|
|||
|
|
@ -347,9 +347,6 @@ struct ieee80211_snap_hdr {
|
|||
#define WLAN_CAPABILITY_BSS (1<<0)
|
||||
#define WLAN_CAPABILITY_SHORT_SLOT (1<<10)
|
||||
|
||||
/* 802.11b */
|
||||
#define WLAN_STATUS_ASSOC_DENIED_NOSHORT 19
|
||||
|
||||
/* Reason codes */
|
||||
#define WLAN_REASON_ACTIVE_ROAM 65533
|
||||
#define WLAN_REASON_JOIN_WRONG_CHANNEL 65534
|
||||
|
|
|
|||
|
|
@ -124,57 +124,6 @@ enum WIFI_REASON_CODE {
|
|||
#define WLAN_REASON_PWR_CAPABILITY_NOT_VALID 10
|
||||
#define WLAN_REASON_SUPPORTED_CHANNEL_NOT_VALID 11
|
||||
|
||||
enum WIFI_STATUS_CODE {
|
||||
_STATS_SUCCESSFUL_ = 0,
|
||||
_STATS_FAILURE_ = 1,
|
||||
_STATS_CAP_FAIL_ = 10,
|
||||
_STATS_NO_ASOC_ = 11,
|
||||
_STATS_OTHER_ = 12,
|
||||
_STATS_NO_SUPP_ALG_ = 13,
|
||||
_STATS_OUT_OF_AUTH_SEQ_ = 14,
|
||||
_STATS_CHALLENGE_FAIL_ = 15,
|
||||
_STATS_AUTH_TIMEOUT_ = 16,
|
||||
_STATS_UNABLE_HANDLE_STA_ = 17,
|
||||
_STATS_RATE_FAIL_ = 18,
|
||||
};
|
||||
|
||||
/* Status codes (IEEE 802.11-2007, 7.3.1.9, Table 7-23) */
|
||||
/* 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 {
|
||||
DOMAIN_FCC = 1,
|
||||
DOMAIN_IC = 2,
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче