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

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

Merge 3c67d964 on remote branch 

Change-Id: I4e341e95d0396146c274dc1c872ae9a91d022e28
parents 30881a18 3c67d964

Kbuild

+6 −1
Original line number Diff line number Diff line
@@ -1278,7 +1278,8 @@ CDEFINES := -DANI_LITTLE_BYTE_ENDIAN \ 
		-DCONFIG_160MHZ_SUPPORT \

		-DCONFIG_MCL \

		-DWMI_CMD_STRINGS \

		-DCONFIG_HDD_INIT_WITH_RTNL_LOCK

		-DCONFIG_HDD_INIT_WITH_RTNL_LOCK \

		-DMWS_COEX



ifneq ($(CONFIG_HIF_USB), 1)

CDEFINES += -DWLAN_LOGGING_SOCK_SVC_ENABLE
@@ -1862,6 +1863,10 @@ ifeq ($(CONFIG_WLAN_FEATURE_APF), y) 
CDEFINES += -DWLAN_FEATURE_APF

endif



ifeq ($(CONFIG_WLAN_FEATURE_SARV1_TO_SARV2), y)

CDEFINES += -DWLAN_FEATURE_SARV1_TO_SARV2

endif



#Flag to enable/disable WLAN D0-WOW

ifeq ($(CONFIG_PCI_MSM), y)

ifeq ($(CONFIG_ROME_IF),pci)

Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -135,4 +135,8 @@ config ICMP_DISABLE_PS 
config CONFIG_BUILD_TIMESTAMP

	bool "Embed timestamp in wlan version"

	default n



config WLAN_FEATURE_SARV1_TO_SARV2

	bool "Enable conversion of SAR v1 to v2 feature"

	default n

endif # QCA_CLD_WLAN

core/cds/inc/cds_regdomain.h

+8 −2
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2011, 2014-2017 The Linux Foundation. All rights reserved.

 * Copyright (c) 2011, 2014-2018 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
@@ -563,5 +563,11 @@ uint16_t cds_reg_dmn_get_chanwidth_from_opclass(uint8_t *country, 
						uint8_t opclass);

uint16_t cds_reg_dmn_set_curr_opclasses(uint8_t num_classes, uint8_t *class);

uint16_t cds_reg_dmn_get_curr_opclasses(uint8_t *num_classes, uint8_t *class);



/**

 * cds_is_etsi_europe_country - check ETSI Europe country or not

 * @country: country string with two Characters

 *

 * Return: true if country in ETSI Europe country list

 */

bool cds_is_etsi_europe_country(uint8_t *country);

#endif /* __CDS_REGDOMAIN_H */

core/cds/src/cds_api.c

+3 −0
Original line number Diff line number Diff line
@@ -880,6 +880,9 @@ QDF_STATUS cds_disable(v_CONTEXT_t cds_context) 
	QDF_STATUS qdf_status;

	void *handle;



	if (gp_cds_sched_context)

		cds_sched_flush_mc_mqs(gp_cds_sched_context);



	qdf_status = wma_stop(cds_context, HAL_STOP_TYPE_RF_KILL);



	if (!QDF_IS_STATUS_SUCCESS(qdf_status)) {

core/cds/src/cds_concurrency.c

+6 −8
Original line number Diff line number Diff line
@@ -5223,9 +5223,9 @@ static QDF_STATUS cds_get_channel_list(enum cds_pcl_type pcl, 
	sta_sap_scc_on_dfs_chan = cds_is_sta_sap_scc_allowed_on_dfs_channel();

	cds_debug("sta_sap_scc_on_dfs_chan %u", sta_sap_scc_on_dfs_chan);



	if ((((mode == CDS_SAP_MODE) || (mode == CDS_P2P_GO_MODE)) &&

		(cds_mode_specific_connection_count(CDS_STA_MODE, NULL) > 0)) ||

		!sta_sap_scc_on_dfs_chan) {

	if (((mode == CDS_SAP_MODE) || (mode == CDS_P2P_GO_MODE)) &&

		(cds_mode_specific_connection_count(CDS_STA_MODE, NULL) > 0) &&

		(!sta_sap_scc_on_dfs_chan)) {

		cds_debug("STA present, skip DFS channels from pcl for SAP/Go");

		skip_dfs_channel = true;

	}
@@ -8753,6 +8753,7 @@ void cds_restart_sap(hdd_adapter_t *ap_adapter) 
		hdd_cleanup_actionframe(hdd_ctx, ap_adapter);

		hostapd_state = WLAN_HDD_GET_HOSTAP_STATE_PTR(ap_adapter);

		qdf_event_reset(&hostapd_state->qdf_stop_bss_event);

		hdd_ipa_ap_disconnect(ap_adapter);

		if (QDF_STATUS_SUCCESS == wlansap_stop_bss(sap_ctx)) {

			qdf_status =

				qdf_wait_for_event_completion(&hostapd_state->
@@ -10708,6 +10709,8 @@ void cds_checkn_update_hw_mode_single_mac_mode(uint8_t channel) 
		cds_err("Invalid CDS Context");

		return;

	}

	if (QDF_TIMER_STATE_RUNNING == cds_ctx->dbs_opportunistic_timer.state)

		qdf_mc_timer_stop(&cds_ctx->dbs_opportunistic_timer);



	qdf_mutex_acquire(&cds_ctx->qdf_conc_list_lock);

	for (i = 0; i < MAX_NUMBER_OF_CONC_CONNECTIONS; i++) {
@@ -10720,11 +10723,6 @@ void cds_checkn_update_hw_mode_single_mac_mode(uint8_t channel) 
			}

	}

	qdf_mutex_release(&cds_ctx->qdf_conc_list_lock);



	if (QDF_TIMER_STATE_RUNNING ==

		cds_ctx->dbs_opportunistic_timer.state)

		qdf_mc_timer_stop(&cds_ctx->dbs_opportunistic_timer);



	cds_dbs_opportunistic_timer_handler((void *)cds_ctx);

}