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

Commit 896ca1de authored by Tushnim Bhattacharyya's avatar Tushnim Bhattacharyya Committed by Akash Patel
Browse files

qcacld-3.0: cleanup cds_concurrency files 

Code cleanup & update of correct copyright information.

Change-Id: Icee77761cf00cee3b633bd260d5af38286a4f22c
CRs-fixed: 956394
parent 8371edfe

core/cds/inc/cds_concurrency.h

+1 −1
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015-2016 The Linux Foundation. All rights reserved.

 * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.

 *

 * Previously licensed under the ISC license by Qualcomm Atheros, Inc.

 *

core/cds/src/cds_concurrency.c

+5 −9
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015-2016 The Linux Foundation. All rights reserved.

 * Copyright (c) 2012-2016 The Linux Foundation. All rights reserved.

 *

 * Previously licensed under the ISC license by Qualcomm Atheros, Inc.

 *
@@ -2329,8 +2329,7 @@ void cds_set_dual_mac_scan_config(uint8_t dbs_val, 
 *

 * Return: None

 */

void cds_set_dual_mac_fw_mode_config(uint8_t dbs,

		uint8_t dfs)

void cds_set_dual_mac_fw_mode_config(uint8_t dbs, uint8_t dfs)

{

	struct sir_dual_mac_config cfg;

	CDF_STATUS status;
@@ -3646,8 +3645,7 @@ static void cds_set_pcl_for_existing_combo(enum cds_con_mode mode) 
		return;

	};



	if (cds_mode_specific_connection_count(

				mode, NULL) > 0) {

	if (cds_mode_specific_connection_count(mode, NULL) > 0) {

		/* Check, store and temp delete the mode's parameter */

		cds_store_and_del_conn_info(mode, &info);

		/* Set the PCL to the FW since connection got updated */
@@ -4910,8 +4908,7 @@ bool cds_allow_concurrency(enum cds_con_mode mode, 
			goto done;

		}

	}

	count = cds_mode_specific_connection_count(

			CDS_STA_MODE, list);

	count = cds_mode_specific_connection_count(CDS_STA_MODE, list);

	if ((CDS_STA_MODE == mode) &&

		(cds_mode_specific_connection_count(

		CDS_IBSS_MODE, list)) && count) {
@@ -4921,8 +4918,7 @@ bool cds_allow_concurrency(enum cds_con_mode mode, 
	}



	if ((CDS_STA_MODE == mode) &&

		(cds_mode_specific_connection_count(

		CDS_IBSS_MODE, list))) {

		(cds_mode_specific_connection_count(CDS_IBSS_MODE, list))) {

		if (wma_is_hw_dbs_capable() == true) {

			if (num_connections > 1) {

				/* err msg */

core/hdd/src/wlan_hdd_assoc.c

+2 −5
Original line number Diff line number Diff line
@@ -1415,9 +1415,7 @@ static void hdd_send_re_assoc_event(struct net_device *dev, 
	 * active session count should still be the same and hence upon

	 * successful reassoc decrement the active session count here.

	 */

	cds_decr_session_set_pcl(

					pAdapter->device_mode,

					pAdapter->sessionId);

	cds_decr_session_set_pcl(pAdapter->device_mode, pAdapter->sessionId);



	/* Send the Assoc Resp, the supplicant needs this for initial Auth */

	len = pCsrRoamInfo->nAssocRspLength - FT_ASSOC_RSP_IES_OFFSET;
@@ -1847,8 +1845,7 @@ defined(FEATURE_WLAN_LFR) 
		wlan_hdd_auto_shutdown_enable(pHddCtx, false);

#endif



		cds_check_concurrent_intf_and_restart_sap(

							  pHddStaCtx,

		cds_check_concurrent_intf_and_restart_sap(pHddStaCtx,

							  pAdapter);



#ifdef FEATURE_WLAN_TDLS

core/hdd/src/wlan_hdd_cfg80211.c

+1 −2
Original line number Diff line number Diff line
@@ -8006,8 +8006,7 @@ int wlan_hdd_cfg80211_connect_start(hdd_adapter_t *pAdapter, 
		 * check for other concurrency rules.

		 */

		if (!pHddCtx->config->policy_manager_enabled) {

			cds_handle_conc_rule1(pAdapter,

					pRoamProfile);

			cds_handle_conc_rule1(pAdapter, pRoamProfile);

			if (true != cds_handle_conc_rule2(

					pAdapter, pRoamProfile, &roamId))

				return 0;

core/hdd/src/wlan_hdd_hostapd.c

+3 −6
Original line number Diff line number Diff line
@@ -556,8 +556,7 @@ static int hdd_stop_bss_link(hdd_adapter_t *pHostapdAdapter, 
			hddLog(LOGE, FL("Deleting SAP/P2P link!!!!!!"));



		clear_bit(SOFTAP_BSS_STARTED, &pHostapdAdapter->event_flags);

		cds_decr_session_set_pcl(

					     pHostapdAdapter->device_mode,

		cds_decr_session_set_pcl(pHostapdAdapter->device_mode,

					     pHostapdAdapter->sessionId);

	}

	EXIT();
@@ -4965,8 +4964,7 @@ __iw_softap_stopbss(struct net_device *dev, 
			}

		}

		clear_bit(SOFTAP_BSS_STARTED, &pHostapdAdapter->event_flags);

		cds_decr_session_set_pcl(

					     pHostapdAdapter->device_mode,

		cds_decr_session_set_pcl(pHostapdAdapter->device_mode,

					     pHostapdAdapter->sessionId);

	}

	EXIT();
@@ -7872,8 +7870,7 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy, 
		}

		clear_bit(SOFTAP_BSS_STARTED, &pAdapter->event_flags);

		/*BSS stopped, clear the active sessions for this device mode*/

		cds_decr_session_set_pcl(

						pAdapter->device_mode,

		cds_decr_session_set_pcl(pAdapter->device_mode,

						pAdapter->sessionId);

		pAdapter->sessionCtx.ap.beacon = NULL;

		kfree(old);