Commit a45ceea5 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Kalle Valo
Browse files

ath11k: fix debugfs build failure 



When CONFIG_ATH11K_DEBUGFS is disabled, but CONFIG_MAC80211_DEBUGFS
is turned on, the driver fails to build:

drivers/net/wireless/ath/ath11k/debugfs_sta.c: In function 'ath11k_dbg_sta_open_htt_peer_stats':
drivers/net/wireless/ath/ath11k/debugfs_sta.c:416:4: error: 'struct ath11k' has no member named 'debug'
  ar->debug.htt_stats.stats_req = stats_req;
    ^~

It appears that just using the former symbol is sufficient here,
adding a Kconfig dependency takes care of the corner cases.

Fixes: d5c65159 ("ath11k: driver for Qualcomm IEEE 802.11ax devices")
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent ab000ea6

drivers/net/wireless/ath/ath11k/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ config ATH11K_DEBUG 


config ATH11K_DEBUGFS

	bool "QCA ath11k debugfs support"

	depends on ATH11K && DEBUG_FS

	depends on ATH11K && DEBUG_FS && MAC80211_DEBUGFS

	---help---

	  Enable ath11k debugfs support

drivers/net/wireless/ath/ath11k/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -17,8 +17,7 @@ ath11k-y += core.o \ 
	    ce.o \

	    peer.o



ath11k-$(CONFIG_ATH11K_DEBUGFS) += debug_htt_stats.o

ath11k-$(CONFIG_MAC80211_DEBUGFS) += debugfs_sta.o

ath11k-$(CONFIG_ATH11K_DEBUGFS) += debug_htt_stats.o debugfs_sta.o

ath11k-$(CONFIG_NL80211_TESTMODE) += testmode.o

ath11k-$(CONFIG_ATH11K_TRACING) += trace.o

drivers/net/wireless/ath/ath11k/debug.h

+10 −12
Original line number Diff line number Diff line
@@ -172,6 +172,16 @@ static inline int ath11k_debug_is_extd_rx_stats_enabled(struct ath11k *ar) 
{

	return ar->debug.extd_rx_stats;

}



void ath11k_sta_add_debugfs(struct ieee80211_hw *hw, struct ieee80211_vif *vif,

			    struct ieee80211_sta *sta, struct dentry *dir);

void

ath11k_accumulate_per_peer_tx_stats(struct ath11k_sta *arsta,

				    struct ath11k_per_peer_tx_stats *peer_stats,

				    u8 legacy_rate_idx);

void ath11k_update_per_peer_stats_from_txcompl(struct ath11k *ar,

					       struct sk_buff *msdu,

					       struct hal_tx_status *ts);

#else

static inline int ath11k_debug_soc_create(struct ath11k_base *ab)

{
@@ -243,19 +253,7 @@ static inline bool ath11k_debug_is_pktlog_peer_valid(struct ath11k *ar, u8 *addr 
{

	return false;

}

#endif /* CONFIG_ATH11K_DEBUGFS */



#ifdef CONFIG_MAC80211_DEBUGFS

void ath11k_sta_add_debugfs(struct ieee80211_hw *hw, struct ieee80211_vif *vif,

			    struct ieee80211_sta *sta, struct dentry *dir);

void

ath11k_accumulate_per_peer_tx_stats(struct ath11k_sta *arsta,

				    struct ath11k_per_peer_tx_stats *peer_stats,

				    u8 legacy_rate_idx);

void ath11k_update_per_peer_stats_from_txcompl(struct ath11k *ar,

					       struct sk_buff *msdu,

					       struct hal_tx_status *ts);

#else /* !CONFIG_MAC80211_DEBUGFS */

static inline void

ath11k_accumulate_per_peer_tx_stats(struct ath11k_sta *arsta,

				    struct ath11k_per_peer_tx_stats *peer_stats,

drivers/net/wireless/ath/ath11k/mac.c

+1 −1
Original line number Diff line number Diff line
@@ -5468,7 +5468,7 @@ static const struct ieee80211_ops ath11k_ops = { 
	.flush				= ath11k_mac_op_flush,

	.sta_statistics			= ath11k_mac_op_sta_statistics,

	CFG80211_TESTMODE_CMD(ath11k_tm_cmd)

#ifdef CONFIG_MAC80211_DEBUGFS

#ifdef CONFIG_ATH11K_DEBUGFS

	.sta_add_debugfs		= ath11k_sta_add_debugfs,

#endif

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE