diff --git a/wmi_unified_api.h b/wmi_unified_api.h
index 7e86d2c48f..61f5722ad7 100644
--- a/wmi_unified_api.h
+++ b/wmi_unified_api.h
@@ -292,11 +292,9 @@ wmi_unified_pdev_param_send(void *wmi_hdl,
 				uint8_t mac_id);
 
 int32_t wmi_unified_beacon_send_cmd(void *wmi_hdl,
-				uint8_t macaddr[IEEE80211_ADDR_LEN],
 				struct beacon_params *param);
 
 int32_t wmi_unified_peer_assoc_send(void *wmi_hdl,
-				uint8_t macaddr[IEEE80211_ADDR_LEN],
 				struct peer_assoc_params *param);
 
 int32_t wmi_unified_sta_ps_cmd_send(void *wmi_hdl,
@@ -307,15 +305,12 @@ int32_t wmi_unified_ap_ps_cmd_send(void *wmi_hdl,
 				struct ap_ps_params *param);
 
 int32_t wmi_unified_scan_start_cmd_send(void *wmi_hdl,
-				uint8_t macaddr[IEEE80211_ADDR_LEN],
 				struct scan_start_params *param);
 
 int32_t wmi_unified_scan_stop_cmd_send(void *wmi_hdl,
-				uint8_t macaddr[IEEE80211_ADDR_LEN],
 				struct scan_stop_params *param);
 
 int32_t wmi_unified_scan_chan_list_cmd_send(void *wmi_hdl,
-				uint8_t macaddr[IEEE80211_ADDR_LEN],
 				struct scan_chan_list_params *param);
 
 
diff --git a/wmi_unified_non_tlv.h b/wmi_unified_non_tlv.h
index 9e6fc5a1f0..54ba3bf802 100644
--- a/wmi_unified_non_tlv.h
+++ b/wmi_unified_non_tlv.h
@@ -113,22 +113,17 @@ int32_t send_packet_log_enable_cmd_non_tlv(wmi_unified_t wmi_handle,
 				struct packet_enable_params *param);
 
 int32_t send_beacon_send_cmd_non_tlv(wmi_unified_t wmi_handle,
-				uint8_t macaddr[IEEE80211_ADDR_LEN],
 				struct beacon_params *param);
 
 int32_t send_peer_assoc_cmd_non_tlv(wmi_unified_t wmi_handle,
-				uint8_t macaddr[IEEE80211_ADDR_LEN],
 				struct peer_assoc_params *param);
 
 int32_t send_scan_start_cmd_non_tlv(wmi_unified_t wmi_handle,
-				uint8_t macaddr[IEEE80211_ADDR_LEN],
 				struct scan_start_params *param);
 
 int32_t send_scan_stop_cmd_non_tlv(wmi_unified_t wmi_handle,
-				uint8_t macaddr[IEEE80211_ADDR_LEN],
 				struct scan_stop_params *param);
 
 int32_t send_scan_chan_list_cmd_non_tlv(wmi_unified_t wmi_handle,
-				uint8_t macaddr[IEEE80211_ADDR_LEN],
 				struct scan_chan_list_params *param);
 
diff --git a/wmi_unified_param.h b/wmi_unified_param.h
index 4f5bb925cf..0b214846f3 100644
--- a/wmi_unified_param.h
+++ b/wmi_unified_param.h
@@ -34,14 +34,12 @@
 #define _WMI_UNIFIED_PARAM_H_
 #include "wmi_unified.h"
 #define IEEE80211_ADDR_LEN  6  /* size of 802.11 address */
-#define MAX_UTF_EVENT_LENGTH    2048
 #define WMI_MAC_MAX_SSID_LENGTH              32
 #define WMI_SCAN_MAX_NUM_SSID                0x0A
 #define mgmt_tx_dl_frm_len 64
 #define WMI_SMPS_MASK_LOWER_16BITS 0xFF
 #define WMI_SMPS_MASK_UPPER_3BITS 0x7
 #define WMI_SMPS_PARAM_VALUE_S 29
-#define MAX_WMI_UTF_LEN         252
 /**
  * struct vdev_create_params - vdev create cmd parameter
  * @if_id: interface id
@@ -528,5 +526,42 @@ struct wmi_mgmt_params {
 	struct wmi_desc_t *wmi_desc;
 	void *cdf_ctx;
 };
+
+/**
+ * struct p2p_ps_params - P2P powersave related params
+ * @opp_ps: opportunistic power save
+ * @ctwindow: CT window
+ * @count: count
+ * @duration: duration
+ * @interval: interval
+ * @single_noa_duration: single shot noa duration
+ * @ps_selection: power save selection
+ * @session_id: session id
+ */
+struct p2p_ps_params {
+	uint8_t opp_ps;
+	uint32_t ctwindow;
+	uint8_t count;
+	uint32_t duration;
+	uint32_t interval;
+	uint32_t single_noa_duration;
+	uint8_t ps_selection;
+	uint8_t session_id;
+};
+
+
+/**
+ * struct ta_uapsd_trig_params - uapsd trigger parameter
+ * @vdevid: vdev id
+ * @peer_addr: peer address
+ * @auto_triggerparam: trigger parameters
+ * @num_ac: no of access category
+ */
+struct sta_uapsd_trig_params {
+		uint32_t vdevid;
+		uint8_t peer_addr[IEEE80211_ADDR_LEN];
+		uint8_t *auto_triggerparam;
+		uint32_t num_ac;
+};
 #endif /* _WMI_UNIFIED_PARAM_H_ */
 
diff --git a/wmi_unified_priv.h b/wmi_unified_priv.h
index ec7b37886a..b350b9b056 100644
--- a/wmi_unified_priv.h
+++ b/wmi_unified_priv.h
@@ -151,23 +151,18 @@ int32_t (*send_packet_log_enable_cmd)(wmi_unified_t wmi_handle,
 				struct packet_enable_params *param);
 
 int32_t (*send_beacon_send_cmd)(wmi_unified_t wmi_handle,
-				uint8_t macaddr[IEEE80211_ADDR_LEN],
 				struct beacon_params *param);
 
 int32_t (*send_peer_assoc_cmd)(wmi_unified_t wmi_handle,
-				uint8_t macaddr[IEEE80211_ADDR_LEN],
 				struct peer_assoc_params *param);
 
 int32_t (*send_scan_start_cmd)(wmi_unified_t wmi_handle,
-				uint8_t macaddr[IEEE80211_ADDR_LEN],
 				struct scan_start_params *param);
 
 int32_t (*send_scan_stop_cmd)(wmi_unified_t wmi_handle,
-				uint8_t macaddr[IEEE80211_ADDR_LEN],
 				struct scan_stop_params *param);
 
 int32_t (*send_scan_chan_list_cmd)(wmi_unified_t wmi_handle,
-				uint8_t macaddr[IEEE80211_ADDR_LEN],
 				struct scan_chan_list_params *param);
 };
 
