From 53c7ac825fe267c26eb1c378d3dff4743f0badcb Mon Sep 17 00:00:00 2001
From: Govind Singh <govinds@codeaurora.org>
Date: Mon, 28 Mar 2016 22:02:42 +0530
Subject: [PATCH] qcacmn: Fix tlv formation of Peer assoc wmi command

Fix TLV header length calculation and pass peer mac address in
wmi peer assoc command.

Change-Id: I025ad7564901cba583bd78bddf0ccfa5e894c751
CRs-Fixed: 987362
---
 wmi_unified_param.h |  4 ----
 wmi_unified_priv.h  | 11 +++++++++++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/wmi_unified_param.h b/wmi_unified_param.h
index 577d54746d..cae9ccd163 100644
--- a/wmi_unified_param.h
+++ b/wmi_unified_param.h
@@ -391,8 +391,6 @@ struct beacon_params {
  * @peer_ht_info: peer HT info
  * @peer_legacy_rates: peer legacy rates
  * @peer_ht_rates: peer ht rates
- * @num_peer_legacy_rates: no of peer legacy rates
- * @num_peer_ht_rates: no of peer ht rates
  * @rx_max_rate: max rx rates
  * @rx_mcs_set: rx mcs
  * @tx_max_rate: max tx rates
@@ -417,8 +415,6 @@ struct peer_assoc_params {
 	uint32_t peer_ht_info[2];
 	wmi_rate_set peer_legacy_rates;
 	wmi_rate_set peer_ht_rates;
-	uint32_t num_peer_legacy_rates;
-	uint32_t num_peer_ht_rates;
 	uint32_t rx_max_rate;
 	uint32_t rx_mcs_set;
 	uint32_t tx_max_rate;
diff --git a/wmi_unified_priv.h b/wmi_unified_priv.h
index afdcae90f0..55fd7bee86 100644
--- a/wmi_unified_priv.h
+++ b/wmi_unified_priv.h
@@ -641,4 +641,15 @@ struct wmi_unified {
 };
 struct wmi_ops *wmi_get_tlv_ops(void);
 struct wmi_ops *wmi_get_non_tlv_ops(void);
+
+/**
+ * wmi_align() - provides word aligned parameter
+ * @param: parameter to be aligned
+ *
+ * Return: word aligned parameter
+ */
+static inline uint32_t wmi_align(uint32_t param)
+{
+	return roundup(param, sizeof(uint32_t));
+}
 #endif