qcacld-3.0: Remove old rso path code [PART 4] (934f810d) · Commits · e / devices / android_kernel_fairphone_FP5

core/hdd/src/wlan_hdd_cfg80211.c

+0 −98

Original line number	Diff line number	Diff line
		@@ -4811,13 +4811,8 @@ hdd_send_roam_triggers_to_sme(struct hdd_context *hdd_ctx,
		status = ucfg_cm_update_roam_scan_scheme_bitmap(hdd_ctx->psoc,
		vdev_id, 0);

		#ifdef ROAM_OFFLOAD_V1
		status = ucfg_cm_rso_set_roam_trigger(hdd_ctx->pdev, vdev_id,
		&triggers);
		#else
		/* temp change, This will be removed with ROAM_OFFLOAD_V1 enabled */
		status = sme_set_roam_triggers(hdd_ctx->mac_handle, &triggers);
		#endif
		if (QDF_IS_STATUS_ERROR(status))
		hdd_err("Failed to set roam control trigger bitmap");

		@@ -13390,7 +13385,6 @@ void wlan_hdd_rso_cmd_status_cb(hdd_handle_t hdd_handle,
		complete(&adapter->lfr_fw_status.disable_lfr_event);
		}

		#ifdef ROAM_OFFLOAD_V1
		/**
		* __wlan_hdd_cfg80211_set_fast_roaming() - enable/disable roaming
		* @wiphy: Pointer to wireless phy
		@@ -13482,98 +13476,6 @@ static int __wlan_hdd_cfg80211_set_fast_roaming(struct wiphy *wiphy,
		hdd_exit();
		return ret;
		}
		#else
		/**
		* __wlan_hdd_cfg80211_set_fast_roaming() - enable/disable roaming
		* @wiphy: Pointer to wireless phy
		* @wdev: Pointer to wireless device
		* @data: Pointer to data
		* @data_len: Length of @data
		*
		* This function is used to enable/disable roaming using vendor commands
		*
		* Return: 0 on success, negative errno on failure
		*/
		static int __wlan_hdd_cfg80211_set_fast_roaming(struct wiphy *wiphy,
		struct wireless_dev *wdev,
		const void *data, int data_len)
		{
		struct hdd_context *hdd_ctx = wiphy_priv(wiphy);
		struct net_device *dev = wdev->netdev;
		struct hdd_adapter *adapter = WLAN_HDD_GET_PRIV_PTR(dev);
		struct nlattr *tb[QCA_WLAN_VENDOR_ATTR_MAX + 1];
		uint32_t is_fast_roam_enabled;
		int ret;
		QDF_STATUS qdf_status;
		unsigned long rc;
		struct hdd_station_ctx *hdd_sta_ctx =
		WLAN_HDD_GET_STATION_CTX_PTR(adapter);
		mac_handle_t mac_handle;

		hdd_enter_dev(dev);

		ret = wlan_hdd_validate_context(hdd_ctx);
		if (0 != ret)
		return ret;

		if (QDF_GLOBAL_FTM_MODE == hdd_get_conparam()) {
		hdd_err("Command not allowed in FTM mode");
		return -EINVAL;
		}

		ret = wlan_cfg80211_nla_parse(tb,
		QCA_WLAN_VENDOR_ATTR_MAX, data, data_len,
		qca_wlan_vendor_attr);
		if (ret) {
		hdd_err("Invalid ATTR");
		return -EINVAL;
		}

		/* Parse and fetch Enable flag */
		if (!tb[QCA_WLAN_VENDOR_ATTR_ROAMING_POLICY]) {
		hdd_err("attr enable failed");
		return -EINVAL;
		}

		is_fast_roam_enabled = nla_get_u32(
		tb[QCA_WLAN_VENDOR_ATTR_ROAMING_POLICY]);
		hdd_debug("isFastRoamEnabled %d", is_fast_roam_enabled);

		/* Update roaming */
		mac_handle = hdd_ctx->mac_handle;
		qdf_status = sme_config_fast_roaming(mac_handle, adapter->vdev_id,
		is_fast_roam_enabled);
		if (qdf_status != QDF_STATUS_SUCCESS)
		hdd_err("sme_config_fast_roaming failed with status=%d",
		qdf_status);
		ret = qdf_status_to_os_return(qdf_status);

		if (eConnectionState_Associated == hdd_sta_ctx->conn_info.conn_state &&
		QDF_IS_STATUS_SUCCESS(qdf_status) && !is_fast_roam_enabled) {

		INIT_COMPLETION(adapter->lfr_fw_status.disable_lfr_event);
		/*
		* wait only for LFR disable in fw as LFR enable
		* is always success
		*/
		rc = wait_for_completion_timeout(
		&adapter->lfr_fw_status.disable_lfr_event,
		msecs_to_jiffies(WAIT_TIME_RSO_CMD_STATUS));
		if (!rc) {
		hdd_err("Timed out waiting for RSO CMD status");
		return -ETIMEDOUT;
		}

		if (!adapter->lfr_fw_status.is_disabled) {
		hdd_err("Roam disable attempt in FW fails");
		return -EBUSY;
		}
		}

		hdd_exit();
		return ret;
		}
		#endif

		/**
		* wlan_hdd_cfg80211_set_fast_roaming() - enable/disable roaming

core/hdd/src/wlan_hdd_ioctl.c

+1 −8

Original line number	Diff line number	Diff line
		@@ -780,19 +780,12 @@ static int hdd_parse_reassoc(struct hdd_adapter adapter, const char command,
		return ret;
		}

		#ifdef ROAM_OFFLOAD_V1
		static inline
		void hdd_abort_roam_scan(struct hdd_context *hdd_ctx, uint8_t vdev_id)
		{
		ucfg_cm_abort_roam_scan(hdd_ctx->pdev, vdev_id);
		}
		#else
		static inline
		void hdd_abort_roam_scan(struct hdd_context *hdd_ctx, uint8_t vdev_id)
		{
		sme_abort_roam_scan(hdd_ctx->mac_handle, vdev_id);
		}
		#endif

		/**
		* hdd_sendactionframe() - send a userspace-supplied action frame
		* @adapter: Adapter upon which the command was received

core/hdd/src/wlan_hdd_main.c

+0 −106

Original line number	Diff line number	Diff line
		@@ -5678,7 +5678,6 @@ int hdd_vdev_create(struct hdd_adapter *adapter)
		return errno;
		}

		#ifdef ROAM_OFFLOAD_V1
		QDF_STATUS hdd_init_station_mode(struct hdd_adapter *adapter)
		{
		struct hdd_station_ctx *sta_ctx = &adapter->session.station;
		@@ -5786,111 +5785,6 @@ QDF_STATUS hdd_init_station_mode(struct hdd_adapter *adapter)

		return status;
		}
		#else
		QDF_STATUS hdd_init_station_mode(struct hdd_adapter *adapter)
		{
		struct hdd_station_ctx *sta_ctx = &adapter->session.station;
		struct hdd_context *hdd_ctx;
		QDF_STATUS status;
		int ret_val;
		mac_handle_t mac_handle;
		bool bval = false;
		uint8_t enable_sifs_burst = 0;
		uint32_t fine_time_meas_cap = 0, roam_triggers;

		hdd_ctx = WLAN_HDD_GET_CTX(adapter);
		mac_handle = hdd_ctx->mac_handle;
		sme_set_curr_device_mode(mac_handle, adapter->device_mode);
		status = ucfg_mlme_get_vht_enable2x2(hdd_ctx->psoc, &bval);
		if (!QDF_IS_STATUS_SUCCESS(status))
		hdd_err("unable to get vht_enable2x2");
		sme_set_pdev_ht_vht_ies(mac_handle, bval);

		sme_set_vdev_ies_per_band(mac_handle, adapter->vdev_id,
		adapter->device_mode);

		hdd_roam_profile_init(adapter);
		hdd_register_wext(adapter->dev);

		hdd_conn_set_connection_state(adapter, eConnectionState_NotConnected);
		sme_roam_reset_configs(mac_handle, adapter->vdev_id);

		/* set fast roaming capability in sme session */
		status = sme_config_fast_roaming(mac_handle, adapter->vdev_id,
		true);
		/* Set the default operation channel freq*/
		sta_ctx->conn_info.chan_freq = hdd_ctx->config->operating_chan_freq;

		/* Make the default Auth Type as OPEN */
		sta_ctx->conn_info.auth_type = eCSR_AUTH_TYPE_OPEN_SYSTEM;

		status = hdd_init_tx_rx(adapter);
		if (QDF_STATUS_SUCCESS != status) {
		hdd_err("hdd_init_tx_rx() failed, status code %08d [x%08x]",
		status, status);
		goto error_init_txrx;
		}

		set_bit(INIT_TX_RX_SUCCESS, &adapter->event_flags);

		status = hdd_wmm_adapter_init(adapter);
		if (QDF_STATUS_SUCCESS != status) {
		hdd_err("hdd_wmm_adapter_init() failed, status code %08d [x%08x]",
		status, status);
		goto error_wmm_init;
		}

		set_bit(WMM_INIT_DONE, &adapter->event_flags);

		status = ucfg_get_enable_sifs_burst(hdd_ctx->psoc, &enable_sifs_burst);
		if (!QDF_IS_STATUS_SUCCESS(status))
		hdd_err("Failed to get sifs burst value, use default");

		ret_val = sme_cli_set_command(adapter->vdev_id,
		WMI_PDEV_PARAM_BURST_ENABLE,
		enable_sifs_burst,
		PDEV_CMD);
		if (ret_val)
		hdd_err("WMI_PDEV_PARAM_BURST_ENABLE set failed %d", ret_val);


		hdd_set_netdev_flags(adapter);

		/* rcpi info initialization */
		qdf_mem_zero(&adapter->rcpi, sizeof(adapter->rcpi));

		if (adapter->device_mode == QDF_STA_MODE) {
		roam_triggers = ucfg_mlme_get_roaming_triggers(hdd_ctx->psoc);
		mlme_set_roam_trigger_bitmap(hdd_ctx->psoc, adapter->vdev_id,
		roam_triggers);
		wlan_cm_roam_disable_vendor_btm(hdd_ctx->psoc,
		adapter->vdev_id);
		ucfg_mlme_get_fine_time_meas_cap(hdd_ctx->psoc,
		&fine_time_meas_cap);
		sme_cli_set_command(
		adapter->vdev_id,
		WMI_VDEV_PARAM_ENABLE_DISABLE_RTT_RESPONDER_ROLE,
		(bool)(fine_time_meas_cap & WMI_FW_STA_RTT_RESPR),
		VDEV_CMD);
		sme_cli_set_command(
		adapter->vdev_id,
		WMI_VDEV_PARAM_ENABLE_DISABLE_RTT_INITIATOR_ROLE,
		(bool)(fine_time_meas_cap & WMI_FW_STA_RTT_INITR),
		VDEV_CMD);
		}

		return QDF_STATUS_SUCCESS;

		error_wmm_init:
		clear_bit(INIT_TX_RX_SUCCESS, &adapter->event_flags);
		hdd_deinit_tx_rx(adapter);
		error_init_txrx:
		hdd_unregister_wext(adapter->dev);
		QDF_BUG(!hdd_vdev_destroy(adapter));

		return status;
		}
		#endif

		static char *net_dev_ref_debug_string_from_id(wlan_net_dev_ref_dbgid dbgid)
		{

core/mac/inc/sir_api.h

+0 −3

Original line number	Diff line number	Diff line
		@@ -2314,9 +2314,6 @@ struct roam_offload_scan_req {
		struct scoring_param score_params;
		#ifdef WLAN_FEATURE_FILS_SK
		bool is_fils_connection;
		#ifndef ROAM_OFFLOAD_V1
		struct roam_fils_params roam_fils_params;
		#endif
		#endif
		uint32_t btm_offload_config;
		uint32_t btm_solicited_timeout;

core/mac/inc/wni_api.h

+3 −10

Original line number	Diff line number	Diff line
		@@ -212,9 +212,7 @@ enum eWniMsgTypes {
		eWNI_SME_UPDATE_ACCESS_POLICY_VENDOR_IE = SIR_SME_MSG_TYPES_BEGIN + 130,
		eWNI_SME_DEFAULT_SCAN_IE = SIR_SME_MSG_TYPES_BEGIN + 131,
		eWNI_SME_ROAM_INVOKE = SIR_SME_MSG_TYPES_BEGIN + 132,
		#ifndef ROAM_OFFLOAD_V1
		eWNI_SME_ROAM_SCAN_OFFLOAD_REQ = SIR_SME_MSG_TYPES_BEGIN + 133,
		#endif
		/* 133 unused */
		eWNI_SME_LOST_LINK_INFO_IND = SIR_SME_MSG_TYPES_BEGIN + 134,
		eWNI_SME_DEL_ALL_TDLS_PEERS = SIR_SME_MSG_TYPES_BEGIN + 135,
		eWNI_SME_RSO_CMD_STATUS_IND = SIR_SME_MSG_TYPES_BEGIN + 136,
		@@ -240,18 +238,13 @@ enum eWniMsgTypes {
		eWNI_SME_ANTENNA_ISOLATION_RSP = SIR_SME_MSG_TYPES_BEGIN + 155,
		eWNI_SME_MON_DEINIT_SESSION = SIR_SME_MSG_TYPES_BEGIN + 156,
		eWNI_SME_VDEV_DELETE_RSP = SIR_SME_MSG_TYPES_BEGIN + 157,
		#ifndef ROAM_OFFLOAD_V1
		eWNI_SME_ROAM_INIT_PARAM = SIR_SME_MSG_TYPES_BEGIN + 158,
		eWNI_SME_ROAM_SEND_PER_REQ = SIR_SME_MSG_TYPES_BEGIN + 159,
		#endif
		/* 158, 159 unused */
		eWNI_SME_GET_ROAM_SCAN_CH_LIST_EVENT =
		SIR_SME_MSG_TYPES_BEGIN + 160,
		eWNI_SME_MONITOR_MODE_VDEV_UP = SIR_SME_MSG_TYPES_BEGIN + 161,
		eWNI_SME_UPDATE_SESSION_EDCA_TXQ_PARAMS = SIR_SME_MSG_TYPES_BEGIN + 162,
		eWNI_SME_ROAM_SEND_SET_PCL_REQ = SIR_SME_MSG_TYPES_BEGIN + 163,
		#ifndef ROAM_OFFLOAD_V1
		eWNI_SME_ROAM_DISABLE_CFG = SIR_SME_MSG_TYPES_BEGIN + 164,
		#endif
		/* 164 unused */
		eWNI_SME_TWT_ADD_DIALOG_EVENT = SIR_SME_MSG_TYPES_BEGIN + 165,
		eWNI_SME_TWT_DEL_DIALOG_EVENT = SIR_SME_MSG_TYPES_BEGIN + 166,
		eWNI_SME_TWT_PAUSE_DIALOG_EVENT = SIR_SME_MSG_TYPES_BEGIN + 167,