qcacld-3.0: Refactor hardware name lithium with v2 for pkt capture mode
Refactor WLAN_FEATURE_PKT_CAPTURE_LITHIUM to WLAN_FEATURE_PKT_CAPTURE_V2 and refactor pkt_capture_get_pktcap_mode_lithium to pkt_capture_get_pktcap_mode_v2 to remove hardware name from compilation flag and function name. Change-Id: Id12c60a47dee95a719cc39aa0803edc9582dda3b CRs-Fixed: 2869808
Цей коміт міститься в:

зафіксовано
snandini

джерело
f85e7950d7
коміт
c6fcb33313
@@ -29,7 +29,7 @@
|
||||
|
||||
#include "cdp_txrx_cmn_struct.h"
|
||||
#include <qdf_nbuf.h>
|
||||
#ifndef WLAN_FEATURE_PKT_CAPTURE_LITHIUM
|
||||
#ifndef WLAN_FEATURE_PKT_CAPTURE_V2
|
||||
#include <htt_internal.h>
|
||||
#endif
|
||||
|
||||
@@ -75,7 +75,7 @@ void pkt_capture_datapkt_process(
|
||||
uint8_t *bssid, void *pdev,
|
||||
uint8_t tx_retry_cnt);
|
||||
|
||||
#ifndef WLAN_FEATURE_PKT_CAPTURE_LITHIUM
|
||||
#ifndef WLAN_FEATURE_PKT_CAPTURE_V2
|
||||
/**
|
||||
* pkt_capture_msdu_process_pkts() - process data rx pkts
|
||||
* @bssid: bssid
|
||||
@@ -115,7 +115,7 @@ void pkt_capture_rx_in_order_drop_offload_pkt(qdf_nbuf_t head_msdu);
|
||||
*/
|
||||
bool pkt_capture_rx_in_order_offloaded_pkt(qdf_nbuf_t rx_ind_msg);
|
||||
|
||||
#ifndef WLAN_FEATURE_PKT_CAPTURE_LITHIUM
|
||||
#ifndef WLAN_FEATURE_PKT_CAPTURE_V2
|
||||
/**
|
||||
* pkt_capture_offload_deliver_indication_handler() - Handle offload data pkts
|
||||
* @msg: offload netbuf msg
|
||||
|
@@ -31,7 +31,7 @@
|
||||
#include "wlan_pkt_capture_priv.h"
|
||||
#include "wlan_pkt_capture_objmgr.h"
|
||||
#include "wlan_objmgr_vdev_obj.h"
|
||||
#ifdef WLAN_FEATURE_PKT_CAPTURE_LITHIUM
|
||||
#ifdef WLAN_FEATURE_PKT_CAPTURE_V2
|
||||
#include "cdp_txrx_stats_struct.h"
|
||||
#endif
|
||||
|
||||
@@ -201,14 +201,14 @@ void pkt_capture_record_channel(struct wlan_objmgr_vdev *vdev);
|
||||
void pkt_capture_mon(struct pkt_capture_cb_context *cb_ctx, qdf_nbuf_t msdu,
|
||||
struct wlan_objmgr_vdev *vdev, uint16_t ch_freq);
|
||||
|
||||
#ifdef WLAN_FEATURE_PKT_CAPTURE_LITHIUM
|
||||
#ifdef WLAN_FEATURE_PKT_CAPTURE_V2
|
||||
/**
|
||||
* pkt_capture_get_pktcap_mode_lithium - Get packet capture mode
|
||||
* pkt_capture_get_pktcap_mode_v2 - Get packet capture mode
|
||||
*
|
||||
* Return: enum pkt_capture_mode
|
||||
*/
|
||||
enum pkt_capture_mode
|
||||
pkt_capture_get_pktcap_mode_lithium(void);
|
||||
pkt_capture_get_pktcap_mode_v2(void);
|
||||
|
||||
/**
|
||||
* pkt_capture_callback() - callback function for dp wdi events
|
||||
|
@@ -28,7 +28,7 @@
|
||||
#include <cds_ieee80211_common.h>
|
||||
#include <ol_txrx_htt_api.h>
|
||||
#include "wlan_policy_mgr_ucfg.h"
|
||||
#ifdef WLAN_FEATURE_PKT_CAPTURE_LITHIUM
|
||||
#ifdef WLAN_FEATURE_PKT_CAPTURE_V2
|
||||
#include "dp_internal.h"
|
||||
#include "cds_utils.h"
|
||||
#endif
|
||||
@@ -217,7 +217,7 @@ static void pkt_capture_tx_get_phy_info(
|
||||
tx_status->vht_flag_values2 = 4;
|
||||
}
|
||||
|
||||
#ifndef WLAN_FEATURE_PKT_CAPTURE_LITHIUM
|
||||
#ifndef WLAN_FEATURE_PKT_CAPTURE_V2
|
||||
/**
|
||||
* pkt_capture_update_tx_status() - tx status for tx packets, for
|
||||
* pkt capture mode(normal tx + offloaded tx) to prepare radiotap header
|
||||
@@ -295,7 +295,7 @@ pkt_capture_update_tx_status(
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifndef WLAN_FEATURE_PKT_CAPTURE_LITHIUM
|
||||
#ifndef WLAN_FEATURE_PKT_CAPTURE_V2
|
||||
/**
|
||||
* pkt_capture_rx_convert8023to80211() - convert 802.3 packet to 802.11
|
||||
* format from rx desc
|
||||
@@ -504,7 +504,7 @@ bool pkt_capture_rx_in_order_offloaded_pkt(qdf_nbuf_t rx_ind_msg)
|
||||
(*(msg_word + 1));
|
||||
}
|
||||
|
||||
#ifndef WLAN_FEATURE_PKT_CAPTURE_LITHIUM
|
||||
#ifndef WLAN_FEATURE_PKT_CAPTURE_V2
|
||||
void pkt_capture_msdu_process_pkts(
|
||||
uint8_t *bssid,
|
||||
qdf_nbuf_t head_msdu, uint8_t vdev_id,
|
||||
@@ -590,7 +590,7 @@ void pkt_capture_msdu_process_pkts(
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef WLAN_FEATURE_PKT_CAPTURE_LITHIUM
|
||||
#ifdef WLAN_FEATURE_PKT_CAPTURE_V2
|
||||
/**
|
||||
* pkt_capture_dp_rx_skip_tlvs() - Skip TLVs len + L2 hdr_offset, save in nbuf
|
||||
* @nbuf: nbuf to be updated
|
||||
@@ -751,7 +751,7 @@ static void pkt_capture_rx_mon_get_rx_status(void *psoc, void *desc,
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifndef WLAN_FEATURE_PKT_CAPTURE_LITHIUM
|
||||
#ifndef WLAN_FEATURE_PKT_CAPTURE_V2
|
||||
/**
|
||||
* pkt_capture_rx_data_cb(): callback to process data rx packets
|
||||
* for pkt capture mode. (normal rx + offloaded rx)
|
||||
@@ -981,7 +981,7 @@ free_buf:
|
||||
|
||||
#endif
|
||||
|
||||
#ifndef WLAN_FEATURE_PKT_CAPTURE_LITHIUM
|
||||
#ifndef WLAN_FEATURE_PKT_CAPTURE_V2
|
||||
/**
|
||||
* pkt_capture_tx_data_cb() - process data tx and rx packets
|
||||
* for pkt capture mode. (normal tx/rx + offloaded tx/rx)
|
||||
@@ -1458,7 +1458,7 @@ struct htt_tx_data_hdr_information *pkt_capture_tx_get_txcomplete_data_hdr(
|
||||
return txcomplete_data_hrd_list;
|
||||
}
|
||||
|
||||
#ifndef WLAN_FEATURE_PKT_CAPTURE_LITHIUM
|
||||
#ifndef WLAN_FEATURE_PKT_CAPTURE_V2
|
||||
void pkt_capture_offload_deliver_indication_handler(
|
||||
void *msg, uint8_t vdev_id,
|
||||
uint8_t *bssid, htt_pdev_handle pdev)
|
||||
|
@@ -21,7 +21,7 @@
|
||||
* internally in pkt_capture component only.
|
||||
*/
|
||||
|
||||
#ifdef WLAN_FEATURE_PKT_CAPTURE_LITHIUM
|
||||
#ifdef WLAN_FEATURE_PKT_CAPTURE_V2
|
||||
#include <dp_types.h>
|
||||
#endif
|
||||
#include "wlan_pkt_capture_main.h"
|
||||
@@ -34,7 +34,7 @@
|
||||
|
||||
static struct wlan_objmgr_vdev *gp_pkt_capture_vdev;
|
||||
|
||||
#ifdef WLAN_FEATURE_PKT_CAPTURE_LITHIUM
|
||||
#ifdef WLAN_FEATURE_PKT_CAPTURE_V2
|
||||
wdi_event_subscribe PKT_CAPTURE_TX_SUBSCRIBER;
|
||||
wdi_event_subscribe PKT_CAPTURE_RX_SUBSCRIBER;
|
||||
wdi_event_subscribe PKT_CAPTURE_OFFLOAD_TX_SUBSCRIBER;
|
||||
@@ -104,7 +104,7 @@ static void pkt_capture_wdi_event_unsubscribe(struct wlan_objmgr_psoc *psoc)
|
||||
}
|
||||
|
||||
enum pkt_capture_mode
|
||||
pkt_capture_get_pktcap_mode_lithium()
|
||||
pkt_capture_get_pktcap_mode_v2()
|
||||
{
|
||||
enum pkt_capture_mode mode = PACKET_CAPTURE_MODE_DISABLE;
|
||||
struct pkt_capture_vdev_priv *vdev_priv;
|
||||
@@ -142,7 +142,7 @@ void pkt_capture_callback(void *soc, enum WDI_EVENT event, void *log_data,
|
||||
int nbuf_len;
|
||||
|
||||
hal_tx_comp_get_status(&desc->comp, &ppdu_hdr, psoc->hal_soc);
|
||||
if (!(pkt_capture_get_pktcap_mode_lithium() &
|
||||
if (!(pkt_capture_get_pktcap_mode_v2() &
|
||||
PKT_CAPTURE_MODE_DATA_ONLY)) {
|
||||
return;
|
||||
}
|
||||
@@ -212,7 +212,7 @@ void pkt_capture_callback(void *soc, enum WDI_EVENT event, void *log_data,
|
||||
|
||||
case WDI_EVENT_PKT_CAPTURE_RX_DATA:
|
||||
{
|
||||
if (!(pkt_capture_get_pktcap_mode_lithium() &
|
||||
if (!(pkt_capture_get_pktcap_mode_v2() &
|
||||
PKT_CAPTURE_MODE_DATA_ONLY))
|
||||
return;
|
||||
|
||||
@@ -227,7 +227,7 @@ void pkt_capture_callback(void *soc, enum WDI_EVENT event, void *log_data,
|
||||
bool is_pkt_during_roam = false;
|
||||
uint32_t freq = 0;
|
||||
|
||||
if (!(pkt_capture_get_pktcap_mode_lithium() &
|
||||
if (!(pkt_capture_get_pktcap_mode_v2() &
|
||||
PKT_CAPTURE_MODE_DATA_ONLY))
|
||||
return;
|
||||
|
||||
|
Посилання в новій задачі
Заблокувати користувача