From 9484e6861490c30f430aa0d6333f4e8e2f3d31f6 Mon Sep 17 00:00:00 2001 From: Srinivas Dasari Date: Tue, 5 May 2020 22:58:09 +0530 Subject: [PATCH] qcacld-3.0: Don't limit the max NDPs with a peer in host Currently, host allows maximum MAX_NDP_INSTANCES_PER_PEER(2) NDPs per peer. Framework may need more NDPs with the same peer when multiple NDP applications are running. Firmware shall allow/reject an NDP based on the max number of NDP connections allowed per peer. It's platform specific and firmware shall take care of it. Remove the check in host which limits this. Change-Id: Ic43f6e2588a8ed8ffd7c8bb87d9b5656352e5cf7 CRs-Fixed: 2684987 --- components/nan/core/src/nan_main.c | 9 +-------- components/nan/core/src/nan_main_i.h | 3 --- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/components/nan/core/src/nan_main.c b/components/nan/core/src/nan_main.c index ac60edf7f01a..9687f83c5c62 100644 --- a/components/nan/core/src/nan_main.c +++ b/components/nan/core/src/nan_main.c @@ -341,15 +341,8 @@ nan_increment_ndp_sessions(struct wlan_objmgr_psoc *psoc, wlan_objmgr_peer_release_ref(peer, WLAN_NAN_ID); return QDF_STATUS_E_NULL_VALUE; } - qdf_spin_lock_bh(&peer_nan_obj->lock); - if (peer_nan_obj->active_ndp_sessions == MAX_NDP_INSTANCES_PER_PEER) { - qdf_spin_unlock_bh(&peer_nan_obj->lock); - nan_err("Already reached Max limit(%d) for NDP's per peer!", - MAX_NDP_INSTANCES_PER_PEER); - wlan_objmgr_peer_release_ref(peer, WLAN_NAN_ID); - return QDF_STATUS_E_FAILURE; - } + /* * Store the first channel info in NDP Confirm as the home channel info * and store it in the peer private object. diff --git a/components/nan/core/src/nan_main_i.h b/components/nan/core/src/nan_main_i.h index fa7107e6bfd0..07fc44532e51 100644 --- a/components/nan/core/src/nan_main_i.h +++ b/components/nan/core/src/nan_main_i.h @@ -58,9 +58,6 @@ struct scheduler_msg; #define nan_nofl_debug(params...) \ QDF_TRACE_DEBUG_NO_FL(QDF_MODULE_ID_NAN, params) -/* Maximum number of NDP instances supported on each NAN Peer */ -#define MAX_NDP_INSTANCES_PER_PEER 2 - /** * enum nan_disc_state - NAN Discovery states * @NAN_DISC_DISABLED: NAN Discovery is disabled