qcacld-3.0: Replace wlan_hdd_validate_session_id()
To align with the coverged nomenclature replace
wlan_hdd_validate_session_id() with wlan_hdd_validate_vdev_id().
Change-Id: I06f948d8de4b8a98bfe66e18ae38b1040204fdb4
CRs-Fixed: 2404293
diff --git a/core/hdd/src/wlan_hdd_cfg80211.c b/core/hdd/src/wlan_hdd_cfg80211.c
index 8deee18..e7ccbb1 100644
--- a/core/hdd/src/wlan_hdd_cfg80211.c
+++ b/core/hdd/src/wlan_hdd_cfg80211.c
@@ -13465,7 +13465,7 @@
return -EINVAL;
}
- if (wlan_hdd_validate_session_id(adapter->vdev_id))
+ if (wlan_hdd_validate_vdev_id(adapter->vdev_id))
return -EINVAL;
qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD,
@@ -13942,7 +13942,7 @@
TRACE_CODE_HDD_CHANGE_STATION,
adapter->vdev_id, params->listen_interval);
- if (wlan_hdd_validate_session_id(adapter->vdev_id))
+ if (wlan_hdd_validate_vdev_id(adapter->vdev_id))
return -EINVAL;
hdd_ctx = WLAN_HDD_GET_CTX(adapter);
@@ -14200,7 +14200,7 @@
return -EINVAL;
}
- if (wlan_hdd_validate_session_id(adapter->vdev_id))
+ if (wlan_hdd_validate_vdev_id(adapter->vdev_id))
return -EINVAL;
qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD,
@@ -14300,7 +14300,7 @@
return -EINVAL;
}
- if (wlan_hdd_validate_session_id(adapter->vdev_id))
+ if (wlan_hdd_validate_vdev_id(adapter->vdev_id))
return -EINVAL;
qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD,
@@ -14639,7 +14639,7 @@
return -EINVAL;
}
- if (wlan_hdd_validate_session_id(adapter->vdev_id))
+ if (wlan_hdd_validate_vdev_id(adapter->vdev_id))
return -EINVAL;
hdd_debug("Device_mode %s(%d)",
@@ -14837,7 +14837,7 @@
return -EINVAL;
}
- if (wlan_hdd_validate_session_id(adapter->vdev_id))
+ if (wlan_hdd_validate_vdev_id(adapter->vdev_id))
return -EINVAL;
qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD,
@@ -14907,7 +14907,7 @@
return -EINVAL;
}
- if (wlan_hdd_validate_session_id(adapter->vdev_id))
+ if (wlan_hdd_validate_vdev_id(adapter->vdev_id))
return -EINVAL;
qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD,
@@ -17724,7 +17724,7 @@
return -EINVAL;
}
- if (wlan_hdd_validate_session_id(adapter->vdev_id))
+ if (wlan_hdd_validate_vdev_id(adapter->vdev_id))
return -EINVAL;
qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD,
@@ -18119,7 +18119,7 @@
return -EINVAL;
}
- if (wlan_hdd_validate_session_id(adapter->vdev_id))
+ if (wlan_hdd_validate_vdev_id(adapter->vdev_id))
return -EINVAL;
qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD,
@@ -18383,7 +18383,7 @@
return -EINVAL;
}
- if (wlan_hdd_validate_session_id(adapter->vdev_id))
+ if (wlan_hdd_validate_vdev_id(adapter->vdev_id))
return -EINVAL;
qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD,
@@ -18587,7 +18587,7 @@
return -EINVAL;
}
- if (wlan_hdd_validate_session_id(adapter->vdev_id))
+ if (wlan_hdd_validate_vdev_id(adapter->vdev_id))
return -EINVAL;
qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD,
@@ -18895,7 +18895,7 @@
return -EINVAL;
}
- if (wlan_hdd_validate_session_id(adapter->vdev_id))
+ if (wlan_hdd_validate_vdev_id(adapter->vdev_id))
return -EINVAL;
qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD,
@@ -19140,7 +19140,7 @@
return -EINVAL;
}
- if (wlan_hdd_validate_session_id(adapter->vdev_id))
+ if (wlan_hdd_validate_vdev_id(adapter->vdev_id))
return -EINVAL;
qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD,
@@ -19339,7 +19339,7 @@
return -EINVAL;
}
- if (wlan_hdd_validate_session_id(adapter->vdev_id))
+ if (wlan_hdd_validate_vdev_id(adapter->vdev_id))
return -EINVAL;
if (!pmksa) {
@@ -19439,7 +19439,7 @@
return -EINVAL;
}
- if (wlan_hdd_validate_session_id(adapter->vdev_id))
+ if (wlan_hdd_validate_vdev_id(adapter->vdev_id))
return -EINVAL;
if (!pmksa) {
@@ -19531,7 +19531,7 @@
return -EINVAL;
}
- if (wlan_hdd_validate_session_id(adapter->vdev_id))
+ if (wlan_hdd_validate_vdev_id(adapter->vdev_id))
return -EINVAL;
hdd_debug("Flushing PMKSA");
@@ -19611,7 +19611,7 @@
return -EINVAL;
}
- if (wlan_hdd_validate_session_id(adapter->vdev_id))
+ if (wlan_hdd_validate_vdev_id(adapter->vdev_id))
return -EINVAL;
qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD,
@@ -19763,7 +19763,7 @@
goto out;
}
- if (wlan_hdd_validate_session_id(adapter->vdev_id)) {
+ if (wlan_hdd_validate_vdev_id(adapter->vdev_id)) {
result = -EINVAL;
goto out;
}
@@ -20212,7 +20212,7 @@
return -EINVAL;
}
- if (wlan_hdd_validate_session_id(adapter->vdev_id))
+ if (wlan_hdd_validate_vdev_id(adapter->vdev_id))
return -EINVAL;
if (!(adapter->device_mode == QDF_SAP_MODE ||
@@ -20292,7 +20292,7 @@
hdd_debug("Set Freq %d",
csa_params->chandef.chan->center_freq);
- if (wlan_hdd_validate_session_id(adapter->vdev_id))
+ if (wlan_hdd_validate_vdev_id(adapter->vdev_id))
return -EINVAL;
hdd_ctx = WLAN_HDD_GET_CTX(adapter);
@@ -20593,7 +20593,7 @@
hdd_enter_dev(dev);
- if (wlan_hdd_validate_session_id(adapter->vdev_id))
+ if (wlan_hdd_validate_vdev_id(adapter->vdev_id))
return -EINVAL;
ret = wlan_hdd_validate_context(hdd_ctx);
@@ -20779,7 +20779,7 @@
return -EPERM;
}
- if (wlan_hdd_validate_session_id(adapter->vdev_id))
+ if (wlan_hdd_validate_vdev_id(adapter->vdev_id))
return -EINVAL;
ret = wlan_hdd_validate_context(hdd_ctx);
diff --git a/core/hdd/src/wlan_hdd_hostapd.c b/core/hdd/src/wlan_hdd_hostapd.c
index db6b0e9..1181593 100644
--- a/core/hdd/src/wlan_hdd_hostapd.c
+++ b/core/hdd/src/wlan_hdd_hostapd.c
@@ -5721,7 +5721,7 @@
return -EINVAL;
}
- if (wlan_hdd_validate_session_id(adapter->vdev_id))
+ if (wlan_hdd_validate_vdev_id(adapter->vdev_id))
return -EINVAL;
qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD,
@@ -6016,7 +6016,7 @@
return -EINVAL;
}
- if (wlan_hdd_validate_session_id(adapter->vdev_id))
+ if (wlan_hdd_validate_vdev_id(adapter->vdev_id))
return -EINVAL;
qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD,
@@ -6360,7 +6360,7 @@
return -EINVAL;
}
- if (wlan_hdd_validate_session_id(adapter->vdev_id))
+ if (wlan_hdd_validate_vdev_id(adapter->vdev_id))
return -EINVAL;
qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD,
diff --git a/core/hdd/src/wlan_hdd_lpass.c b/core/hdd/src/wlan_hdd_lpass.c
index 1fa3133..4b0cd53 100644
--- a/core/hdd/src/wlan_hdd_lpass.c
+++ b/core/hdd/src/wlan_hdd_lpass.c
@@ -107,7 +107,7 @@
return -EINVAL;
}
- if (wlan_hdd_validate_session_id(adapter->vdev_id))
+ if (wlan_hdd_validate_vdev_id(adapter->vdev_id))
return -EINVAL;
hdd_ctx = WLAN_HDD_GET_CTX(adapter);
diff --git a/core/hdd/src/wlan_hdd_p2p.c b/core/hdd/src/wlan_hdd_p2p.c
index fe5a036..11b0adb 100644
--- a/core/hdd/src/wlan_hdd_p2p.c
+++ b/core/hdd/src/wlan_hdd_p2p.c
@@ -145,7 +145,7 @@
return -EINVAL;
}
- if (wlan_hdd_validate_session_id(adapter->vdev_id))
+ if (wlan_hdd_validate_vdev_id(adapter->vdev_id))
return -EINVAL;
/* Disable NAN Discovery if enabled */
@@ -194,7 +194,7 @@
return -EINVAL;
}
- if (wlan_hdd_validate_session_id(adapter->vdev_id))
+ if (wlan_hdd_validate_vdev_id(adapter->vdev_id))
return -EINVAL;
status = wlan_cfg80211_cancel_roc(adapter->vdev, cookie);
@@ -244,7 +244,7 @@
return -EINVAL;
}
- if (wlan_hdd_validate_session_id(adapter->vdev_id))
+ if (wlan_hdd_validate_vdev_id(adapter->vdev_id))
return -EINVAL;
ret = wlan_hdd_validate_context(hdd_ctx);
@@ -338,7 +338,7 @@
return -EINVAL;
}
- if (wlan_hdd_validate_session_id(adapter->vdev_id))
+ if (wlan_hdd_validate_vdev_id(adapter->vdev_id))
return -EINVAL;
status = wlan_cfg80211_mgmt_tx_cancel(adapter->vdev, cookie);
@@ -672,7 +672,7 @@
}
adapter = hdd_get_adapter(hdd_ctx, QDF_STA_MODE);
- if (adapter && !wlan_hdd_validate_session_id(adapter->vdev_id)) {
+ if (adapter && !wlan_hdd_validate_vdev_id(adapter->vdev_id)) {
if (ucfg_scan_get_vdev_status(adapter->vdev) !=
SCAN_NOT_IN_PROGRESS) {
wlan_abort_scan(hdd_ctx->pdev, INVAL_PDEV_ID,
diff --git a/core/hdd/src/wlan_hdd_power.c b/core/hdd/src/wlan_hdd_power.c
index 776419e..54c1579 100644
--- a/core/hdd/src/wlan_hdd_power.c
+++ b/core/hdd/src/wlan_hdd_power.c
@@ -1113,7 +1113,7 @@
}
hdd_for_each_adapter(hdd_ctx, adapter) {
- if (wlan_hdd_validate_session_id(adapter->vdev_id))
+ if (wlan_hdd_validate_vdev_id(adapter->vdev_id))
continue;
/* stop all TX queues before suspend */
@@ -1172,7 +1172,7 @@
/*loop through all adapters. Concurrency */
hdd_for_each_adapter(hdd_ctx, adapter) {
- if (wlan_hdd_validate_session_id(adapter->vdev_id))
+ if (wlan_hdd_validate_vdev_id(adapter->vdev_id))
continue;
/* Disable supported OffLoads */
@@ -1731,7 +1731,7 @@
* until CAC is done for a SoftAP which is in started state.
*/
hdd_for_each_adapter(hdd_ctx, adapter) {
- if (wlan_hdd_validate_session_id(adapter->vdev_id))
+ if (wlan_hdd_validate_vdev_id(adapter->vdev_id))
continue;
if (QDF_SAP_MODE == adapter->device_mode) {
@@ -1786,7 +1786,7 @@
/* flush any pending powersave timers */
hdd_for_each_adapter(hdd_ctx, adapter) {
- if (wlan_hdd_validate_session_id(adapter->vdev_id))
+ if (wlan_hdd_validate_vdev_id(adapter->vdev_id))
continue;
sme_ps_timer_flush_sync(mac_handle, adapter->vdev_id);
@@ -1947,7 +1947,7 @@
return -EINVAL;
}
- if (wlan_hdd_validate_session_id(adapter->vdev_id))
+ if (wlan_hdd_validate_vdev_id(adapter->vdev_id))
return -EINVAL;
qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD,
@@ -2145,7 +2145,7 @@
return status;
/* Validate adapter sessionId */
- status = wlan_hdd_validate_session_id(adapter->vdev_id);
+ status = wlan_hdd_validate_vdev_id(adapter->vdev_id);
if (status)
return status;
diff --git a/core/hdd/src/wlan_hdd_rssi_monitor.c b/core/hdd/src/wlan_hdd_rssi_monitor.c
index 3c5e189..2fa9d4b 100644
--- a/core/hdd/src/wlan_hdd_rssi_monitor.c
+++ b/core/hdd/src/wlan_hdd_rssi_monitor.c
@@ -74,7 +74,7 @@
hdd_enter_dev(dev);
- if (wlan_hdd_validate_session_id(adapter->vdev_id)) {
+ if (wlan_hdd_validate_vdev_id(adapter->vdev_id)) {
hdd_err("invalid session id: %d", adapter->vdev_id);
return -EINVAL;
}
diff --git a/core/hdd/src/wlan_hdd_scan.c b/core/hdd/src/wlan_hdd_scan.c
index 597d798..5b0fa01 100644
--- a/core/hdd/src/wlan_hdd_scan.c
+++ b/core/hdd/src/wlan_hdd_scan.c
@@ -481,7 +481,7 @@
return -EINVAL;
}
- if (wlan_hdd_validate_session_id(adapter->vdev_id))
+ if (wlan_hdd_validate_vdev_id(adapter->vdev_id))
return -EINVAL;
status = wlan_hdd_validate_context(hdd_ctx);
@@ -1283,7 +1283,7 @@
return -EINVAL;
}
- if (wlan_hdd_validate_session_id(adapter->vdev_id))
+ if (wlan_hdd_validate_vdev_id(adapter->vdev_id))
return -EINVAL;
if (adapter->device_mode != QDF_STA_MODE) {
@@ -1363,7 +1363,7 @@
return -EINVAL;
}
- if (wlan_hdd_validate_session_id(adapter->vdev_id))
+ if (wlan_hdd_validate_vdev_id(adapter->vdev_id))
return -EINVAL;
hdd_ctx = WLAN_HDD_GET_CTX(adapter);
@@ -1516,7 +1516,7 @@
return;
}
- if (wlan_hdd_validate_session_id(adapter->vdev_id))
+ if (wlan_hdd_validate_vdev_id(adapter->vdev_id))
return;
ret = wlan_hdd_validate_context(hdd_ctx);
diff --git a/core/hdd/src/wlan_hdd_spectralscan.c b/core/hdd/src/wlan_hdd_spectralscan.c
index 444b6cd..c88d3a1 100644
--- a/core/hdd/src/wlan_hdd_spectralscan.c
+++ b/core/hdd/src/wlan_hdd_spectralscan.c
@@ -69,7 +69,7 @@
}
adapter = WLAN_HDD_GET_PRIV_PTR(dev);
- if (wlan_hdd_validate_session_id(adapter->vdev_id))
+ if (wlan_hdd_validate_vdev_id(adapter->vdev_id))
return -EINVAL;
ret = wlan_cfg80211_spectral_scan_config_and_start(wiphy,
diff --git a/core/hdd/src/wlan_hdd_stats.c b/core/hdd/src/wlan_hdd_stats.c
index 4715769..e0c1021 100644
--- a/core/hdd/src/wlan_hdd_stats.c
+++ b/core/hdd/src/wlan_hdd_stats.c
@@ -1527,7 +1527,7 @@
LinkLayerStatsGetReq.staId = adapter->vdev_id;
- if (wlan_hdd_validate_session_id(adapter->vdev_id))
+ if (wlan_hdd_validate_vdev_id(adapter->vdev_id))
return -EINVAL;
ret = wlan_hdd_send_ll_stats_req(hdd_ctx, &LinkLayerStatsGetReq);
@@ -4622,7 +4622,7 @@
if (status)
return status;
- if (wlan_hdd_validate_session_id(adapter->vdev_id))
+ if (wlan_hdd_validate_vdev_id(adapter->vdev_id))
return -EINVAL;
if (adapter->device_mode == QDF_SAP_MODE)
diff --git a/core/hdd/src/wlan_hdd_tdls.c b/core/hdd/src/wlan_hdd_tdls.c
index ee9d22b..ae2ffef 100644
--- a/core/hdd/src/wlan_hdd_tdls.c
+++ b/core/hdd/src/wlan_hdd_tdls.c
@@ -494,7 +494,7 @@
return -EINVAL;
}
- if (wlan_hdd_validate_session_id(adapter->vdev_id))
+ if (wlan_hdd_validate_vdev_id(adapter->vdev_id))
return -EINVAL;
qdf_mtrace(QDF_MODULE_ID_HDD, QDF_MODULE_ID_HDD,
@@ -650,7 +650,7 @@
return -EINVAL;
}
- if (wlan_hdd_validate_session_id(adapter->vdev_id))
+ if (wlan_hdd_validate_vdev_id(adapter->vdev_id))
return -EINVAL;
cfg_tdls_get_support_enable(hdd_ctx->psoc, &tdls_support);