qcacld-3.0: Replace hdd_get_adapter_by_sme_session_id()

Currently both functions hdd_get_adapter_by_sme_session_id() and hdd_get_adapter_by_vdev() have the same functionality. Since hdd_get_adapter_by_vdev() uses current terminology, replace all instances of hdd_get_adapter_by_sme_session_id(). Change-Id: Id94604ae744ec03faa41600db4fc618ff99989b1 CRs-Fixed: 2412963
2019-03-06 11:43:49 -08:00
parent 848b9faf8f
commit 55d2ab4aa4
3 changed files with 56 additions and 71 deletions
--- a/core/hdd/inc/wlan_hdd_main.h
+++ b/core/hdd/inc/wlan_hdd_main.h
@@ -2003,8 +2003,20 @@ QDF_STATUS hdd_stop_all_adapters(struct hdd_context *hdd_ctx);
 void hdd_deinit_all_adapters(struct hdd_context *hdd_ctx, bool rtnl_held);
 QDF_STATUS hdd_reset_all_adapters(struct hdd_context *hdd_ctx);
 QDF_STATUS hdd_start_all_adapters(struct hdd_context *hdd_ctx);
+
+/**
+ * hdd_get_adapter_by_vdev() - Return adapter with the given vdev id
+ * @hdd_ctx: hdd context.
+ * @vdev_id: vdev id for the adapter to get.
+ *
+ * This function is used to get the adapter with provided vdev id
+ *
+ * Return: adapter pointer if found
+ *
+ */
 struct hdd_adapter *hdd_get_adapter_by_vdev(struct hdd_context *hdd_ctx,
-				       uint32_t vdev_id);
+					    uint32_t vdev_id);
+
 struct hdd_adapter *hdd_get_adapter_by_macaddr(struct hdd_context *hdd_ctx,
 					  tSirMacAddr macAddr);

@@ -2042,13 +2054,15 @@ int hdd_vdev_ready(struct hdd_adapter *adapter);
 QDF_STATUS hdd_init_station_mode(struct hdd_adapter *adapter);
 struct hdd_adapter *hdd_get_adapter(struct hdd_context *hdd_ctx,
 			enum QDF_OPMODE mode);
-/*
+
+/**
 * hdd_get_device_mode() - Get device mode
- * @session_id: Session id
+ * @vdev_id: vdev id
 *
 * Return: Device mode
 */
-enum QDF_OPMODE hdd_get_device_mode(uint32_t session_id);
+enum QDF_OPMODE hdd_get_device_mode(uint32_t vdev_id);
+
 void hdd_deinit_adapter(struct hdd_context *hdd_ctx,
 			struct hdd_adapter *adapter,
 			bool rtnl_held);
@@ -2578,10 +2592,6 @@ void wlan_hdd_clear_netif_queue_history(struct hdd_context *hdd_ctx);
 const char *hdd_get_fwpath(void);
 void hdd_indicate_mgmt_frame(tSirSmeMgmtFrameInd *frame_ind);

