Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a7f8911 authored by Anilkumar Kolli's avatar Anilkumar Kolli Committed by Kalle Valo
Browse files

ath10k: remove MAC80211_DEBUGFS dependency on ath10k_sta_statistics 



Remove CONFIG_MAC80211_DEBUGFS dependency on ath10k_sta_statistics().
ath10k_sta_statistics() has per sta tx/rx stats and this should not
be dependent on MAC80211_DEBUGFS.

No changes in functionality.

Signed-off-by: default avatarAnilkumar Kolli <akolli@qti.qualcomm.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent deba1b9e

drivers/net/wireless/ath/ath10k/core.h

+1 −1
Original line number Diff line number Diff line
@@ -363,11 +363,11 @@ struct ath10k_sta { 
	struct rate_info txrate;



	struct work_struct update_wk;

	u64 rx_duration;



#ifdef CONFIG_MAC80211_DEBUGFS

	/* protected by conf_mutex */

	bool aggr_mode;

	u64 rx_duration;

#endif

};

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

+0 −3
Original line number Diff line number Diff line
@@ -190,9 +190,6 @@ void ath10k_sta_add_debugfs(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
			    struct ieee80211_sta *sta, struct dentry *dir);

void ath10k_sta_update_rx_duration(struct ath10k *ar,

				   struct ath10k_fw_stats *stats);

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

			   struct ieee80211_sta *sta,

			   struct station_info *sinfo);

#else

static inline

void ath10k_sta_update_rx_duration(struct ath10k *ar,

drivers/net/wireless/ath/ath10k/debugfs_sta.c

+0 −27
Original line number Diff line number Diff line
@@ -65,33 +65,6 @@ void ath10k_sta_update_rx_duration(struct ath10k *ar, 
		ath10k_sta_update_stats_rx_duration(ar, stats);

}



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

			   struct ieee80211_sta *sta,

			   struct station_info *sinfo)

{

	struct ath10k_sta *arsta = (struct ath10k_sta *)sta->drv_priv;

	struct ath10k *ar = arsta->arvif->ar;



	if (!ath10k_peer_stats_enabled(ar))

		return;



	sinfo->rx_duration = arsta->rx_duration;

	sinfo->filled |= 1ULL << NL80211_STA_INFO_RX_DURATION;



	if (!arsta->txrate.legacy && !arsta->txrate.nss)

		return;



	if (arsta->txrate.legacy) {

		sinfo->txrate.legacy = arsta->txrate.legacy;

	} else {

		sinfo->txrate.mcs = arsta->txrate.mcs;

		sinfo->txrate.nss = arsta->txrate.nss;

		sinfo->txrate.bw = arsta->txrate.bw;

	}

	sinfo->txrate.flags = arsta->txrate.flags;

	sinfo->filled |= 1ULL << NL80211_STA_INFO_TX_BITRATE;

}



static ssize_t ath10k_dbg_sta_read_aggr_mode(struct file *file,

					     char __user *user_buf,

					     size_t count, loff_t *ppos)

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

+29 −1
Original line number Diff line number Diff line
@@ -7630,6 +7630,34 @@ static void ath10k_mac_op_sta_pre_rcu_remove(struct ieee80211_hw *hw, 
			peer->removed = true;

}



static void ath10k_sta_statistics(struct ieee80211_hw *hw,

				  struct ieee80211_vif *vif,

				  struct ieee80211_sta *sta,

				  struct station_info *sinfo)

{

	struct ath10k_sta *arsta = (struct ath10k_sta *)sta->drv_priv;

	struct ath10k *ar = arsta->arvif->ar;



	if (!ath10k_peer_stats_enabled(ar))

		return;



	sinfo->rx_duration = arsta->rx_duration;

	sinfo->filled |= 1ULL << NL80211_STA_INFO_RX_DURATION;



	if (!arsta->txrate.legacy && !arsta->txrate.nss)

		return;



	if (arsta->txrate.legacy) {

		sinfo->txrate.legacy = arsta->txrate.legacy;

	} else {

		sinfo->txrate.mcs = arsta->txrate.mcs;

		sinfo->txrate.nss = arsta->txrate.nss;

		sinfo->txrate.bw = arsta->txrate.bw;

	}

	sinfo->txrate.flags = arsta->txrate.flags;

	sinfo->filled |= 1ULL << NL80211_STA_INFO_TX_BITRATE;

}



static const struct ieee80211_ops ath10k_ops = {

	.tx				= ath10k_mac_op_tx,

	.wake_tx_queue			= ath10k_mac_op_wake_tx_queue,
@@ -7671,6 +7699,7 @@ static const struct ieee80211_ops ath10k_ops = { 
	.unassign_vif_chanctx		= ath10k_mac_op_unassign_vif_chanctx,

	.switch_vif_chanctx		= ath10k_mac_op_switch_vif_chanctx,

	.sta_pre_rcu_remove		= ath10k_mac_op_sta_pre_rcu_remove,

	.sta_statistics			= ath10k_sta_statistics,



	CFG80211_TESTMODE_CMD(ath10k_tm_cmd)
@@ -7681,7 +7710,6 @@ static const struct ieee80211_ops ath10k_ops = { 
#endif

#ifdef CONFIG_MAC80211_DEBUGFS

	.sta_add_debugfs		= ath10k_sta_add_debugfs,

	.sta_statistics			= ath10k_sta_statistics,

#endif

};