ath11k: remove deprecated WMI PEER stats
PATCH 1/1 ath11k: remove deprecated WMI PEER stats
Removing WMI PEER stats which has been deprecated in FW and rx_duration of a peer is now fetched from HTT PPDU_END stats.
--- drivers/net/wireless/ath/ath11k/core.h | 23 ---- drivers/net/wireless/ath/ath11k/debug.c | 141 +-------------------- drivers/net/wireless/ath/ath11k/debug.h | 7 -- drivers/net/wireless/ath/ath11k/debugfs_sta.c | 19 --- drivers/net/wireless/ath/ath11k/wmi.c | 170 +------------------------- drivers/net/wireless/ath/ath11k/wmi.h | 18 --- 6 files changed, 3 insertions(+), 375 deletions(-)
drivers/net/wireless/ath/ath11k/core.h +0 -23
@@ -357,8 +357,6 @@ struct ath11k_fw_stats {struct list_head pdevs;struct list_head vdevs;struct list_head bcn; -struct list_head peers; -struct list_head peers_extd; };struct ath11k_dbg_htt_stats {
@@ -766,27 +764,6 @@ struct ath11k_fw_stats_bcn {u32 tx_bcn_outage_cnt; }; -struct ath11k_fw_stats_peer { -struct list_head list; - -u8 peer_macaddr[ETH_ALEN ]; -u32 peer_rssi; -u32 peer_tx_rate; -u32 peer_rx_rate; -}; - -struct ath11k_fw_stats_peer_extd { -struct list_head list; - -u8 peer_macaddr[ETH_ALEN ]; -u32 rx_duration; -u32 peer_tx_bytes; -u32 peer_rx_bytes; -u32 last_tx_rate_code; -s32 last_tx_power; -u32 rx_mc_bc_cnt; -}; -void ath11k_peer_unmap_event (struct ath11k_base *ab,u16 peer_id);void ath11k_peer_map_event (struct ath11k_base *ab,u8 vdev_id,u16 peer_id,u8 *mac_addr,u16 ast_hash);
drivers/net/wireless/ath/ath11k/debug.c +2 -139
195 lines not on this page · raw message
drivers/net/wireless/ath/ath11k/debug.h +0 -7
@@ -241,8 +241,6 @@ ath11k_accumulate_per_peer_tx_stats(struct ath11k_sta *arsta,void ath11k_update_per_peer_stats_from_txcompl (struct ath11k *ar,struct sk_buff *msdu,struct hal_tx_status *ts); -void ath11k_sta_update_rx_duration (struct ath11k *ar, -struct ath11k_fw_stats *stats);#else /* !CONFIG_MAC80211_DEBUGFS */ static inline void ath11k_accumulate_per_peer_tx_stats(struct ath11k_sta *arsta,
@@ -258,11 +256,6 @@ ath11k_update_per_peer_stats_from_txcompl(struct ath11k *ar, { } -static inline void ath11k_sta_update_rx_duration (struct ath11k *ar, -struct ath11k_fw_stats *stats) -{ -} -#endif /* CONFIG_MAC80211_DEBUGFS*/ #define ath11k_dbg (ar, dbg_mask, fmt, ...) \
drivers/net/wireless/ath/ath11k/debugfs_sta.c +0 -19
@@ -9,25 +9,6 @@#include "peer.h" #include "debug.h" -void ath11k_sta_update_rx_duration (struct ath11k *ar, -struct ath11k_fw_stats *stats) -{ -struct ath11k_fw_stats_peer_extd *peer; -struct ieee80211_sta *sta; -struct ath11k_sta *arsta; - -rcu_read_lock (); -list_for_each_entry (peer, &stats->peers_extd, list) { - sta =ieee80211_find_sta_by_ifaddr (ar->hw, peer->peer_macaddr, -NULL ); -if (!sta) -continue ; - arsta = (struct ath11k_sta *)sta->drv_priv; - arsta->rx_duration += (u64 )peer->rx_duration; - } -rcu_read_unlock (); -} - void ath11k_accumulate_per_peer_tx_stats(struct ath11k_sta *arsta, struct ath11k_per_peer_tx_stats *peer_stats,
drivers/net/wireless/ath/ath11k/wmi.c +1 -169
213 lines not on this page · raw message
drivers/net/wireless/ath/ath11k/wmi.h +0 -18
@@ -4051,24 +4051,6 @@ struct wmi_bcn_stats {u32 tx_bcn_outage_cnt; } __packed; -struct wmi_peer_stats { -struct wmi_mac_addr peer_macaddr; -u32 peer_rssi; -u32 peer_tx_rate; -u32 peer_rx_rate; -} __packed; - -struct wmi_peer_extd_stats { -struct wmi_mac_addr peer_macaddr; -u32 rx_duration; -u32 peer_tx_bytes; -u32 peer_rx_bytes; -u32 last_tx_rate_code; -s32 last_tx_power; -u32 rx_mc_bc_cnt; -u32 reserved[3 ]; -} __packed; -struct wmi_stats_event {u32 stats_id;u32 num_pdev_stats;
Signature · 7 lines
2.7.4 _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
Quoted 4 lines · Sathishkumar Muruganandam
Removing WMI PEER stats which has been deprecated in FW and
rx_durationof a peer is now fetched from HTTPPDU_ENDstats.Signed-off-by Sathishkumar Muruganandam <[email protected]>
This does not apply and sha1 id is invalid. Please use ath11k-bringup branch as the baseline, do NOT have any other patches applied.
Applying: ath11k: remove deprecated WMI PEER stats
fatal: sha1 information is lacking or useless (drivers/net/wireless/ath/ath11k/wmi.c).
error: could not build fake ancestor
Patch failed at 0001 ath11k: remove deprecated WMI PEER stats
Signature · 6 lines
Kalle Valo _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
Quoted 7 lines · Kalle Valo
Quoted 4 lines · Sathishkumar Muruganandam
Removing WMI PEER stats which has been deprecated in FW and
rx_durationof a peer is now fetched from HTTPPDU_ENDstats.Signed-off-by Sathishkumar Muruganandam <[email protected]>
Quoted 8 lines
This does not apply and sha1 id is invalid. Please use ath11k-bringup branch as the baseline, do NOT have any other patches applied.
Applying: ath11k: remove deprecated WMI PEER stats
fatal: sha1 information is lacking or useless (drivers/net/wireless/ath/ath11k/wmi.c).
error: could not build fake ancestor
Patch failed at 0001 ath11k: remove deprecated WMI PEER stats
Sorry, my bad. There was an older patch applied before this.
Corrected and sent v2 patch, please check.
Signature · 7 lines
Thanks, Sathishkumar _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
Quoted 18 lines · Sathishkumar Muruganandam
Quoted 8 lines · Kalle Valo
Quoted 5 lines · Sathishkumar Muruganandam
Removing WMI PEER stats which has been deprecated in FW and
rx_durationof
a peer is now fetched from HTTPPDU_ENDstats.Signed-off-by Sathishkumar Muruganandam <[email protected]>Quoted 8 lines
This does not apply and sha1 id is invalid. Please use ath11k-bringup branch as the baseline, do NOT have any other patches applied.
Applying: ath11k: remove deprecated WMI PEER stats
fatal: sha1 information is lacking or useless (drivers/net/wireless/ath/ath11k/wmi.c).
error: could not build fake ancestor
Patch failed at 0001 ath11k: remove deprecated WMI PEER stats
Quoted 3 lines
Sorry, my bad. There was an older patch applied before this.
Corrected and sent v2 patch, please check.
I was able to apply v2 to pending-ath11k branch, thanks.
Signature · 6 lines
Kalle Valo _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k