[PATCH 3/3] Move ADD_STA_SELF command to use hal.h

[Eugene Krasnikov]

Signed-off-by: Eugene Krasnikov <k.eugene.e at gmail.com>
---
 hal.h  |  8 ++++----
 main.c |  6 +++---
 smd.c  | 15 +++++++--------
 smd.h  | 17 +----------------
 4 files changed, 15 insertions(+), 31 deletions(-)

diff --git a/hal.h b/hal.h
index 419f141..9bb0ef3 100644
--- a/hal.h
+++ b/hal.h
@@ -3571,14 +3571,14 @@ struct set_p2p_gonoa_rsp_msg {
 	u32 status;
 };
 
-struct add_sta_self_req {
+struct wcn36xx_hal_add_sta_self_req {
 	struct wcn36xx_hal_msg_header header;
 
 	u8 self_addr[ETH_ALEN];
 	u32 status;
-};
+} __packed;
 
-struct add_sta_self_rsp_msg {
+struct wcn36xx_hal_add_sta_self_rsp_msg {
 	struct wcn36xx_hal_msg_header header;
 
 	/* success or failure */
@@ -3592,7 +3592,7 @@ struct add_sta_self_rsp_msg {
 
 	/* DPU Signature */
 	u8 dpu_signature;
-};
+} __packed;
 
 struct del_sta_self_req_msg {
 	struct wcn36xx_hal_msg_header header;
diff --git a/main.c b/main.c
index 30636af..466935a 100644
--- a/main.c
+++ b/main.c
@@ -275,13 +275,13 @@ static int wcn36xx_add_interface(struct ieee80211_hw *hw,
 		switch (vif->type) {
 		case NL80211_IFTYPE_STATION:
 			wcn36xx_info("Add station interface");
-			wcn36xx_smd_add_sta(wcn, wcn->addresses[0], 0);
+			wcn36xx_smd_add_sta_self(wcn, wcn->addresses[0], 0);
 			//TODO Need to find do we really need to add second station? Doubt that
-			wcn36xx_smd_add_sta(wcn, wcn->addresses[1], 1);
+			wcn36xx_smd_add_sta_self(wcn, wcn->addresses[1], 1);
 			break;
 		case NL80211_IFTYPE_AP:
 			wcn36xx_info("Add AP interface");
-			wcn36xx_smd_add_sta(wcn, wcn->addresses[0], 0);
+			wcn36xx_smd_add_sta_self(wcn, wcn->addresses[0], 0);
 			break;
 		default:
 			wcn36xx_info("Add interface=%d", vif->type);
diff --git a/smd.c b/smd.c
index ec84b70..bf37d64 100644
--- a/smd.c
+++ b/smd.c
@@ -258,19 +258,18 @@ static int wcn36xx_smd_update_scan_params_rsp(void *buf, size_t len)
 	return 0;
 }
 
-int wcn36xx_smd_add_sta(struct wcn36xx *wcn, struct mac_address addr, u32 status)
+int wcn36xx_smd_add_sta_self(struct wcn36xx *wcn, struct mac_address addr, u32 status)
 {
-	struct wcn36xx_fw_msg_add_sta_req msg_body;
-	struct wcn36xx_fw_msg_header msg_header;
+	struct wcn36xx_hal_add_sta_self_req msg_body;
 
-	INIT_MSG(msg_header, &msg_body, WCN36XX_FW_MSG_TYPE_ADD_STA_REQ)
+	INIT_HAL_MSG(msg_body, WCN36XX_HAL_ADD_STA_SELF_REQ)
 
-	memcpy(&msg_body.mac, &addr, ETH_ALEN);
+	memcpy(&msg_body.self_addr, &addr, ETH_ALEN);
 	msg_body.status = status;
 
-	PREPARE_BUF(wcn->smd_buf, msg_header, &msg_body)
+	PREPARE_HAL_BUF(wcn->smd_buf, msg_body)
 
-	return wcn36xx_smd_send_and_wait(wcn, msg_header.msg_len);
+	return wcn36xx_smd_send_and_wait(wcn, msg_body.header.len);
 }
 
 int wcn36xx_smd_enter_imps(struct wcn36xx *wcn)
@@ -523,7 +522,7 @@ static void wcn36xx_smd_rsp_process (void *buf, size_t len)
 	case WCN36XX_HAL_START_RSP:
 		wcn36xx_smd_start_rsp(buf, len);
 		break;
-	case WCN36XX_FW_MSG_TYPE_ADD_STA_RSP:
+	case WCN36XX_HAL_ADD_STA_SELF_RSP:
 	case WCN36XX_HAL_INIT_SCAN_RSP:
 	case WCN36XX_HAL_START_SCAN_RSP:
 	case WCN36XX_HAL_END_SCAN_RSP:
diff --git a/smd.h b/smd.h
index 6fce852..ebebbbf 100644
--- a/smd.h
+++ b/smd.h
@@ -57,9 +57,6 @@ enum wcn36xx_fw_msg_type {
 	WCN36XX_FW_MSG_TYPE_ADD_BCN_FILTER_REQ		= 84,
 	WCN36XX_FW_MSG_TYPE_ADD_BCN_FILTER_RSP		= 104,
 
-	WCN36XX_FW_MSG_TYPE_ADD_STA_REQ			= 125,
-	WCN36XX_FW_MSG_TYPE_ADD_STA_RSP			= 126,
-
 	WCN36XX_FW_MSG_TYPE_EX_CAPABILITIES_REQ		= 175,
 	WCN36XX_FW_MSG_TYPE_EX_CAPABILITIES_RSP		= 176
 
@@ -144,18 +141,6 @@ struct wcn36xx_fw_msg_ex_capabilities_req {
 } __packed;
 #define wcn36xx_fw_msg_ex_capabilities_rsp wcn36xx_fw_msg_ex_capabilities_req
 
-/* WCN36XX_FW_MSG_TYPE_ADD_STA_REQ */
-struct wcn36xx_fw_msg_add_sta_req {
-	u8	mac[ETH_ALEN];
-	u32 	status;
-} __packed;
-struct wcn36xx_fw_msg_add_sta_rsp {
-	u32 	status;
-	u8	sta_id;
-	u8	dpu_id;
-	u8	dpu_sign;
-} __packed;
-
 //TODO
 /* WCN36XX_FW_MSG_TYPE_CONFIG_STA_REQ */
 struct wcn36xx_fw_msg_supported_rates {
@@ -324,7 +309,7 @@ int wcn36xx_smd_start_scan(struct wcn36xx *wcn, u8 ch);
 int wcn36xx_smd_end_scan(struct wcn36xx *wcn, u8 ch);
 int wcn36xx_smd_finish_scan(struct wcn36xx *wcn);
 int wcn36xx_smd_update_scan_params(struct wcn36xx *wcn);
-int wcn36xx_smd_add_sta(struct wcn36xx *wcn, struct mac_address addr, u32 status);
+int wcn36xx_smd_add_sta_self(struct wcn36xx *wcn, struct mac_address addr, u32 status);
 int wcn36xx_smd_enter_imps(struct wcn36xx *wcn);
 int wcn36xx_smd_exit_imps(struct wcn36xx *wcn);
 int wcn36xx_smd_join(struct wcn36xx *wcn, u8 *bssid, u8 *vif, u8 ch);
-- 
1.7.11.3