|
@@ -1754,13 +1754,13 @@ wlan_hdd_set_station_stats_request_pending(struct hdd_adapter *adapter)
|
|
|
if (!adapter->hdd_ctx->is_get_station_clubbed_in_ll_stats_req)
|
|
|
return QDF_STATUS_E_INVAL;
|
|
|
|
|
|
- vdev = hdd_objmgr_get_vdev(adapter);
|
|
|
+ vdev = hdd_objmgr_get_vdev_by_user(adapter, WLAN_OSIF_STATS_ID);
|
|
|
if (!vdev)
|
|
|
return QDF_STATUS_E_INVAL;
|
|
|
|
|
|
if (adapter->hdd_stats.is_ll_stats_req_in_progress) {
|
|
|
hdd_err("Previous ll_stats request is in progress");
|
|
|
- hdd_objmgr_put_vdev(vdev);
|
|
|
+ hdd_objmgr_put_vdev_by_user(vdev, WLAN_OSIF_STATS_ID);
|
|
|
return QDF_STATUS_E_ALREADY;
|
|
|
}
|
|
|
|
|
@@ -1768,10 +1768,10 @@ wlan_hdd_set_station_stats_request_pending(struct hdd_adapter *adapter)
|
|
|
info.u.get_station_stats_cb = cache_station_stats_cb;
|
|
|
info.vdev_id = adapter->vdev_id;
|
|
|
info.pdev_id = wlan_objmgr_pdev_get_pdev_id(wlan_vdev_get_pdev(vdev));
|
|
|
- peer = wlan_objmgr_vdev_try_get_bsspeer(vdev, WLAN_OSIF_ID);
|
|
|
+ peer = wlan_objmgr_vdev_try_get_bsspeer(vdev, WLAN_OSIF_STATS_ID);
|
|
|
if (!peer) {
|
|
|
osif_err("peer is null");
|
|
|
- hdd_objmgr_put_vdev(vdev);
|
|
|
+ hdd_objmgr_put_vdev_by_user(vdev, WLAN_OSIF_STATS_ID);
|
|
|
return QDF_STATUS_E_INVAL;
|
|
|
}
|
|
|
|
|
@@ -1779,11 +1779,11 @@ wlan_hdd_set_station_stats_request_pending(struct hdd_adapter *adapter)
|
|
|
|
|
|
qdf_mem_copy(info.peer_mac_addr, peer->macaddr, QDF_MAC_ADDR_SIZE);
|
|
|
|
|
|
- wlan_objmgr_peer_release_ref(peer, WLAN_OSIF_ID);
|
|
|
+ wlan_objmgr_peer_release_ref(peer, WLAN_OSIF_STATS_ID);
|
|
|
|
|
|
ucfg_mc_cp_stats_set_pending_req(wlan_vdev_get_psoc(vdev),
|
|
|
TYPE_STATION_STATS, &info);
|
|
|
- hdd_objmgr_put_vdev(vdev);
|
|
|
+ hdd_objmgr_put_vdev_by_user(vdev, WLAN_OSIF_STATS_ID);
|
|
|
return QDF_STATUS_SUCCESS;
|
|
|
}
|
|
|
|
|
@@ -4924,7 +4924,7 @@ bool hdd_report_max_rate(struct hdd_adapter *adapter,
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- vdev = hdd_objmgr_get_vdev(adapter);
|
|
|
+ vdev = hdd_objmgr_get_vdev_by_user(adapter, WLAN_OSIF_STATS_ID);
|
|
|
if (!vdev) {
|
|
|
hdd_err("failed to get vdev");
|
|
|
return false;
|
|
@@ -4934,7 +4934,7 @@ bool hdd_report_max_rate(struct hdd_adapter *adapter,
|
|
|
if (0 != ucfg_mlme_get_opr_rate(vdev, operational_rates,
|
|
|
&or_leng)) {
|
|
|
hdd_err("cfg get returned failure");
|
|
|
- hdd_objmgr_put_vdev(vdev);
|
|
|
+ hdd_objmgr_put_vdev_by_user(vdev, WLAN_OSIF_STATS_ID);
|
|
|
/*To keep GUI happy */
|
|
|
return false;
|
|
|
}
|
|
@@ -4959,15 +4959,14 @@ bool hdd_report_max_rate(struct hdd_adapter *adapter,
|
|
|
if (0 != ucfg_mlme_get_ext_opr_rate(vdev, extended_rates,
|
|
|
&er_leng)) {
|
|
|
hdd_err("cfg get returned failure");
|
|
|
- hdd_objmgr_put_vdev(vdev);
|
|
|
+ hdd_objmgr_put_vdev_by_user(vdev, WLAN_OSIF_STATS_ID);
|
|
|
/*To keep GUI happy */
|
|
|
return false;
|
|
|
}
|
|
|
|
|
|
he_mcs_12_13_map = wlan_vdev_mlme_get_he_mcs_12_13_map(vdev);
|
|
|
|
|
|
- hdd_objmgr_put_vdev(vdev);
|
|
|
-
|
|
|
+ hdd_objmgr_put_vdev_by_user(vdev, WLAN_OSIF_STATS_ID);
|
|
|
for (i = 0; i < er_leng; i++) {
|
|
|
for (j = 0; j < ARRAY_SIZE(supported_data_rate); j++) {
|
|
|
if (supported_data_rate[j].beacon_rate_index ==
|
|
@@ -5389,7 +5388,8 @@ static int wlan_hdd_get_sta_stats(struct wiphy *wiphy,
|
|
|
bool tx_rate_calc, rx_rate_calc;
|
|
|
uint8_t tx_nss_max, rx_nss_max;
|
|
|
|
|
|
- vdev = hdd_objmgr_get_vdev(adapter);
|
|
|
+ vdev = hdd_objmgr_get_vdev_by_user(adapter,
|
|
|
+ WLAN_OSIF_STATS_ID);
|
|
|
if (!vdev)
|
|
|
/* Keep GUI happy */
|
|
|
return 0;
|
|
@@ -5400,7 +5400,7 @@ static int wlan_hdd_get_sta_stats(struct wiphy *wiphy,
|
|
|
*/
|
|
|
tx_nss_max = wlan_vdev_mlme_get_nss(vdev);
|
|
|
rx_nss_max = wlan_vdev_mlme_get_nss(vdev);
|
|
|
- hdd_objmgr_put_vdev(vdev);
|
|
|
+ hdd_objmgr_put_vdev_by_user(vdev, WLAN_OSIF_STATS_ID);
|
|
|
|
|
|
hdd_check_and_update_nss(hdd_ctx, &tx_nss_max, &rx_nss_max);
|
|
|
|
|
@@ -6130,12 +6130,12 @@ QDF_STATUS wlan_hdd_get_mib_stats(struct hdd_adapter *adapter)
|
|
|
return QDF_STATUS_E_FAULT;
|
|
|
}
|
|
|
|
|
|
- vdev = hdd_objmgr_get_vdev(adapter);
|
|
|
+ vdev = hdd_objmgr_get_vdev_by_user(adapter, WLAN_OSIF_STATS_ID);
|
|
|
if (!vdev)
|
|
|
return QDF_STATUS_E_FAULT;
|
|
|
|
|
|
stats = wlan_cfg80211_mc_cp_stats_get_mib_stats(vdev, &ret);
|
|
|
- hdd_objmgr_put_vdev(vdev);
|
|
|
+ hdd_objmgr_put_vdev_by_user(vdev, WLAN_OSIF_STATS_ID);
|
|
|
if (ret || !stats) {
|
|
|
wlan_cfg80211_mc_cp_stats_free_stats_event(stats);
|
|
|
return ret;
|
|
@@ -6182,7 +6182,7 @@ QDF_STATUS wlan_hdd_get_rssi(struct hdd_adapter *adapter, int8_t *rssi_value)
|
|
|
return QDF_STATUS_SUCCESS;
|
|
|
}
|
|
|
|
|
|
- vdev = hdd_objmgr_get_vdev(adapter);
|
|
|
+ vdev = hdd_objmgr_get_vdev_by_user(adapter, WLAN_OSIF_STATS_ID);
|
|
|
if (!vdev) {
|
|
|
*rssi_value = adapter->rssi;
|
|
|
return QDF_STATUS_SUCCESS;
|
|
@@ -6192,7 +6192,7 @@ QDF_STATUS wlan_hdd_get_rssi(struct hdd_adapter *adapter, int8_t *rssi_value)
|
|
|
vdev,
|
|
|
sta_ctx->conn_info.bssid.bytes,
|
|
|
&ret);
|
|
|
- hdd_objmgr_put_vdev(vdev);
|
|
|
+ hdd_objmgr_put_vdev_by_user(vdev, WLAN_OSIF_STATS_ID);
|
|
|
if (ret || !rssi_info) {
|
|
|
wlan_cfg80211_mc_cp_stats_free_stats_event(rssi_info);
|
|
|
return ret;
|
|
@@ -6449,7 +6449,7 @@ int wlan_hdd_get_station_stats(struct hdd_adapter *adapter)
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
- vdev = hdd_objmgr_get_vdev(adapter);
|
|
|
+ vdev = hdd_objmgr_get_vdev_by_user(adapter, WLAN_OSIF_STATS_ID);
|
|
|
if (!vdev)
|
|
|
return -EINVAL;
|
|
|
|
|
@@ -6463,7 +6463,7 @@ int wlan_hdd_get_station_stats(struct hdd_adapter *adapter)
|
|
|
wlan_cfg80211_mc_cp_stats_free_stats_event(stats);
|
|
|
|
|
|
out:
|
|
|
- hdd_objmgr_put_vdev(vdev);
|
|
|
+ hdd_objmgr_put_vdev_by_user(vdev, WLAN_OSIF_STATS_ID);
|
|
|
return ret;
|
|
|
}
|
|
|
|