qcacld-3.0: Remove SIR_MAX_SUPPORTED_BSS

As part of the effort to use a single definition for the maximum number
of vdevs, replace SIR_MAX_SUPPORTED_BSS with WLAN_MAX_VDEVS.

Change-Id: I1b1823c74c0fc741ba3ed72f13854ac5bbb20e35
CRs-Fixed: 2393159

core/mac/inc/ani_global.h

@@ -740,7 +740,6 @@ struct vdev_type_nss {
 
 /**
  * struct mgmt_beacon_probe_filter
- * @bcn_filter_lock: Spinlock for the filter structure
  * @num_sta_sessions: Number of active PE STA sessions
  * @sta_bssid: Array of PE STA session's peer BSSIDs
  * @num_ibss_sessions: Number of active PE IBSS sessions
@@ -753,11 +752,11 @@ struct vdev_type_nss {
  */
 struct mgmt_beacon_probe_filter {
 	uint8_t num_sta_sessions;
-	tSirMacAddr sta_bssid[SIR_MAX_SUPPORTED_BSS];
+	tSirMacAddr sta_bssid[WLAN_MAX_VDEVS];
 	uint8_t num_ibss_sessions;
-	tSirMacSSid ibss_ssid[SIR_MAX_SUPPORTED_BSS];
+	tSirMacSSid ibss_ssid[WLAN_MAX_VDEVS];
 	uint8_t num_sap_sessions;
-	uint8_t sap_channel[SIR_MAX_SUPPORTED_BSS];
+	uint8_t sap_channel[WLAN_MAX_VDEVS];
 };
 
 /**

core/mac/inc/sir_api.h

@@ -48,8 +48,6 @@ struct mac_context;
 #include "wlan_policy_mgr_api.h"
 #include "wlan_tdls_public_structs.h"
 
-#define SIR_MAX_SUPPORTED_BSS WLAN_MAX_VDEVS
-
 #define OFFSET_OF(structType, fldName)   (&((structType *)0)->fldName)
 
 /* / Max supported channel list */
@@ -57,7 +55,6 @@ struct mac_context;
 #define CFG_VALID_CHANNEL_LIST_LEN              100
 #define CFG_COUNTRY_CODE_LEN 3
 
-
 #define SIR_MDIE_ELEMENT_ID         54
 #define SIR_MDIE_SIZE               3   /* MD ID(2 bytes), Capability(1 byte) */
 

core/mac/src/pe/lim/lim_api.c

@@ -1078,7 +1078,7 @@ static bool pe_filter_bcn_probe_frame(struct mac_context *mac_ctx,
 	 * STA BSSIDs, allow the frame
 	 */
 	if (filter->num_sta_sessions) {
-		for (session_id = 0; session_id < SIR_MAX_SUPPORTED_BSS;
+		for (session_id = 0; session_id < WLAN_MAX_VDEVS;
 		     session_id++) {
 			if (sir_compare_mac_addr(filter->sta_bssid[session_id],
 			    hdr->bssId)) {
@@ -1114,7 +1114,7 @@ static bool pe_filter_bcn_probe_frame(struct mac_context *mac_ctx,
 			     &ssid_ie[2],
 			     bcn_ssid.length);
 
-		for (session_id = 0; session_id < SIR_MAX_SUPPORTED_BSS;
+		for (session_id = 0; session_id < WLAN_MAX_VDEVS;
 		     session_id++) {
 			if (filter->ibss_ssid[session_id].length ==
 			    bcn_ssid.length &&

core/mac/src/pe/lim/lim_session.c

@@ -46,8 +46,8 @@ QDF_STATUS pe_allocate_dph_node_array_buffer(void)
 {
 	uint32_t buf_size;
 
-	buf_size = SIR_MAX_SUPPORTED_BSS * (SIR_SAP_MAX_NUM_PEERS + 1)
-		   * sizeof(struct sDphHashNode);
+	buf_size = WLAN_MAX_VDEVS * (SIR_SAP_MAX_NUM_PEERS + 1) *
+		sizeof(struct sDphHashNode);
 	g_dph_node_array = qdf_mem_malloc(buf_size);
 	if (!g_dph_node_array)
 		return QDF_STATUS_E_NOMEM;
@@ -69,7 +69,7 @@ struct sDphHashNode *pe_get_session_dph_node_array(uint8_t session_id)
 
 #else /* WLAN_ALLOCATE_GLOBAL_BUFFERS_DYNAMICALLY */
 static struct sDphHashNode
-	g_dph_node_array[SIR_MAX_SUPPORTED_BSS][SIR_SAP_MAX_NUM_PEERS + 1];
+	g_dph_node_array[WLAN_MAX_VDEVS][SIR_SAP_MAX_NUM_PEERS + 1];
 
 static inline
 struct sDphHashNode *pe_get_session_dph_node_array(uint8_t session_id)
@@ -431,7 +431,7 @@ void lim_set_bcn_probe_filter(struct mac_context *mac_ctx,
 	session_id = session->peSessionId;
 	bssid = &session->bssId;
 
-	if (session_id >= SIR_MAX_SUPPORTED_BSS) {
+	if (session_id >= WLAN_MAX_VDEVS) {
 		pe_err("Invalid session_id %d of type %d",
 			session_id, bss_type);
 		return;
@@ -488,7 +488,7 @@ void lim_reset_bcn_probe_filter(struct mac_context *mac_ctx,
 	bss_type = session->bssType;
 	session_id = session->peSessionId;
 
-	if (session_id >= SIR_MAX_SUPPORTED_BSS) {
+	if (session_id >= WLAN_MAX_VDEVS) {
 		pe_err("Invalid session_id %d of type %d",
 			session_id, bss_type);
 		return;
@@ -536,7 +536,7 @@ void lim_update_bcn_probe_filter(struct mac_context *mac_ctx,
 	bss_type = session->bssType;
 	session_id = session->peSessionId;
 
-	if (session_id >= SIR_MAX_SUPPORTED_BSS) {
+	if (session_id >= WLAN_MAX_VDEVS) {
 		pe_err("Invalid session_id %d of type %d",
 			session_id, bss_type);
 		return;

core/sme/inc/sme_power_save.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2015-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
@@ -83,12 +83,11 @@ struct ps_params {
 
 /**
  * struct ps_global_info - global struct for Power save information
- * @ps_enabled: Power Save is enabled or not in ini
- * @ps_params:  maintain power save state and USAPD params
+ * @ps_params: maintain power save state and USAPD params
+ * @remain_in_power_active_till_dhcp: remain in Power active till DHCP completes
  */
 struct ps_global_info {
-	struct ps_params ps_params[SIR_MAX_SUPPORTED_BSS];
-	/* Remain in Power active till DHCP completes */
+	struct ps_params ps_params[WLAN_MAX_VDEVS];
 	bool remain_in_power_active_till_dhcp;
 };
 

core/sme/src/common/sme_power_save.c

@@ -807,7 +807,7 @@ QDF_STATUS sme_ps_open(mac_handle_t mac_handle)
 
 	uint32_t i;
 
-	for (i = 0; i < SIR_MAX_SUPPORTED_BSS; i++) {
+	for (i = 0; i < WLAN_MAX_VDEVS; i++) {
 		if (QDF_STATUS_SUCCESS != sme_ps_open_per_session(mac_handle,
 								  i)) {
 			sme_err("PMC Init Failed for session: %d", i);