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
This commit is contained in:
Jeff Johnson
2019-02-24 16:26:51 -08:00
committad av nshrivas
förälder 3bc8194028
incheckning 4836302298
10 ändrade filer med 47 tillägg och 47 borttagningar

Visa fil

@@ -13465,7 +13465,7 @@ static int __wlan_hdd_cfg80211_change_bss(struct wiphy *wiphy,
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 @@ static int __wlan_hdd_change_station(struct wiphy *wiphy,
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 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy,
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 @@ static int __wlan_hdd_cfg80211_add_key(struct wiphy *wiphy,
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 @@ static int __wlan_hdd_cfg80211_get_key(struct wiphy *wiphy,
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 @@ static int __wlan_hdd_cfg80211_set_default_key(struct wiphy *wiphy,
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 @@ static int __wlan_hdd_cfg80211_set_default_key(struct wiphy *wiphy,
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 @@ static int __wlan_hdd_cfg80211_connect(struct wiphy *wiphy,
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 @@ static int __wlan_hdd_cfg80211_disconnect(struct wiphy *wiphy,
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 @@ static int __wlan_hdd_cfg80211_join_ibss(struct wiphy *wiphy,
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 @@ static int __wlan_hdd_cfg80211_leave_ibss(struct wiphy *wiphy,
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 @@ int __wlan_hdd_cfg80211_del_station(struct wiphy *wiphy,
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 @@ static int __wlan_hdd_cfg80211_add_station(struct wiphy *wiphy,
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 @@ static int __wlan_hdd_cfg80211_set_pmksa(struct wiphy *wiphy,
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 @@ static int __wlan_hdd_cfg80211_del_pmksa(struct wiphy *wiphy,
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 @@ static int __wlan_hdd_cfg80211_flush_pmksa(struct wiphy *wiphy,
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 @@ __wlan_hdd_cfg80211_update_ft_ies(struct wiphy *wiphy,
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 @@ int __wlan_hdd_cfg80211_set_rekey_data(struct wiphy *wiphy,
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 @@ __wlan_hdd_cfg80211_set_ap_channel_width(struct wiphy *wiphy,
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 @@ static int __wlan_hdd_cfg80211_channel_switch(struct wiphy *wiphy,
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 @@ __wlan_hdd_cfg80211_update_connect_params(struct wiphy *wiphy,
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 @@ __wlan_hdd_cfg80211_external_auth(struct wiphy *wiphy,
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);

Visa fil

@@ -5721,7 +5721,7 @@ static int __wlan_hdd_cfg80211_stop_ap(struct wiphy *wiphy,
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 @@ static int __wlan_hdd_cfg80211_start_ap(struct wiphy *wiphy,
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 @@ static int __wlan_hdd_cfg80211_change_beacon(struct wiphy *wiphy,
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,

Visa fil

@@ -107,7 +107,7 @@ static int wlan_hdd_gen_wlan_status_pack(struct wlan_status_data *data,
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);

Visa fil

@@ -145,7 +145,7 @@ static int __wlan_hdd_cfg80211_remain_on_channel(struct wiphy *wiphy,
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 @@ __wlan_hdd_cfg80211_cancel_remain_on_channel(struct wiphy *wiphy,
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 @@ static int __wlan_hdd_mgmt_tx(struct wiphy *wiphy, struct wireless_dev *wdev,
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 @@ static int __wlan_hdd_cfg80211_mgmt_tx_cancel_wait(struct wiphy *wiphy,
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 @@ struct wireless_dev *__wlan_hdd_add_virtual_intf(struct wiphy *wiphy,
}
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,

Visa fil

@@ -1113,7 +1113,7 @@ hdd_suspend_wlan(void)
}
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 @@ static int hdd_resume_wlan(void)
/*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 @@ static int __wlan_hdd_cfg80211_suspend_wlan(struct wiphy *wiphy,
* 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 @@ static int __wlan_hdd_cfg80211_suspend_wlan(struct wiphy *wiphy,
/* 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 @@ static int __wlan_hdd_cfg80211_set_power_mgmt(struct wiphy *wiphy,
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 @@ static int __wlan_hdd_cfg80211_get_txpower(struct wiphy *wiphy,
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;

Visa fil

@@ -74,7 +74,7 @@ __wlan_hdd_cfg80211_monitor_rssi(struct wiphy *wiphy,
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;
}

Visa fil

@@ -481,7 +481,7 @@ static int __wlan_hdd_cfg80211_scan(struct wiphy *wiphy,
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 @@ static int __wlan_hdd_cfg80211_sched_scan_start(struct wiphy *wiphy,
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 @@ int wlan_hdd_sched_scan_stop(struct net_device *dev)
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 @@ static void __wlan_hdd_cfg80211_abort_scan(struct wiphy *wiphy,
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);

Visa fil

@@ -69,7 +69,7 @@ static int __wlan_hdd_cfg80211_spectral_scan_start(struct wiphy *wiphy,
}
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,

Visa fil

@@ -1527,7 +1527,7 @@ __wlan_hdd_cfg80211_ll_stats_get(struct wiphy *wiphy,
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 @@ static int __wlan_hdd_cfg80211_get_station(struct wiphy *wiphy,
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)

Visa fil

@@ -494,7 +494,7 @@ static int __wlan_hdd_cfg80211_tdls_mgmt(struct wiphy *wiphy,
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 @@ static int __wlan_hdd_cfg80211_tdls_oper(struct wiphy *wiphy,
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);