Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1382174

[PATCH v3 17/18] wcn36xx: Correct remove bss key response encoding

Show all headers | View raw

The WCN36XX_HAL_RMV_BSSKEY_RSP carries a single u32 with "status", so we
can use the standard status check function for decoding the result.

This is the last user of the v2 status checker, so remove the struct and
helper function.

Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
---

Changes since v2:
- Added this patch to the series

 drivers/net/wireless/ath/wcn36xx/smd.c | 19 +------------------
 drivers/net/wireless/ath/wcn36xx/smd.h |  9 ---------
 2 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/drivers/net/wireless/ath/wcn36xx/smd.c b/drivers/net/wireless/ath/wcn36xx/smd.c
index c15501c06eb2..5f6ca3124bd8 100644
--- a/drivers/net/wireless/ath/wcn36xx/smd.c
+++ b/drivers/net/wireless/ath/wcn36xx/smd.c
@@ -312,22 +312,6 @@ static int wcn36xx_smd_rsp_status_check(void *buf, size_t len)
 	return 0;
 }
 
-static int wcn36xx_smd_rsp_status_check_v2(struct wcn36xx *wcn, void *buf,
-					     size_t len)
-{
-	struct wcn36xx_fw_msg_status_rsp_v2 *rsp;
-
-	if (len < sizeof(struct wcn36xx_hal_msg_header) + sizeof(*rsp))
-		return wcn36xx_smd_rsp_status_check(buf, len);
-
-	rsp = buf + sizeof(struct wcn36xx_hal_msg_header);
-
-	if (WCN36XX_FW_MSG_RESULT_SUCCESS != rsp->status)
-		return rsp->status;
-
-	return 0;
-}
-
 int wcn36xx_smd_load_nv(struct wcn36xx *wcn)
 {
 	struct nv_data *nv_d;
@@ -1647,8 +1631,7 @@ int wcn36xx_smd_remove_bsskey(struct wcn36xx *wcn,
 		wcn36xx_err("Sending hal_remove_bsskey failed\n");
 		goto out;
 	}
-	ret = wcn36xx_smd_rsp_status_check_v2(wcn, wcn->hal_buf,
-					      wcn->hal_rsp_len);
+	ret = wcn36xx_smd_rsp_status_check(wcn->hal_buf, wcn->hal_rsp_len);
 	if (ret) {
 		wcn36xx_err("hal_remove_bsskey response failed err=%d\n", ret);
 		goto out;
diff --git a/drivers/net/wireless/ath/wcn36xx/smd.h b/drivers/net/wireless/ath/wcn36xx/smd.h
index c1b76d75cf85..d74d781f4c8d 100644
--- a/drivers/net/wireless/ath/wcn36xx/smd.h
+++ b/drivers/net/wireless/ath/wcn36xx/smd.h
@@ -44,15 +44,6 @@ struct wcn36xx_fw_msg_status_rsp {
 	u32	status;
 } __packed;
 
-/* wcn3620 returns this for tigger_ba */
-
-struct wcn36xx_fw_msg_status_rsp_v2 {
-	u8	bss_id[6];
-	u32	status __packed;
-	u16	count_following_candidates __packed;
-	/* candidate list follows */
-};
-
 struct wcn36xx_hal_ind_msg {
 	struct list_head list;
 	u8 *msg;
-- 
2.5.0

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v3 00/18] wcn36xx fixes Bjorn Andersson <bjorn.andersson@linaro.org> - 2016-04-19 07:10 +0200
  [PATCH v3 08/18] wcn36xx: Remove sta pointer in private vif struct Bjorn Andersson <bjorn.andersson@linaro.org> - 2016-04-19 07:10 +0200
  [PATCH v3 11/18] wcn36xx: Use allocated self sta index instead of hard coded Bjorn Andersson <bjorn.andersson@linaro.org> - 2016-04-19 07:10 +0200
  [PATCH v3 09/18] wcn36xx: Parse trigger_ba response properly Bjorn Andersson <bjorn.andersson@linaro.org> - 2016-04-19 07:10 +0200
  [PATCH v3 05/18] wcn36xx: Use define for invalid index and fix typo Bjorn Andersson <bjorn.andersson@linaro.org> - 2016-04-19 07:10 +0200
  [PATCH v3 18/18] wcn36xx: Fill in capability list Bjorn Andersson <bjorn.andersson@linaro.org> - 2016-04-19 07:10 +0200
  [PATCH v3 07/18] wcn36xx: Fetch private sta data from sta entry instead of from vif Bjorn Andersson <bjorn.andersson@linaro.org> - 2016-04-19 07:10 +0200
  [PATCH v3 16/18] wcn36xx: Delete BSS before idling link Bjorn Andersson <bjorn.andersson@linaro.org> - 2016-04-19 07:10 +0200
  [PATCH v3 06/18] wcn36xx: Add helper macros to cast sta to priv Bjorn Andersson <bjorn.andersson@linaro.org> - 2016-04-19 07:10 +0200
    Re: [PATCH v3 06/18] wcn36xx: Add helper macros to cast sta to priv Joe Perches <joe@perches.com> - 2016-04-19 10:50 +0200
  [PATCH v3 17/18] wcn36xx: Correct remove bss key response encoding Bjorn Andersson <bjorn.andersson@linaro.org> - 2016-04-19 07:10 +0200
  [PATCH v3 10/18] wcn36xx: Copy all members in config_sta v1 conversion Bjorn Andersson <bjorn.andersson@linaro.org> - 2016-04-19 07:10 +0200
  [PATCH v3 14/18] wcn36xx: Implement multicast filtering Bjorn Andersson <bjorn.andersson@linaro.org> - 2016-04-19 07:10 +0200
  [PATCH v3 02/18] wcn36xx: Pad TIM PVM if needed Bjorn Andersson <bjorn.andersson@linaro.org> - 2016-04-19 07:10 +0200
  [PATCH v3 04/18] wcn36xx: Use consistent name for private vif Bjorn Andersson <bjorn.andersson@linaro.org> - 2016-04-19 07:10 +0200
  [PATCH v3 15/18] wcn36xx: Use correct command struct for EXIT_BMPS_REQ Bjorn Andersson <bjorn.andersson@linaro.org> - 2016-04-19 07:10 +0200
  [PATCH v3 01/18] wcn36xx: Clean up wcn36xx_smd_send_beacon Bjorn Andersson <bjorn.andersson@linaro.org> - 2016-04-19 07:10 +0200
  [PATCH v3 12/18] wcn36xx: Clear encrypt_type when deleting bss key Bjorn Andersson <bjorn.andersson@linaro.org> - 2016-04-19 07:10 +0200
  [PATCH v3 13/18] wcn36xx: Track association state Bjorn Andersson <bjorn.andersson@linaro.org> - 2016-04-19 07:10 +0200
  Re: [PATCH v3 00/18] wcn36xx fixes Kalle Valo <kvalo@codeaurora.org> - 2016-04-25 20:00 +0200

csiph-web