Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc98bbe8 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 49e0ae2c on remote branch

Change-Id: Ia68b6d0b71492a76b12147d6f7280fa419e572be
parents 076db58e 49e0ae2c
Loading
Loading
Loading
Loading
+27 −0
Original line number Diff line number Diff line
@@ -1494,6 +1494,18 @@ struct policy_mgr_hdd_cbacks {
			struct ch_params *ch_params);
};

/**
 * struct policy_mgr_conc_cbacks - lim Callbacks to be invoked
 * from policy manager
 * @connection_info_update: check and update params based on STA/SAP
 *                          concurrency.such as EDCA params and RTS threshold.
 *                          If updated, it will also send the updated parameters
 *                          to FW.
 */

struct policy_mgr_conc_cbacks {
	void (*connection_info_update)(void);
};

/**
 * struct policy_mgr_tdls_cbacks - TDLS Callbacks to be invoked
@@ -2397,6 +2409,21 @@ QDF_STATUS policy_mgr_register_hdd_cb(struct wlan_objmgr_psoc *psoc,
 */
QDF_STATUS policy_mgr_deregister_hdd_cb(struct wlan_objmgr_psoc *psoc);

/**
 * policy_mgr_register_conc_cb() - register Lim callbacks
 * @psoc: PSOC object information
 * @hdd_cbacks: function pointers from lim
 *
 * API, allows Lim to register callbacks to be invoked by policy
 * mgr
 *
 * Return: SUCCESS,
 *         Failure (if registration fails)
 */

QDF_STATUS policy_mgr_register_conc_cb(struct wlan_objmgr_psoc *psoc,
				struct policy_mgr_conc_cbacks *conc_cbacks);

/**
 * policy_mgr_register_tdls_cb() - register TDLS callbacks
 * @psoc: PSOC object information
+1 −0
Original line number Diff line number Diff line
@@ -2483,6 +2483,7 @@ void policy_mgr_change_sap_channel_with_csa(struct wlan_objmgr_psoc *psoc,
		return;
	}
	if (pm_ctx->hdd_cbacks.wlan_get_ap_prefer_conc_ch_params) {
		ch_params.ch_width = ch_width;
		status = pm_ctx->hdd_cbacks.wlan_get_ap_prefer_conc_ch_params(
			psoc, vdev_id, ch_freq, &ch_params);
		if (QDF_IS_STATUS_SUCCESS(status) &&
+8 −2
Original line number Diff line number Diff line
@@ -35,6 +35,8 @@

#define POLICY_MGR_MAX_CON_STRING_LEN   100

static const uint16_t sap_mand_5g_freq_list[] = {5745, 5765, 5785, 5805};

struct policy_mgr_conc_connection_info
	pm_conc_connection_list[MAX_NUMBER_OF_CONC_CONNECTIONS];

@@ -629,6 +631,9 @@ void policy_mgr_update_conc_list(struct wlan_objmgr_psoc *psoc,
		if (pm_ctx->dp_cbacks.hdd_ipa_set_mcc_mode_cb)
			pm_ctx->dp_cbacks.hdd_ipa_set_mcc_mode_cb(mcc_mode);
	}

	if (pm_ctx->conc_cbacks.connection_info_update)
		pm_ctx->conc_cbacks.connection_info_update();
}

/**
@@ -3612,8 +3617,9 @@ policy_mgr_init_sap_mandatory_chan_by_band(struct wlan_objmgr_psoc *psoc,
		}
	}
	if (band_bitmap & BIT(REG_BAND_5G))
		policy_mgr_add_sap_mandatory_chan(psoc,
						  SAP_MANDATORY_5G_CH_FREQ);
		for (i = 0; i < ARRAY_SIZE(sap_mand_5g_freq_list); i++)
			policy_mgr_add_sap_mandatory_chan(
				psoc, sap_mand_5g_freq_list[i]);
	if (band_bitmap & BIT(REG_BAND_6G))
		policy_mgr_add_sap_mandatory_6ghz_chan(psoc);
}
+3 −0
Original line number Diff line number Diff line
@@ -2199,6 +2199,9 @@ QDF_STATUS policy_mgr_decr_connection_count(struct wlan_objmgr_psoc *psoc,
		sizeof(*pm_conc_connection_list));
	qdf_mutex_release(&pm_ctx->qdf_conc_list_lock);

	if (pm_ctx->conc_cbacks.connection_info_update)
		pm_ctx->conc_cbacks.connection_info_update();

	return QDF_STATUS_SUCCESS;
}

+3 −2
Original line number Diff line number Diff line
@@ -31,8 +31,6 @@

#define POLICY_MGR_SER_CMD_TIMEOUT 4000

#define SAP_MANDATORY_5G_CH_FREQ 5745

#ifdef QCA_WIFI_3_0_EMU
#define CONNECTION_UPDATE_TIMEOUT (POLICY_MGR_SER_CMD_TIMEOUT + 3000)
#else
@@ -298,6 +296,8 @@ struct policy_mgr_cfg {
 * interaction with Policy Manager
 * @cdp_cbacks: callbacks to be registered by SME for
 * interaction with Policy Manager
 * @conc_cbacks: callbacks to be registered by lim for
 * interaction with Policy Manager
 * @sap_mandatory_channels: The user preferred master list on
 *                        which SAP can be brought up. This
 *                        mandatory channel freq list would be as per
@@ -344,6 +344,7 @@ struct policy_mgr_psoc_priv_obj {
	struct policy_mgr_tdls_cbacks tdls_cbacks;
	struct policy_mgr_cdp_cbacks cdp_cbacks;
	struct policy_mgr_dp_cbacks dp_cbacks;
	struct policy_mgr_conc_cbacks conc_cbacks;
	uint32_t sap_mandatory_channels[NUM_CHANNELS];
	uint32_t sap_mandatory_channels_len;
	bool do_sap_unsafe_ch_check;
Loading