From 71a1d5ca9bc27b48164977c73b793743239d5fed Mon Sep 17 00:00:00 2001
From: Jeff Johnson <jjohnson@codeaurora.org>
Date: Sun, 30 Dec 2018 11:31:04 -0800
Subject: [PATCH] qcacld-3.0: Remove peer mac param to hdd_roam_register_sta()

The peer mac address parameter to hdd_roam_register_sta() is unused,
so remove it.

Change-Id: Ic419b20abc471b8e96d3baa63c4a7ed2dbaedfe0
CRs-Fixed: 2376937
---
 core/hdd/inc/wlan_hdd_assoc.h        |  1 -
 core/hdd/src/wlan_hdd_assoc.c        | 10 +++-------
 core/hdd/src/wlan_hdd_nan_datapath.c |  9 ++++-----
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/core/hdd/inc/wlan_hdd_assoc.h b/core/hdd/inc/wlan_hdd_assoc.h
index 325cf2cf6693..21e57f68c384 100644
--- a/core/hdd/inc/wlan_hdd_assoc.h
+++ b/core/hdd/inc/wlan_hdd_assoc.h
@@ -384,7 +384,6 @@ QDF_STATUS hdd_update_dp_vdev_flags(void *cbk_data,
 QDF_STATUS hdd_roam_register_sta(struct hdd_adapter *adapter,
 				 struct csr_roam_info *roam_info,
 				 uint8_t sta_id,
-				 struct qdf_mac_addr *peer_mac_addr,
 				 struct bss_description *bss_desc);
 
 bool hdd_save_peer(struct hdd_station_ctx *sta_ctx, uint8_t sta_id,
diff --git a/core/hdd/src/wlan_hdd_assoc.c b/core/hdd/src/wlan_hdd_assoc.c
index 6f21101eaa39..5e8b46347793 100644
--- a/core/hdd/src/wlan_hdd_assoc.c
+++ b/core/hdd/src/wlan_hdd_assoc.c
@@ -2052,7 +2052,6 @@ QDF_STATUS hdd_update_dp_vdev_flags(void *cbk_data,
 QDF_STATUS hdd_roam_register_sta(struct hdd_adapter *adapter,
 					struct csr_roam_info *roam_info,
 					uint8_t staId,
-					struct qdf_mac_addr *pPeerMacAddress,
 					struct bss_description *pBssDesc)
 {
 	QDF_STATUS qdf_status = QDF_STATUS_E_FAILURE;
@@ -3200,7 +3199,7 @@ hdd_association_completion_handler(struct hdd_adapter *adapter,
 				qdf_status = hdd_roam_register_sta(adapter,
 						roam_info,
 						sta_ctx->conn_info.staId[0],
-						NULL, roam_info->pBssDesc);
+						roam_info->pBssDesc);
 				hdd_debug("Enabling queues");
 				wlan_hdd_netif_queue_control(adapter,
 						WLAN_WAKE_ALL_NETIF_QUEUE,
@@ -3470,7 +3469,6 @@ static void hdd_roam_ibss_indication_handler(struct hdd_adapter *adapter,
 	{
 		struct hdd_station_ctx *hdd_sta_ctx =
 			WLAN_HDD_GET_STATION_CTX_PTR(adapter);
-		struct qdf_mac_addr broadcastMacAddr = QDF_MAC_ADDR_BCAST_INIT;
 
 		if (NULL == roam_info) {
 			QDF_ASSERT(0);
@@ -3497,7 +3495,6 @@ static void hdd_roam_ibss_indication_handler(struct hdd_adapter *adapter,
 
 		hdd_roam_register_sta(adapter, roam_info,
 				      roam_info->staId,
-				      &broadcastMacAddr,
 				      roam_info->pBssDesc);
 
 		if (roam_info->pBssDesc) {
@@ -3862,14 +3859,13 @@ roam_roam_connect_status_update_handler(struct hdd_adapter *adapter,
 		if (hdd_is_key_install_required_for_ibss(encr_type))
 			roam_info->fAuthRequired = true;
 
-		/* Register the Station with TL for the new peer. */
+		/* Register the Station with datapath for the new peer. */
 		qdf_status = hdd_roam_register_sta(adapter,
 						   roam_info,
 						   roam_info->staId,
-						   &roam_info->peerMac,
 						   roam_info->pBssDesc);
 		if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {
-			hdd_err("Cannot register STA with TL for IBSS. qdf_status: %d [%08X]",
+			hdd_err("Cannot register STA for IBSS. qdf_status: %d [%08X]",
 				qdf_status, qdf_status);
 		}
 		sta_ctx->ibss_sta_generation++;
diff --git a/core/hdd/src/wlan_hdd_nan_datapath.c b/core/hdd/src/wlan_hdd_nan_datapath.c
index 319d7af0f441..7a482e6f57f8 100644
--- a/core/hdd/src/wlan_hdd_nan_datapath.c
+++ b/core/hdd/src/wlan_hdd_nan_datapath.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2019 The Linux Foundation. All rights reserved.
  *
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
@@ -701,8 +701,8 @@ void hdd_ndi_drv_ndi_create_rsp_handler(uint8_t vdev_id,
 	sta_ctx->broadcast_staid = ndi_rsp->sta_id;
 	hdd_save_peer(sta_ctx, sta_ctx->broadcast_staid, &bc_mac_addr);
 	hdd_roam_register_sta(adapter, &roam_info,
-				sta_ctx->broadcast_staid,
-				&bc_mac_addr, &tmp_bss_descp);
+			      sta_ctx->broadcast_staid,
+			      &tmp_bss_descp);
 	hdd_ctx->sta_to_adapter[sta_ctx->broadcast_staid] = adapter;
 }
 
@@ -819,8 +819,7 @@ int hdd_ndp_new_peer_handler(uint8_t vdev_id, uint16_t sta_id,
 	}
 
 	/* this function is called for each new peer */
-	hdd_roam_register_sta(adapter, &roam_info, sta_id,
-				peer_mac_addr, &tmp_bss_descp);
+	hdd_roam_register_sta(adapter, &roam_info, sta_id, &tmp_bss_descp);
 	hdd_ctx->sta_to_adapter[sta_id] = adapter;
 	/* perform following steps for first new peer ind */
 	if (fist_peer) {