Explorar el Código

qcacld-3.0: Replace WLAN_OSIF_ID with specific dbg id

Replace generic WLAN_OSIF_ID by functionality specific dbg id
with API hdd_objmgr_get_vdev_by_user.

Change-Id: I06e1e14a998377e36ae533eec914eb3b61b6c165
CRs-Fixed: 2839542
Liangwei Dong hace 4 años
padre
commit
563ec623d8

+ 4 - 4
core/hdd/src/wlan_hdd_medium_assess.c

@@ -178,7 +178,7 @@ static int hdd_medium_assess_cca(struct hdd_context *hdd_ctx,
 	uint8_t pdev_id, dcs_enable;
 	int errno = 0;
 
-	vdev = hdd_objmgr_get_vdev(adapter);
+	vdev = hdd_objmgr_get_vdev_by_user(adapter, WLAN_DCS_ID);
 	if (!vdev)
 		return -EINVAL;
 
@@ -211,7 +211,7 @@ static int hdd_medium_assess_cca(struct hdd_context *hdd_ctx,
 	ucfg_dcs_set_user_request(hdd_ctx->psoc, pdev_id, cca_period);
 
 out:
-	hdd_objmgr_put_vdev(vdev);
+	hdd_objmgr_put_vdev_by_user(vdev, WLAN_DCS_ID);
 	return errno;
 }
 
@@ -295,7 +295,7 @@ static int hdd_medium_assess_congestion_report(struct hdd_context *hdd_ctx,
 	QDF_STATUS status;
 	int errno = 0;
 
-	vdev = hdd_objmgr_get_vdev(adapter);
+	vdev = hdd_objmgr_get_vdev_by_user(adapter, WLAN_CP_STATS_ID);
 	if (!vdev)
 		return -EINVAL;
 
@@ -368,7 +368,7 @@ static int hdd_medium_assess_congestion_report(struct hdd_context *hdd_ctx,
 	}
 
 out:
-	hdd_objmgr_put_vdev(vdev);
+	hdd_objmgr_put_vdev_by_user(vdev, WLAN_CP_STATS_ID);
 	return errno;
 }
 

+ 2 - 2
core/hdd/src/wlan_hdd_softap_tx_rx.c

@@ -1489,10 +1489,10 @@ QDF_STATUS hdd_softap_change_sta_state(struct hdd_adapter *adapter,
 
 	if (QDF_STATUS_SUCCESS == qdf_status) {
 		sta_info->peer_state = OL_TXRX_PEER_STATE_AUTH;
-		vdev = hdd_objmgr_get_vdev(adapter);
+		vdev = hdd_objmgr_get_vdev_by_user(adapter, WLAN_OSIF_ID);
 		if (vdev) {
 			p2p_peer_authorized(vdev, sta_mac->bytes);
-			hdd_objmgr_put_vdev(vdev);
+			hdd_objmgr_put_vdev_by_user(vdev, WLAN_OSIF_ID);
 		} else {
 			hdd_err("vdev is NULL");
 		}

+ 2 - 2
core/hdd/src/wlan_hdd_stats.c

@@ -217,7 +217,7 @@ static int copy_station_stats_to_adapter(struct hdd_adapter *adapter,
 	uint16_t he_mcs_12_13_map;
 	bool is_he_mcs_12_13_supported;
 
-	vdev = hdd_objmgr_get_vdev(adapter);
+	vdev = hdd_objmgr_get_vdev_by_user(adapter, WLAN_OSIF_STATS_ID);
 	if (!vdev)
 		return -EINVAL;
 
@@ -321,7 +321,7 @@ static int copy_station_stats_to_adapter(struct hdd_adapter *adapter,
 		     sizeof(stats->vdev_chain_rssi[0].chain_rssi));
 	adapter->hdd_stats.bcn_protect_stats = stats->bcn_protect_stats;
 out:
-	hdd_objmgr_put_vdev(vdev);
+	hdd_objmgr_put_vdev_by_user(vdev, WLAN_OSIF_STATS_ID);
 	return ret;
 }
 

+ 8 - 6
core/hdd/src/wlan_hdd_tx_rx.c

@@ -879,12 +879,12 @@ static bool hdd_is_xmit_allowed_on_ndi(struct hdd_adapter *adapter)
 	enum nan_datapath_state state;
 	struct wlan_objmgr_vdev *vdev;
 
-	vdev = hdd_objmgr_get_vdev(adapter);
+	vdev = hdd_objmgr_get_vdev_by_user(adapter, WLAN_OSIF_NAN_ID);
 	if (!vdev)
 		return false;
 
 	state = ucfg_nan_get_ndi_state(vdev);
-	hdd_objmgr_put_vdev(vdev);
+	hdd_objmgr_put_vdev_by_user(vdev, WLAN_OSIF_NAN_ID);
 	return (state == NAN_DATA_NDI_CREATED_STATE ||
 		state == NAN_DATA_CONNECTED_STATE ||
 		state == NAN_DATA_CONNECTING_STATE ||
@@ -1209,10 +1209,10 @@ static void __hdd_hard_start_xmit(struct sk_buff *skb,
 
 	adapter->stats.tx_bytes += skb->len;
 
-	vdev = hdd_objmgr_get_vdev(adapter);
+	vdev = hdd_objmgr_get_vdev_by_user(adapter, WLAN_OSIF_TDLS_ID);
 	if (vdev) {
 		ucfg_tdls_update_tx_pkt_cnt(vdev, &mac_addr);
-		hdd_objmgr_put_vdev(vdev);
+		hdd_objmgr_put_vdev_by_user(vdev, WLAN_OSIF_TDLS_ID);
 	}
 
 	if (qdf_nbuf_is_tso(skb)) {
@@ -2582,11 +2582,13 @@ QDF_STATUS hdd_rx_packet_cbk(void *adapter_context,
 		mac_addr = (struct qdf_mac_addr *)(skb->data+QDF_MAC_ADDR_SIZE);
 
 		if (!hdd_is_current_high_throughput(hdd_ctx)) {
-			vdev = hdd_objmgr_get_vdev(adapter);
+			vdev = hdd_objmgr_get_vdev_by_user(adapter,
+							   WLAN_OSIF_TDLS_ID);
 			if (vdev) {
 				ucfg_tdls_update_rx_pkt_cnt(vdev, mac_addr,
 							    dest_mac_addr);
-				hdd_objmgr_put_vdev(vdev);
+				hdd_objmgr_put_vdev_by_user(vdev,
+							    WLAN_OSIF_TDLS_ID);
 			}
 		}