diff --git a/wmi_unified_tlv.h b/wmi_unified_tlv.h
index 298b4b626d..0cb1abc2a7 100644
--- a/wmi_unified_tlv.h
+++ b/wmi_unified_tlv.h
@@ -113,22 +113,17 @@ int32_t send_packet_log_enable_cmd_tlv(wmi_unified_t wmi_handle,
 				struct packet_enable_params *param);
 
 int32_t send_beacon_send_cmd_tlv(wmi_unified_t wmi_handle,
-				uint8_t macaddr[IEEE80211_ADDR_LEN],
 				struct beacon_params *param);
 
 int32_t send_peer_assoc_cmd_tlv(wmi_unified_t wmi_handle,
-				uint8_t macaddr[IEEE80211_ADDR_LEN],
 				struct peer_assoc_params *param);
 
 int32_t send_scan_start_cmd_tlv(wmi_unified_t wmi_handle,
-				uint8_t macaddr[IEEE80211_ADDR_LEN],
 				struct scan_start_params *param);
 
 int32_t send_scan_stop_cmd_tlv(wmi_unified_t wmi_handle,
-				uint8_t macaddr[IEEE80211_ADDR_LEN],
 				struct scan_stop_params *param);
 
 int32_t send_scan_chan_list_cmd_tlv(wmi_unified_t wmi_handle,
-				uint8_t macaddr[IEEE80211_ADDR_LEN],
 				struct scan_chan_list_params *param);