-struct hdd_adapter *
-hdd_get_adapter_by_sme_session_id(struct hdd_context *hdd_ctx,
-				  uint32_t sme_session_id);
-
 /**
 * hdd_get_adapter_by_iface_name() - Return adapter with given interface name
 * @hdd_ctx: hdd context.
@@ -2766,9 +2776,9 @@ static inline int wlan_hdd_nl_init(struct hdd_context *hdd_ctx)
 	return nl_srv_init(hdd_ctx->wiphy);
 }
 #endif
-QDF_STATUS hdd_sme_open_session_callback(uint8_t session_id,
+QDF_STATUS hdd_sme_open_session_callback(uint8_t vdev_id,
 					 QDF_STATUS qdf_status);
-QDF_STATUS hdd_sme_close_session_callback(uint8_t session_id);
+QDF_STATUS hdd_sme_close_session_callback(uint8_t vdev_id);

 int hdd_reassoc(struct hdd_adapter *adapter, const uint8_t *bssid,
 		uint8_t channel, const handoff_src src);
--- a/core/hdd/src/wlan_hdd_cfg80211.c
+++ b/core/hdd/src/wlan_hdd_cfg80211.c
@@ -3652,13 +3652,13 @@ wlan_hdd_set_roam_param_policy[MAX_ROAMING_PARAM + 1] = {
 * @hdd_ctx:        HDD context
 * @roam_params:   roam params
 * @tb:            list of attributes
- * @session_id:    session id
+ * @vdev_id:    vdev id
 *
 * Return: 0 on success; error number on failure
 */
 static int hdd_set_white_list(struct hdd_context *hdd_ctx,
 			      struct roam_ext_params *roam_params,
-			      struct nlattr **tb, uint8_t session_id)
+			      struct nlattr **tb, uint8_t vdev_id)
 {
 	int rem, i;
 	uint32_t buf_len = 0, count;
@@ -3723,7 +3723,7 @@ static int hdd_set_white_list(struct hdd_context *hdd_ctx,
 	roam_params->num_ssid_allowed_list = i;
 	hdd_debug("Num of Allowed SSID %d", roam_params->num_ssid_allowed_list);
 	mac_handle = hdd_ctx->mac_handle;
-	sme_update_roam_params(mac_handle, session_id,
+	sme_update_roam_params(mac_handle, vdev_id,
 			       roam_params, REASON_ROAM_SET_SSID_ALLOWED);
 	return 0;

@@ -3736,13 +3736,13 @@ fail:
 * @hdd_ctx:        HDD context
 * @roam_params:   roam params
 * @tb:            list of attributes
- * @session_id:    session id
+ * @vdev_id:    vdev id
 *
 * Return: 0 on success; error number on failure
 */
 static int hdd_set_bssid_prefs(struct hdd_context *hdd_ctx,
 			       struct roam_ext_params *roam_params,
-			       struct nlattr **tb, uint8_t session_id)
+			       struct nlattr **tb, uint8_t vdev_id)
 {
 	int rem, i;
 	uint32_t count;
@@ -3811,7 +3811,7 @@ static int hdd_set_bssid_prefs(struct hdd_context *hdd_ctx,

 	roam_params->num_bssid_favored = i;
 	mac_handle = hdd_ctx->mac_handle;
-	sme_update_roam_params(mac_handle, session_id,
+	sme_update_roam_params(mac_handle, vdev_id,
 			       roam_params, REASON_ROAM_SET_FAVORED_BSSID);

 	return 0;
@@ -3825,14 +3825,14 @@ fail:
 * @hdd_ctx:        HDD context
 * @roam_params:   roam params
 * @tb:            list of attributes
- * @session_id:    session id
+ * @vdev_id:    vdev id
 *
 * Return: 0 on success; error number on failure
 */
 static int hdd_set_blacklist_bssid(struct hdd_context *hdd_ctx,
 				   struct roam_ext_params *roam_params,
 				   struct nlattr **tb,
-				   uint8_t session_id)
+				   uint8_t vdev_id)
 {
 	int rem, i;
 	uint32_t count;
@@ -3890,7 +3890,7 @@ static int hdd_set_blacklist_bssid(struct hdd_context *hdd_ctx,

 	roam_params->num_bssid_avoid_list = i;
 	mac_handle = hdd_ctx->mac_handle;
-	sme_update_roam_params(mac_handle, session_id,
+	sme_update_roam_params(mac_handle, vdev_id,
 			       roam_params, REASON_ROAM_SET_BLACKLIST_BSSID);

 	return 0;
@@ -3903,13 +3903,13 @@ fail:
 * @hdd_ctx:        HDD context
 * @roam_params:   roam params
 * @tb:            list of attributes
- * @session_id:    session id
+ * @vdev_id:    vdev id
 *
 * Return: 0 on success; error number on failure
 */
 static int hdd_set_ext_roam_params(struct hdd_context *hdd_ctx,
 				   const void *data, int data_len,
-				   uint8_t session_id,
+				   uint8_t vdev_id,
 				   struct roam_ext_params *roam_params)
 {
 	uint32_t cmd_type, req_id;
@@ -3939,7 +3939,7 @@ static int hdd_set_ext_roam_params(struct hdd_context *hdd_ctx,
 	hdd_debug("Req Id: %u Cmd Type: %u", req_id, cmd_type);
 	switch (cmd_type) {
 	case QCA_WLAN_VENDOR_ATTR_ROAM_SUBCMD_SSID_WHITE_LIST:
-		ret = hdd_set_white_list(hdd_ctx, roam_params, tb, session_id);
+		ret = hdd_set_white_list(hdd_ctx, roam_params, tb, vdev_id);
 		if (ret)
 			goto fail;
 		break;
@@ -4008,7 +4008,7 @@ static int hdd_set_ext_roam_params(struct hdd_context *hdd_ctx,
 			tb[PARAM_RSSI_TRIGGER]);
 		hdd_debug("Alert RSSI Threshold (%d)",
 			roam_params->alert_rssi_threshold);
-		sme_update_roam_params(mac_handle, session_id,
+		sme_update_roam_params(mac_handle, vdev_id,
 				       roam_params,
 				       REASON_ROAM_EXT_SCAN_PARAMS_CHANGED);
 		break;
@@ -4022,18 +4022,18 @@ static int hdd_set_ext_roam_params(struct hdd_context *hdd_ctx,
 			tb[PARAM_ROAM_ENABLE]);
 		hdd_debug("Activate Good Rssi Roam (%d)",
 			  roam_params->good_rssi_roam);
-		sme_update_roam_params(mac_handle, session_id,
+		sme_update_roam_params(mac_handle, vdev_id,
 				       roam_params,
 				       REASON_ROAM_GOOD_RSSI_CHANGED);
 		break;
 	case QCA_WLAN_VENDOR_ATTR_ROAM_SUBCMD_SET_BSSID_PREFS:
-		ret = hdd_set_bssid_prefs(hdd_ctx, roam_params, tb, session_id);
+		ret = hdd_set_bssid_prefs(hdd_ctx, roam_params, tb, vdev_id);
 		if (ret)
 			goto fail;
 		break;
 	case QCA_WLAN_VENDOR_ATTR_ROAM_SUBCMD_SET_BLACKLIST_BSSID:
 		ret = hdd_set_blacklist_bssid(hdd_ctx, roam_params,
-					      tb, session_id);
+					      tb, vdev_id);
 		if (ret)
 			goto fail;
 		break;
@@ -6283,7 +6283,7 @@ static int hdd_config_total_beacon_miss_count(struct hdd_adapter *adapter,
 		  first_miss_count, final_miss_count);

 	/*****
-	 * TODO: research why is 0 being passed for session ID???
+	 * TODO: research why is 0 being passed for vdev id???
 	 */
 	status = sme_set_roam_bmiss_final_bcnt(hdd_ctx->mac_handle,
 					       0,
@@ -17682,7 +17682,7 @@ int wlan_hdd_try_disconnect(struct hdd_adapter *adapter)
 				&adapter->roaming_comp_var,
 				msecs_to_jiffies(WLAN_WAIT_TIME_STOP_ROAM));
 			if (!rc) {
-				hdd_err("roaming comp var timed out session Id: %d",
+				hdd_err("roaming comp var timed out vdev id: %d",
 					adapter->vdev_id);
 			}
 			if (adapter->roam_ho_fail) {
@@ -17739,7 +17739,7 @@ int wlan_hdd_try_disconnect(struct hdd_adapter *adapter)
 		rc = wait_for_completion_timeout(&adapter->disconnect_comp_var,
 						 msecs_to_jiffies(wait_time));
 		if (!rc && (QDF_STATUS_CMD_NOT_QUEUED != status)) {
-			hdd_err("Sme disconnect event timed out session Id: %d sta_debug_state: %d",
+			hdd_err("Sme disconnect event timed out vdev id: %d sta_debug_state: %d",
 				adapter->vdev_id, sta_ctx->sta_debug_state);
 			result = -ETIMEDOUT;
 		}
@@ -17748,7 +17748,7 @@ int wlan_hdd_try_disconnect(struct hdd_adapter *adapter)
 		rc = wait_for_completion_timeout(&adapter->disconnect_comp_var,
 						 msecs_to_jiffies(wait_time));
 		if (!rc) {
-			hdd_err("Disconnect event timed out session Id: %d sta_debug_state: %d",
+			hdd_err("Disconnect event timed out vdev id: %d sta_debug_state: %d",
 				adapter->vdev_id, sta_ctx->sta_debug_state);
 			result = -ETIMEDOUT;
 		}
@@ -18102,7 +18102,7 @@ int wlan_hdd_disconnect(struct hdd_adapter *adapter, u16 reason)
 				&adapter->roaming_comp_var,
 				msecs_to_jiffies(WLAN_WAIT_TIME_STOP_ROAM));
 			if (!rc) {
-				hdd_err("roaming comp var timed out session Id: %d",
+				hdd_err("roaming comp var timed out vdev id: %d",
 					adapter->vdev_id);
 			}
 			if (adapter->roam_ho_fail) {
--- a/core/hdd/src/wlan_hdd_main.c
+++ b/core/hdd/src/wlan_hdd_main.c
@@ -3885,7 +3885,7 @@ static QDF_STATUS hdd_register_interface(struct hdd_adapter *adapter, bool rtnl_
 	return QDF_STATUS_SUCCESS;
 }

-QDF_STATUS hdd_sme_open_session_callback(uint8_t session_id,
+QDF_STATUS hdd_sme_open_session_callback(uint8_t vdev_id,
 					 QDF_STATUS qdf_status)
 {
 	struct hdd_adapter *adapter;
@@ -3897,9 +3897,9 @@ QDF_STATUS hdd_sme_open_session_callback(uint8_t session_id,
 		return QDF_STATUS_E_FAILURE;
 	}

-	adapter = hdd_get_adapter_by_sme_session_id(hdd_ctx, session_id);
+	adapter = hdd_get_adapter_by_vdev(hdd_ctx, vdev_id);
 	if (NULL == adapter) {
-		hdd_err("NULL adapter for %d", session_id);
+		hdd_err("NULL adapter for %d", vdev_id);
 		return QDF_STATUS_E_INVAL;
 	}

@@ -3912,7 +3912,7 @@ QDF_STATUS hdd_sme_open_session_callback(uint8_t session_id,
 	return QDF_STATUS_SUCCESS;
 }

-QDF_STATUS hdd_sme_close_session_callback(uint8_t session_id)
+QDF_STATUS hdd_sme_close_session_callback(uint8_t vdev_id)
 {
 	struct hdd_adapter *adapter;
 	struct hdd_context *hdd_ctx;
@@ -3923,7 +3923,7 @@ QDF_STATUS hdd_sme_close_session_callback(uint8_t session_id)
 		return QDF_STATUS_E_FAILURE;
 	}

-	adapter = hdd_get_adapter_by_sme_session_id(hdd_ctx, session_id);
+	adapter = hdd_get_adapter_by_vdev(hdd_ctx, vdev_id);
 	if (NULL == adapter) {
 		hdd_err("NULL adapter");
 		return QDF_STATUS_E_INVAL;
@@ -6765,7 +6765,7 @@ struct hdd_adapter *hdd_get_adapter_by_macaddr(struct hdd_context *hdd_ctx,
 }

 struct hdd_adapter *hdd_get_adapter_by_vdev(struct hdd_context *hdd_ctx,
-				       uint32_t vdev_id)
+					    uint32_t vdev_id)
 {
 	struct hdd_adapter *adapter;

@@ -6777,31 +6777,6 @@ struct hdd_adapter *hdd_get_adapter_by_vdev(struct hdd_context *hdd_ctx,
 	return NULL;
 }

-/**
- * hdd_get_adapter_by_sme_session_id() - Return adapter with
- * the sessionid
- * @hdd_ctx: hdd context.
- * @sme_session_id: sme session is for the adapter to get.
- *
- * This function is used to get the adapter with provided session id
- *
- * Return: adapter pointer if found
- *
- */
-struct hdd_adapter *
-hdd_get_adapter_by_sme_session_id(struct hdd_context *hdd_ctx,
-				  uint32_t sme_session_id)
-{
-	struct hdd_adapter *adapter;
-
-	hdd_for_each_adapter(hdd_ctx, adapter) {
-		if (adapter->vdev_id == sme_session_id)
-			return adapter;
-	}
-
-	return NULL;
-}
-
 struct hdd_adapter *hdd_get_adapter_by_iface_name(struct hdd_context *hdd_ctx,
 					     const char *iface_name)
 {
@@ -6838,7 +6813,7 @@ struct hdd_adapter *hdd_get_adapter(struct hdd_context *hdd_ctx,
 	return NULL;
 }

-enum QDF_OPMODE hdd_get_device_mode(uint32_t session_id)
+enum QDF_OPMODE hdd_get_device_mode(uint32_t vdev_id)
 {
 	struct hdd_context *hdd_ctx;
 	struct hdd_adapter *adapter;
@@ -6849,7 +6824,7 @@ enum QDF_OPMODE hdd_get_device_mode(uint32_t session_id)
 		return QDF_MAX_NO_OF_MODE;
 	}

-	adapter = hdd_get_adapter_by_sme_session_id(hdd_ctx, session_id);
+	adapter = hdd_get_adapter_by_vdev(hdd_ctx, vdev_id);
 	if (!adapter) {
 		hdd_err("Invalid HDD adapter");
 		return QDF_MAX_NO_OF_MODE;
@@ -8275,7 +8250,7 @@ wlan_hdd_display_netif_queue_history(struct hdd_context *hdd_ctx,

 	hdd_for_each_adapter(hdd_ctx, adapter) {
 		hdd_nofl_info("Netif queue operation statistics:");
-		hdd_nofl_info("Session_id %d device mode %d",
+		hdd_nofl_info("vdev_id %d device mode %d",
 			      adapter->vdev_id, adapter->device_mode);
 		hdd_nofl_info("Current pause_map value %x", adapter->pause_map);
 		curr_time = qdf_system_ticks();
@@ -8975,7 +8950,7 @@ void hdd_indicate_mgmt_frame(tSirSmeMgmtFrameInd *frame_ind)
 	if (SME_SESSION_ID_ANY == frame_ind->sessionId) {
 		for (i = 0; i < WLAN_MAX_VDEVS; i++) {
 			adapter =
-				hdd_get_adapter_by_sme_session_id(hdd_ctx, i);
+				hdd_get_adapter_by_vdev(hdd_ctx, i);
 			if (adapter)
 				break;
 		}
@@ -8994,8 +8969,8 @@ void hdd_indicate_mgmt_frame(tSirSmeMgmtFrameInd *frame_ind)
 		}
 		adapter = NULL;
 	} else {
-		adapter = hdd_get_adapter_by_sme_session_id(hdd_ctx,
-					frame_ind->sessionId);
+		adapter = hdd_get_adapter_by_vdev(hdd_ctx,
+						  frame_ind->sessionId);
 	}

 	if ((NULL != adapter) &&
@@ -14124,17 +14099,17 @@ void hdd_set_conparam(int32_t con_param)
 */
 void hdd_clean_up_pre_cac_interface(struct hdd_context *hdd_ctx)
 {
-	uint8_t session_id;
+	uint8_t vdev_id;
 	QDF_STATUS status;
 	struct hdd_adapter *precac_adapter;

-	status = wlan_sap_get_pre_cac_vdev_id(hdd_ctx->mac_handle, &session_id);
+	status = wlan_sap_get_pre_cac_vdev_id(hdd_ctx->mac_handle, &vdev_id);
 	if (QDF_IS_STATUS_ERROR(status)) {
 		hdd_err("failed to get pre cac vdev id");
 		return;
 	}

-	precac_adapter = hdd_get_adapter_by_vdev(hdd_ctx, session_id);
+	precac_adapter = hdd_get_adapter_by_vdev(hdd_ctx, vdev_id);
 	if (!precac_adapter) {
 		hdd_err("invalid pre cac adapter");
 		return;