From dd2c64da50350f18d1267131e51eb93eaa9e596e Mon Sep 17 00:00:00 2001 From: jiad Date: Sat, 11 May 2019 10:35:21 +0800 Subject: [PATCH] qcacld-3.0: Move IPA RX DPTRACE before eth_type_trans For RX DPTRACE, we assume skb->data points to start of ethernet header. In IPA RX exception path, DPTRACE is put after eth_type_trans and eth_type_trans removes ethernet header from skb->data. Thus move IPA RX DPTRACE before eth_type_trans. Change-Id: I4d1a60292db43964fe08f591f0ee4b14e55ca4d3 CRs-Fixed: 2451155 --- core/hdd/src/wlan_hdd_ipa.c | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/core/hdd/src/wlan_hdd_ipa.c b/core/hdd/src/wlan_hdd_ipa.c index b3425ed9e538..46033878ea74 100644 --- a/core/hdd/src/wlan_hdd_ipa.c +++ b/core/hdd/src/wlan_hdd_ipa.c @@ -428,6 +428,20 @@ void hdd_ipa_send_skb_to_network(qdf_nbuf_t skb, qdf_netdev_t dev) hdd_inspect_dhcp_packet(adapter, sta_id, skb, QDF_RX); } + qdf_dp_trace_set_track(skb, QDF_RX); + + hdd_event_eapol_log(skb, QDF_RX); + qdf_dp_trace_log_pkt(adapter->vdev_id, + skb, QDF_RX, QDF_TRACE_DEFAULT_PDEV_ID); + DPTRACE(qdf_dp_trace(skb, + QDF_DP_TRACE_RX_HDD_PACKET_PTR_RECORD, + QDF_TRACE_DEFAULT_PDEV_ID, + qdf_nbuf_data_addr(skb), + sizeof(qdf_nbuf_data(skb)), QDF_RX)); + DPTRACE(qdf_dp_trace_data_pkt(skb, QDF_TRACE_DEFAULT_PDEV_ID, + QDF_DP_TRACE_RX_PACKET_RECORD, 0, + QDF_RX)); + /* * Set PF_WAKE_UP_IDLE flag in the task structure * This task and any task woken by this will be waken to idle CPU @@ -452,20 +466,6 @@ void hdd_ipa_send_skb_to_network(qdf_nbuf_t skb, qdf_netdev_t dev) ++adapter->stats.rx_packets; adapter->stats.rx_bytes += skb->len; - qdf_dp_trace_set_track(skb, QDF_RX); - - hdd_event_eapol_log(skb, QDF_RX); - qdf_dp_trace_log_pkt(adapter->vdev_id, - skb, QDF_RX, QDF_TRACE_DEFAULT_PDEV_ID); - DPTRACE(qdf_dp_trace(skb, - QDF_DP_TRACE_RX_HDD_PACKET_PTR_RECORD, - QDF_TRACE_DEFAULT_PDEV_ID, - qdf_nbuf_data_addr(skb), - sizeof(qdf_nbuf_data(skb)), QDF_RX)); - DPTRACE(qdf_dp_trace_data_pkt(skb, QDF_TRACE_DEFAULT_PDEV_ID, - QDF_DP_TRACE_RX_PACKET_RECORD, 0, - QDF_RX)); - result = hdd_ipa_aggregated_rx_ind(skb); if (result == NET_RX_SUCCESS) ++adapter->hdd_stats.tx_rx_stats.rx_delivered[cpu_index];