Parcourir la source

qcacld-3.0: Rename hdd_is_connection_in_progress() params

Currently hdd_is_connection_in_progress() uses the legacy term
"session_id" for one of its parameters. In order to align with the
current terminology replace this with "vdev_id." And further to
provide additional information, add an "out_" prefix to both output
parameters.

Change-Id: I658e3adf0b4448f33f657d4cc839a4b6d180e31e
CRs-Fixed: 2410831
Jeff Johnson il y a 6 ans
Parent
commit
a2ac4e7375
2 fichiers modifiés avec 29 ajouts et 26 suppressions
  1. 15 2
      core/hdd/inc/wlan_hdd_main.h
  2. 14 24
      core/hdd/src/wlan_hdd_main.c

+ 15 - 2
core/hdd/inc/wlan_hdd_main.h

@@ -3010,8 +3010,21 @@ tSirAddie *hdd_assoc_additional_ie(struct hdd_adapter *adapter)
  */
 bool hdd_is_roaming_in_progress(struct hdd_context *hdd_ctx);
 void hdd_set_roaming_in_progress(bool value);
-bool hdd_is_connection_in_progress(uint8_t *session_id,
-	enum scan_reject_states *reason);
+
+/**
+ * hdd_is_connection_in_progress() - check if connection is in progress
+ * @out_vdev_id: id of vdev where connection is occurring
+ * @out_reason: scan reject reason
+ *
+ * Go through each adapter and check if connection is in progress.
+ * Output parameters @out_vdev_id and @out_reason will only be written
+ * when a connection is in progress.
+ *
+ * Return: true if connection is in progress else false
+ */
+bool hdd_is_connection_in_progress(uint8_t *out_vdev_id,
+				   enum scan_reject_states *out_reason);
+
 void hdd_restart_sap(struct hdd_adapter *ap_adapter);
 void hdd_check_and_restart_sap_with_non_dfs_acs(void);
 bool hdd_set_connection_in_progress(bool value);

+ 14 - 24
core/hdd/src/wlan_hdd_main.c

@@ -14644,18 +14644,8 @@ bool hdd_is_roaming_in_progress(struct hdd_context *hdd_ctx)
 	return hdd_ctx->roaming_in_progress;
 }
 
-/**
- * hdd_is_connection_in_progress() - check if connection is in
- * progress
- * @session_id: session id
- * @reason: scan reject reason
- *
- * Go through each adapter and check if Connection is in progress
- *
- * Return: true if connection is in progress else false
- */
-bool hdd_is_connection_in_progress(uint8_t *session_id,
-				enum scan_reject_states *reason)
+bool hdd_is_connection_in_progress(uint8_t *out_vdev_id,
+				   enum scan_reject_states *out_reason)
 {
 	struct hdd_station_ctx *hdd_sta_ctx = NULL;
 	struct hdd_adapter *adapter = NULL;
@@ -14685,9 +14675,9 @@ bool hdd_is_connection_in_progress(uint8_t *session_id,
 			hdd_debug("%pK(%d) Connection is in progress",
 				WLAN_HDD_GET_STATION_CTX_PTR(adapter),
 				adapter->vdev_id);
-			if (session_id && reason) {
-				*session_id = adapter->vdev_id;
-				*reason = CONNECTION_IN_PROGRESS;
+			if (out_vdev_id && out_reason) {
+				*out_vdev_id = adapter->vdev_id;
+				*out_reason = CONNECTION_IN_PROGRESS;
 			}
 			return true;
 		}
@@ -14703,9 +14693,9 @@ bool hdd_is_connection_in_progress(uint8_t *session_id,
 			hdd_debug("%pK(%d) Reassociation in progress",
 				WLAN_HDD_GET_STATION_CTX_PTR(adapter),
 				adapter->vdev_id);
-			if (session_id && reason) {
-				*session_id = adapter->vdev_id;
-				*reason = REASSOC_IN_PROGRESS;
+			if (out_vdev_id && out_reason) {
+				*out_vdev_id = adapter->vdev_id;
+				*out_reason = REASSOC_IN_PROGRESS;
 			}
 			return true;
 		}
@@ -14723,9 +14713,9 @@ bool hdd_is_connection_in_progress(uint8_t *session_id,
 				hdd_debug("client " MAC_ADDRESS_STR
 					" is in middle of WPS/EAPOL exchange.",
 					MAC_ADDR_ARRAY(sta_mac));
-				if (session_id && reason) {
-					*session_id = adapter->vdev_id;
-					*reason = EAPOL_IN_PROGRESS;
+				if (out_vdev_id && out_reason) {
+					*out_vdev_id = adapter->vdev_id;
+					*out_reason = EAPOL_IN_PROGRESS;
 				}
 				return true;
 			}
@@ -14744,9 +14734,9 @@ bool hdd_is_connection_in_progress(uint8_t *session_id,
 				hdd_debug("client " MAC_ADDRESS_STR
 				" of SAP/GO is in middle of WPS/EAPOL exchange",
 				MAC_ADDR_ARRAY(sta_mac));
-				if (session_id && reason) {
-					*session_id = adapter->vdev_id;
-					*reason = SAP_EAPOL_IN_PROGRESS;
+				if (out_vdev_id && out_reason) {
+					*out_vdev_id = adapter->vdev_id;
+					*out_reason = SAP_EAPOL_IN_PROGRESS;
 				}
 				return true;
 			}