qcacld-3.0: Replace typedef tSirSmeDeauthRsp
The Linux Coding Style enumerates a few special cases where typedefs are useful, but stresses "NEVER EVER use a typedef unless you can clearly match one of those rules." The tSirSmeDeauthRsp typedef does not meet any of those criteria, so replace it (and the "tp" variant) with a reference to the underlying struct. Further note the Linux Coding Style frowns upon mixed-case names and so-called Hungarian notation, so in conjunction rename the underlying struct to be in compliance. Change-Id: I6c04ecb351bc22aae748dc04c2cb0110c111a760 CRs-Fixed: 2395992
这个提交包含在:
@@ -1296,14 +1296,14 @@ struct deauth_req {
|
|||||||
};
|
};
|
||||||
|
|
||||||
/* / Definition for Deauthetication response */
|
/* / Definition for Deauthetication response */
|
||||||
typedef struct sSirSmeDeauthRsp {
|
struct deauth_rsp {
|
||||||
uint16_t messageType; /* eWNI_SME_DEAUTH_RSP */
|
uint16_t messageType; /* eWNI_SME_DEAUTH_RSP */
|
||||||
uint16_t length;
|
uint16_t length;
|
||||||
uint8_t sessionId; /* Session ID */
|
uint8_t sessionId; /* Session ID */
|
||||||
uint16_t transactionId; /* Transaction ID for cmd */
|
uint16_t transactionId; /* Transaction ID for cmd */
|
||||||
tSirResultCodes statusCode;
|
tSirResultCodes statusCode;
|
||||||
struct qdf_mac_addr peer_macaddr;
|
struct qdf_mac_addr peer_macaddr;
|
||||||
} tSirSmeDeauthRsp, *tpSirSmeDeauthRsp;
|
};
|
||||||
|
|
||||||
/* / Definition for Deauthetication indication from peer */
|
/* / Definition for Deauthetication indication from peer */
|
||||||
typedef struct sSirSmeDeauthInd {
|
typedef struct sSirSmeDeauthInd {
|
||||||
|
@@ -1575,7 +1575,7 @@ lim_process_mlm_deauth_req_ntf(struct mac_context *mac_ctx,
|
|||||||
tLimMlmDeauthReq *mlm_deauth_req;
|
tLimMlmDeauthReq *mlm_deauth_req;
|
||||||
tLimMlmDeauthCnf mlm_deauth_cnf;
|
tLimMlmDeauthCnf mlm_deauth_cnf;
|
||||||
struct pe_session *session;
|
struct pe_session *session;
|
||||||
tSirSmeDeauthRsp *sme_deauth_rsp;
|
struct deauth_rsp *sme_deauth_rsp;
|
||||||
|
|
||||||
if (QDF_STATUS_SUCCESS != suspend_status)
|
if (QDF_STATUS_SUCCESS != suspend_status)
|
||||||
pe_err("Suspend Status is not success %X",
|
pe_err("Suspend Status is not success %X",
|
||||||
@@ -1624,7 +1624,7 @@ lim_process_mlm_deauth_req_ntf(struct mac_context *mac_ctx,
|
|||||||
* deauthentication
|
* deauthentication
|
||||||
*/
|
*/
|
||||||
sme_deauth_rsp =
|
sme_deauth_rsp =
|
||||||
qdf_mem_malloc(sizeof(tSirSmeDeauthRsp));
|
qdf_mem_malloc(sizeof(*sme_deauth_rsp));
|
||||||
if (!sme_deauth_rsp) {
|
if (!sme_deauth_rsp) {
|
||||||
qdf_mem_free(mlm_deauth_req);
|
qdf_mem_free(mlm_deauth_req);
|
||||||
return;
|
return;
|
||||||
@@ -1638,7 +1638,7 @@ lim_process_mlm_deauth_req_ntf(struct mac_context *mac_ctx,
|
|||||||
sme_deauth_rsp->messageType =
|
sme_deauth_rsp->messageType =
|
||||||
eWNI_SME_DEAUTH_RSP;
|
eWNI_SME_DEAUTH_RSP;
|
||||||
sme_deauth_rsp->length =
|
sme_deauth_rsp->length =
|
||||||
sizeof(tSirSmeDeauthRsp);
|
sizeof(*sme_deauth_rsp);
|
||||||
sme_deauth_rsp->statusCode =
|
sme_deauth_rsp->statusCode =
|
||||||
eSIR_SME_DEAUTH_STATUS;
|
eSIR_SME_DEAUTH_STATUS;
|
||||||
sme_deauth_rsp->sessionId =
|
sme_deauth_rsp->sessionId =
|
||||||
|
@@ -1175,7 +1175,7 @@ lim_send_sme_deauth_ntf(struct mac_context *mac, tSirMacAddr peerMacAddr,
|
|||||||
uint16_t smetransactionId)
|
uint16_t smetransactionId)
|
||||||
{
|
{
|
||||||
uint8_t *pBuf;
|
uint8_t *pBuf;
|
||||||
tSirSmeDeauthRsp *pSirSmeDeauthRsp;
|
struct deauth_rsp *pSirSmeDeauthRsp;
|
||||||
tSirSmeDeauthInd *pSirSmeDeauthInd;
|
tSirSmeDeauthInd *pSirSmeDeauthInd;
|
||||||
struct pe_session *pe_session;
|
struct pe_session *pe_session;
|
||||||
uint8_t sessionId;
|
uint8_t sessionId;
|
||||||
@@ -1189,13 +1189,14 @@ lim_send_sme_deauth_ntf(struct mac_context *mac, tSirMacAddr peerMacAddr,
|
|||||||
* Deauthentication response to host triggered
|
* Deauthentication response to host triggered
|
||||||
* deauthentication.
|
* deauthentication.
|
||||||
*/
|
*/
|
||||||
pSirSmeDeauthRsp = qdf_mem_malloc(sizeof(tSirSmeDeauthRsp));
|
pSirSmeDeauthRsp = qdf_mem_malloc(sizeof(*pSirSmeDeauthRsp));
|
||||||
if (!pSirSmeDeauthRsp)
|
if (!pSirSmeDeauthRsp)
|
||||||
return;
|
return;
|
||||||
pe_debug("send eWNI_SME_DEAUTH_RSP with retCode: %d for" MAC_ADDRESS_STR,
|
pe_debug("send eWNI_SME_DEAUTH_RSP with retCode: %d for "
|
||||||
reasonCode, MAC_ADDR_ARRAY(peerMacAddr));
|
MAC_ADDRESS_STR,
|
||||||
|
reasonCode, MAC_ADDR_ARRAY(peerMacAddr));
|
||||||
pSirSmeDeauthRsp->messageType = eWNI_SME_DEAUTH_RSP;
|
pSirSmeDeauthRsp->messageType = eWNI_SME_DEAUTH_RSP;
|
||||||
pSirSmeDeauthRsp->length = sizeof(tSirSmeDeauthRsp);
|
pSirSmeDeauthRsp->length = sizeof(*pSirSmeDeauthRsp);
|
||||||
pSirSmeDeauthRsp->statusCode = reasonCode;
|
pSirSmeDeauthRsp->statusCode = reasonCode;
|
||||||
pSirSmeDeauthRsp->sessionId = smesessionId;
|
pSirSmeDeauthRsp->sessionId = smesessionId;
|
||||||
pSirSmeDeauthRsp->transactionId = smetransactionId;
|
pSirSmeDeauthRsp->transactionId = smetransactionId;
|
||||||
|
@@ -228,7 +228,7 @@ bool csr_is_nullssid(uint8_t *pBssSsid, uint8_t len);
|
|||||||
bool csr_is_infra_bss_desc(tSirBssDescription *pSirBssDesc);
|
bool csr_is_infra_bss_desc(tSirBssDescription *pSirBssDesc);
|
||||||
bool csr_is_ibss_bss_desc(tSirBssDescription *pSirBssDesc);
|
bool csr_is_ibss_bss_desc(tSirBssDescription *pSirBssDesc);
|
||||||
bool csr_is_privacy(tSirBssDescription *pSirBssDesc);
|
bool csr_is_privacy(tSirBssDescription *pSirBssDesc);
|
||||||
tSirResultCodes csr_get_de_auth_rsp_status_code(tSirSmeDeauthRsp *pSmeRsp);
|
tSirResultCodes csr_get_de_auth_rsp_status_code(struct deauth_rsp *pSmeRsp);
|
||||||
uint32_t csr_get_frag_thresh(struct mac_context *mac_ctx);
|
uint32_t csr_get_frag_thresh(struct mac_context *mac_ctx);
|
||||||
uint32_t csr_get_rts_thresh(struct mac_context *mac_ctx);
|
uint32_t csr_get_rts_thresh(struct mac_context *mac_ctx);
|
||||||
uint32_t csr_get11h_power_constraint(struct mac_context *mac_ctx,
|
uint32_t csr_get11h_power_constraint(struct mac_context *mac_ctx,
|
||||||
|
@@ -9379,7 +9379,7 @@ POST_ROAM_FAILURE:
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void csr_roam_roaming_state_deauth_rsp_processor(struct mac_context *mac,
|
static void csr_roam_roaming_state_deauth_rsp_processor(struct mac_context *mac,
|
||||||
tSirSmeDeauthRsp *pSmeRsp)
|
struct deauth_rsp *pSmeRsp)
|
||||||
{
|
{
|
||||||
tSirResultCodes statusCode;
|
tSirResultCodes statusCode;
|
||||||
/* No one is sending eWNI_SME_DEAUTH_REQ to PE. */
|
/* No one is sending eWNI_SME_DEAUTH_REQ to PE. */
|
||||||
@@ -9496,7 +9496,7 @@ void csr_roaming_state_msg_processor(struct mac_context *mac, void *pMsgBuf)
|
|||||||
pSmeRsp->sessionId,
|
pSmeRsp->sessionId,
|
||||||
eSmeCommandWmStatusChange);
|
eSmeCommandWmStatusChange);
|
||||||
csr_roam_roaming_state_deauth_rsp_processor(mac,
|
csr_roam_roaming_state_deauth_rsp_processor(mac,
|
||||||
(tSirSmeDeauthRsp *) pSmeRsp);
|
(struct deauth_rsp *) pSmeRsp);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case eWNI_SME_START_BSS_RSP:
|
case eWNI_SME_START_BSS_RSP:
|
||||||
@@ -10992,7 +10992,7 @@ csr_roam_chk_lnk_deauth_rsp(struct mac_context *mac_ctx, tSirSmeRsp *msg_ptr)
|
|||||||
uint32_t sessionId = CSR_SESSION_ID_INVALID;
|
uint32_t sessionId = CSR_SESSION_ID_INVALID;
|
||||||
QDF_STATUS status;
|
QDF_STATUS status;
|
||||||
struct csr_roam_info *roam_info_ptr = NULL;
|
struct csr_roam_info *roam_info_ptr = NULL;
|
||||||
tSirSmeDeauthRsp *pDeauthRsp = (tSirSmeDeauthRsp *) msg_ptr;
|
struct deauth_rsp *pDeauthRsp = (struct deauth_rsp *) msg_ptr;
|
||||||
struct csr_roam_info roam_info;
|
struct csr_roam_info roam_info;
|
||||||
|
|
||||||
qdf_mem_zero(&roam_info, sizeof(roam_info));
|
qdf_mem_zero(&roam_info, sizeof(roam_info));
|
||||||
|
@@ -5758,7 +5758,7 @@ void csr_free_connect_bss_desc(struct mac_context *mac, uint32_t sessionId)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
tSirResultCodes csr_get_de_auth_rsp_status_code(tSirSmeDeauthRsp *pSmeRsp)
|
tSirResultCodes csr_get_de_auth_rsp_status_code(struct deauth_rsp *pSmeRsp)
|
||||||
{
|
{
|
||||||
uint8_t *pBuffer = (uint8_t *) pSmeRsp;
|
uint8_t *pBuffer = (uint8_t *) pSmeRsp;
|
||||||
uint32_t ret;
|
uint32_t ret;
|
||||||
|
在新工单中引用
屏蔽一个用户