ソースを参照

qcacld-3.0: Fix data path function call from HDD

Get the intra-bss packet count in HDD using the CDP interface.

The CDP interface ensures that the appropriate data path API
is invoked  (which is target dependent). A crash is seen on
Napier since ol_txrx_get_vdev_from_vdev_id() which is not
supported on Napier is being invoked.

Change-Id: I647d8c8705ad5c93fb3e3a05b2f9b3896a4f459a
CRs-Fixed: 1114851
Dhanashri Atre 8 年 前
コミット
a8f82f28fc
2 ファイル変更8 行追加4 行削除
  1. 5 2
      core/hdd/src/wlan_hdd_hostapd.c
  2. 3 2
      core/hdd/src/wlan_hdd_main.c

+ 5 - 2
core/hdd/src/wlan_hdd_hostapd.c

@@ -75,7 +75,7 @@
 #include "cds_concurrency.h"
 #include "wlan_hdd_tsf.h"
 #include "wlan_hdd_green_ap.h"
-#include "ol_rx_fwd.h"
+#include <cdp_txrx_misc.h>
 #include "wlan_hdd_power.h"
 #include "wlan_hdd_object_manager.h"
 
@@ -1597,10 +1597,13 @@ QDF_STATUS hdd_hostapd_sap_event_cb(tpSap_Event pSapEvent,
 				pHostapdAdapter->stats.tx_packets;
 			pHostapdAdapter->prev_rx_packets =
 				pHostapdAdapter->stats.rx_packets;
-			ol_get_intra_bss_fwd_pkts_count(
+
+			cdp_get_intra_bss_fwd_pkts_count(
+				cds_get_context(QDF_MODULE_ID_SOC),
 				pHostapdAdapter->sessionId,
 				&pHostapdAdapter->prev_fwd_tx_packets,
 				&pHostapdAdapter->prev_fwd_rx_packets);
+
 			spin_unlock_bh(&pHddCtx->bus_bw_lock);
 			hdd_start_bus_bw_compute_timer(pHostapdAdapter);
 		}

+ 3 - 2
core/hdd/src/wlan_hdd_main.c

@@ -57,6 +57,7 @@
 #include "qdf_types.h"
 #include "qdf_trace.h"
 #include <cdp_txrx_peer_ops.h>
+#include <cdp_txrx_misc.h>
 
 #include <net/addrconf.h>
 #include <linux/wireless.h>
@@ -100,7 +101,6 @@
 #include "wlan_hdd_green_ap.h"
 #include "bmi.h"
 #include <wlan_hdd_regulatory.h>
-#include "ol_rx_fwd.h"
 #include "wlan_hdd_lpass.h"
 #include "nan_api.h"
 #include <wlan_hdd_napi.h>
@@ -5472,7 +5472,8 @@ static void hdd_bus_bw_work_handler(struct work_struct *work)
 				adapter->device_mode == QDF_P2P_GO_MODE ||
 				adapter->device_mode == QDF_IBSS_MODE) {
 
-			ret = ol_get_intra_bss_fwd_pkts_count(
+			ret = cdp_get_intra_bss_fwd_pkts_count(
+				cds_get_context(QDF_MODULE_ID_SOC),
 				adapter->sessionId,
 				&fwd_tx_packets, &fwd_rx_packets);
 			if (ret == A_OK) {