From: Sujith Manoharan <c_man...@qca.qualcomm.com>

Signed-off-by: Sujith Manoharan <c_man...@qca.qualcomm.com>
---
 drivers/net/wireless/ath/ath10k/core.h  | 76 +--------------------------------
 drivers/net/wireless/ath/ath10k/debug.h | 75 ++++++++++++++++++++++++++++++++
 2 files changed, 76 insertions(+), 75 deletions(-)

diff --git a/drivers/net/wireless/ath/ath10k/core.h 
b/drivers/net/wireless/ath/ath10k/core.h
index fbf4d11..25ebe3d 100644
--- a/drivers/net/wireless/ath/ath10k/core.h
+++ b/drivers/net/wireless/ath/ath10k/core.h
@@ -27,6 +27,7 @@
 #include "hw.h"
 #include "targaddrs.h"
 #include "wmi.h"
+#include "debug.h"
 #include "../ath.h"
 #include "../regd.h"
 
@@ -121,72 +122,6 @@ struct ath10k_wmi {
        struct work_struct wmi_event_work;
 };
 
-struct ath10k_peer_stat {
-       u8 peer_macaddr[ETH_ALEN];
-       u32 peer_rssi;
-       u32 peer_tx_rate;
-};
-
-struct ath10k_target_stats {
-       /* PDEV stats */
-       s32 ch_noise_floor;
-       u32 tx_frame_count;
-       u32 rx_frame_count;
-       u32 rx_clear_count;
-       u32 cycle_count;
-       u32 phy_err_count;
-       u32 chan_tx_power;
-
-       /* PDEV TX stats */
-       s32 comp_queued;
-       s32 comp_delivered;
-       s32 msdu_enqued;
-       s32 mpdu_enqued;
-       s32 wmm_drop;
-       s32 local_enqued;
-       s32 local_freed;
-       s32 hw_queued;
-       s32 hw_reaped;
-       s32 underrun;
-       s32 tx_abort;
-       s32 mpdus_requed;
-       u32 tx_ko;
-       u32 data_rc;
-       u32 self_triggers;
-       u32 sw_retry_failure;
-       u32 illgl_rate_phy_err;
-       u32 pdev_cont_xretry;
-       u32 pdev_tx_timeout;
-       u32 pdev_resets;
-       u32 phy_underrun;
-       u32 txop_ovf;
-
-       /* PDEV RX stats */
-       s32 mid_ppdu_route_change;
-       s32 status_rcvd;
-       s32 r0_frags;
-       s32 r1_frags;
-       s32 r2_frags;
-       s32 r3_frags;
-       s32 htt_msdus;
-       s32 htt_mpdus;
-       s32 loc_msdus;
-       s32 loc_mpdus;
-       s32 oversize_amsdu;
-       s32 phy_errs;
-       s32 phy_err_drop;
-       s32 mpdu_errs;
-
-       /* VDEV STATS */
-
-       /* PEER STATS */
-       u8 peers;
-       struct ath10k_peer_stat peer_stat[TARGET_NUM_PEERS];
-
-       /* TODO: Beacon filter stats */
-
-};
-
 #define ATH10K_MAX_NUM_PEER_IDS (1 << 11) /* htt rx_desc limit */
 
 struct ath10k_peer {
@@ -240,15 +175,6 @@ struct ath10k_vif_iter {
        struct ath10k_vif *arvif;
 };
 
-struct ath10k_debug {
-       struct dentry *debugfs_phy;
-
-       struct ath10k_target_stats target_stats;
-       u32 wmi_service_bitmap[WMI_SERVICE_BM_SIZE];
-
-       struct completion event_stats_compl;
-};
-
 struct ath10k {
        struct ath_common common;
        struct ieee80211_hw *hw;
diff --git a/drivers/net/wireless/ath/ath10k/debug.h 
b/drivers/net/wireless/ath/ath10k/debug.h
index bbaaa37..b0549cd 100644
--- a/drivers/net/wireless/ath/ath10k/debug.h
+++ b/drivers/net/wireless/ath/ath10k/debug.h
@@ -40,6 +40,81 @@ extern __printf(1, 2) int ath10k_info(const char *fmt, ...);
 extern __printf(1, 2) int ath10k_err(const char *fmt, ...);
 extern __printf(1, 2) int ath10k_warn(const char *fmt, ...);
 
+struct ath10k_peer_stat {
+       u8 peer_macaddr[ETH_ALEN];
+       u32 peer_rssi;
+       u32 peer_tx_rate;
+};
+
+struct ath10k_target_stats {
+       /* PDEV stats */
+       s32 ch_noise_floor;
+       u32 tx_frame_count;
+       u32 rx_frame_count;
+       u32 rx_clear_count;
+       u32 cycle_count;
+       u32 phy_err_count;
+       u32 chan_tx_power;
+
+       /* PDEV TX stats */
+       s32 comp_queued;
+       s32 comp_delivered;
+       s32 msdu_enqued;
+       s32 mpdu_enqued;
+       s32 wmm_drop;
+       s32 local_enqued;
+       s32 local_freed;
+       s32 hw_queued;
+       s32 hw_reaped;
+       s32 underrun;
+       s32 tx_abort;
+       s32 mpdus_requed;
+       u32 tx_ko;
+       u32 data_rc;
+       u32 self_triggers;
+       u32 sw_retry_failure;
+       u32 illgl_rate_phy_err;
+       u32 pdev_cont_xretry;
+       u32 pdev_tx_timeout;
+       u32 pdev_resets;
+       u32 phy_underrun;
+       u32 txop_ovf;
+
+       /* PDEV RX stats */
+       s32 mid_ppdu_route_change;
+       s32 status_rcvd;
+       s32 r0_frags;
+       s32 r1_frags;
+       s32 r2_frags;
+       s32 r3_frags;
+       s32 htt_msdus;
+       s32 htt_mpdus;
+       s32 loc_msdus;
+       s32 loc_mpdus;
+       s32 oversize_amsdu;
+       s32 phy_errs;
+       s32 phy_err_drop;
+       s32 mpdu_errs;
+
+       /* VDEV STATS */
+
+       /* PEER STATS */
+       u8 peers;
+       struct ath10k_peer_stat peer_stat[TARGET_NUM_PEERS];
+
+       /* TODO: Beacon filter stats */
+
+};
+
+struct ath10k_debug {
+       struct dentry *debugfs_phy;
+
+       struct ath10k_target_stats target_stats;
+       u32 wmi_service_bitmap[WMI_SERVICE_BM_SIZE];
+
+       struct completion event_stats_compl;
+};
+
 #ifdef CONFIG_ATH10K_DEBUGFS
 int ath10k_debug_create(struct ath10k *ar);
 void ath10k_debug_read_service_map(struct ath10k *ar,
-- 
1.8.2.2

_______________________________________________
ath9k-devel mailing list
ath9k-devel@lists.ath9k.org
https://lists.ath9k.org/mailman/listinfo/ath9k-devel

Reply via email to