ath11k: fix build issues on disabling ATH11K_DEBUG
PATCH 1/1 ath11k: fix build issues on disabling ATH11K_DEBUG
On CONFIG_ATH11K_DEBUG disable fix these build errors
ath11k/dp_rx.c: In function ‘ath11k_htt_pull_ppdu_stats’:ath11k/dp_rx.c:991:8: error: ‘struct ath11k’ has no member named ‘debug’
if (ar->debug.pktlog_mode == ATH11K_PKTLOG_MODE_LITE) {
^
ath11k/dp_rx.c: In function ‘ath11k_dp_rx_process_mon_status’:
ath11k/dp_rx.c:2278:10: error: ‘struct ath11k’ has no member
named ‘debug’
if (!ar->debug.pktlog_peer_valid) {
^
ath11k/dp_rx.c:2307:9: error: ‘struct ath11k’ has no member named
‘debug’
if (ar->debug.pktlog_peer_valid &&
^
ath11k/dp_rx.c:2308:38: error: ‘struct ath11k’ has no member
named ‘debug’
ether_addr_equal(peer->addr, ar->debug.pktlog_peer_addr)) {--- drivers/net/wireless/ath/ath11k/debug.h | 31 +++++++++++++++++++++++++++++++ drivers/net/wireless/ath/ath11k/dp_rx.c | 7 +++---- 2 files changed, 34 insertions(+), 4 deletions(-)
drivers/net/wireless/ath/ath11k/debug.h +31 -0
@@ -102,6 +102,22 @@ void ath11k_debug_fw_stats_process(struct ath11k_base *ab, u8 *evt_buf,void ath11k_debug_fw_stats_init (struct ath11k *ar); +static inline bool ath11k_debug_is_pktlog_lite_mode_enabled (struct ath11k *ar) +{ +return (ar->debug.pktlog_mode ==ATH11K_PKTLOG_MODE_LITE ); +} + +static inline bool ath11k_debug_is_pktlog_per_peer_enabled (struct ath11k *ar) +{ +return !!ar->debug.pktlog_peer_valid; +} + +static inline bool ath11k_debug_is_pktlog_peer_vaild (struct ath11k *ar,u8 *addr) +{ +return (ar->debug.pktlog_peer_valid && +ether_addr_equal (addr, ar->debug.pktlog_peer_addr)); +} +static inline int ath11k_debug_is_extd_tx_stats_enabled (struct ath11k *ar) {return ar->debug.extd_tx_stats;
@@ -157,6 +173,21 @@ static inline int ath11k_debug_is_extd_rx_stats_enabled(struct ath11k *ar) {return 0 ; } + +static inline bool ath11k_debug_is_pktlog_lite_mode_enabled (struct ath11k *ar) +{ +return false; +} + +static inline bool ath11k_debug_is_pktlog_per_peer_enabled (struct ath11k *ar) +{ +return false; +} + +static inline bool ath11k_debug_is_pktlog_peer_vaild (struct ath11k *ar,u8 *addr) +{ +return false; +}#endif /* CONFIG_ATH11K_DEBUGFS */ #ifdef CONFIG_MAC80211_DEBUGFS
drivers/net/wireless/ath/ath11k/dp_rx.c +3 -4
@@ -988,7 +988,7 @@ static int ath11k_htt_pull_ppdu_stats(struct ath11k_base *ab, ppdu_id = *((u32 *)data +1 ); ar = ab->pdevs[pdev_id].ar; -if (ar->debug.pktlog_mode ==ATH11K_PKTLOG_MODE_LITE ) { +if (ath11k_debug_is_pktlog_lite_mode_enabled (ar)) {/* TODO update the pktlog tracing */ }
@@ -2275,7 +2275,7 @@ int ath11k_dp_rx_process_mon_status(struct ath11k_base *ab, int mac_id,memset (&ppdu_info,0 ,sizeof (ppdu_info)); ppdu_info.peer_id =HAL_INVALID_PEERID ; -if (!ar->debug.pktlog_peer_valid) { +if (!ath11k_debug_is_pktlog_per_peer_enabled (ar)) {/* TODO update the pktlog tracing */ }
@@ -2304,8 +2304,7 @@ int ath11k_dp_rx_process_mon_status(struct ath11k_base *ab, int mac_id, arsta = (struct ath11k_sta *)peer->sta->drv_priv;ath11k_dp_rx_update_peer_stats (arsta, &ppdu_info); -if (ar->debug.pktlog_peer_valid && -ether_addr_equal (peer->addr, ar->debug.pktlog_peer_addr)) { +if (ath11k_debug_is_pktlog_peer_vaild (ar, peer->addr)) {/* TODO update the pktlog tracing for one peer*/ }spin_unlock_bh (&ab->data_lock);
Signature · 7 lines
1.9.1 _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
Quoted 20 lines · Anilkumar Kolli
On
CONFIG_ATH11K_DEBUGdisable fix these build errors
ath11k/dp_rx.c: In function ‘ath11k_htt_pull_ppdu_stats’:ath11k/dp_rx.c:991:8: error: ‘struct ath11k’ has no member named ‘debug’if (ar->debug.pktlog_mode == ATH11K_PKTLOG_MODE_LITE) { ^ ath11k/dp_rx.c: In function ‘ath11k_dp_rx_process_mon_status’: ath11k/dp_rx.c:2278:10: error: ‘struct ath11k’ has no member named ‘debug’ if (!ar->debug.pktlog_peer_valid) { ^ ath11k/dp_rx.c:2307:9: error: ‘struct ath11k’ has no member named ‘debug’ if (ar->debug.pktlog_peer_valid && ^ ath11k/dp_rx.c:2308:38: error: ‘struct ath11k’ has no member named ‘debug’ ether_addr_equal(peer->addr, ar->debug.pktlog_peer_addr)) {
Quoted 1 line
Signed-off-by Anilkumar Kolli <[email protected]>
Failed to apply:
Applying: ath11k: fix build issues on disabling ATH11K_DEBUG
fatal: sha1 information is lacking or useless (drivers/net/wireless/ath/ath11k/dp_rx.c).
error: could not build fake ancestor
Patch failed at 0001 ath11k: fix build issues on disabling ATH11K_DEBUG
Please use ath11k-bringup branch as the baseline so that git can use 3-way merge. Otherwise it will be hard to resolve conflicts.
Signature · 6 lines
Kalle Valo _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
Quoted 4 lines · Kalle Valo
Anilkumar Kolli <[email protected]> writes:
Failed to apply:
Quoted 8 lines
Applying: ath11k: fix build issues on disabling
ATH11K_DEBUG
fatal: sha1 information is lacking or useless (drivers/net/wireless/ath/ath11k/dp_rx.c).
error: could not build fake ancestor
Patch failed at 0001 ath11k: fix build issues on disablingATH11K_DEBUGPlease use ath11k-bringup branch as the baseline so that git can use 3-way merge. Otherwise it will be hard to resolve conflicts.
Hi Kalle,
Could you please try in this order, 0001-ath11k-move-per-peer-pktlog-entry-to-per-sta-debugfs.patch 0001-ath11k-fix-build-issues-on-disabling-ATH11K_DEBUG.patch
Thanks
Anil.
_______________________________________________
ath11k mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/ath11k
Quoted 11 lines · Anilkumar Kolli
Quoted 10 lines · Kalle Valo
Anilkumar Kolli <[email protected]> writes:
Failed to apply:
Applying: ath11k: fix build issues on disabling
ATH11K_DEBUG
fatal: sha1 information is lacking or useless (drivers/net/wireless/ath/ath11k/dp_rx.c).
error: could not build fake ancestor
Patch failed at 0001 ath11k: fix build issues on disablingATH11K_DEBUG
Quoted 8 lines
Quoted 2 lines
Please use ath11k-bringup branch as the baseline so that git can use 3-way merge. Otherwise it will be hard to resolve conflicts.
Hi Kalle,
Could you please try in this order, 0001-ath11k-move-per-peer-pktlog-entry-to-per-sta-debugfs.patch 0001-ath11k-fix-build-issues-on-disabling-ATH11K_DEBUG.patch
If there are dependencies you should put them in the same patchset, otherwise there's no guarantee of the order they are applied.
But still this fails to apply, please rebase and resend.
Applying: ath11k: fix build issues on disabling ATH11K_DEBUG
fatal: sha1 information is lacking or useless (drivers/net/wireless/ath/ath11k/dp_rx.c).
error: could not build fake ancestor
Patch failed at 0001 ath11k: fix build issues on disabling ATH11K_DEBUG
Signature · 6 lines
Kalle Valo _______________________________________________ ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k