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

Commit 1c11e10b authored by Sujith Manoharan's avatar Sujith Manoharan Committed by John W. Linville
Browse files

ath9k: Fill remove_sta_debugfs() callback 



Remove the rate control statistics debugfs file properly
via remove_sta_debugfs(). Also, check for both MAC80211_DEBUGFS
and ATH9K_DEBUGFS config options.

Signed-off-by: default avatarSujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent c0b74876

drivers/net/wireless/ath/ath9k/rc.c

+13 −4
Original line number Original line Diff line number Diff line
@@ -1350,7 +1350,7 @@ static void ath_rate_update(void *priv, struct ieee80211_supported_band *sband, 
	}

	}

}

}





#ifdef CONFIG_ATH9K_DEBUGFS

#if defined(CONFIG_MAC80211_DEBUGFS) && defined(CONFIG_ATH9K_DEBUGFS)





static ssize_t read_file_rcstat(struct file *file, char __user *user_buf,

static ssize_t read_file_rcstat(struct file *file, char __user *user_buf,

				size_t count, loff_t *ppos)

				size_t count, loff_t *ppos)
@@ -1428,10 +1428,17 @@ static void ath_rate_add_sta_debugfs(void *priv, void *priv_sta, 
				     struct dentry *dir)

				     struct dentry *dir)

{

{

	struct ath_rate_priv *rc = priv_sta;

	struct ath_rate_priv *rc = priv_sta;

	debugfs_create_file("rc_stats", S_IRUGO, dir, rc, &fops_rcstat);

	rc->debugfs_rcstats = debugfs_create_file("rc_stats", S_IRUGO,

						  dir, rc, &fops_rcstat);

}

}





#endif /* CONFIG_ATH9K_DEBUGFS */

static void ath_rate_remove_sta_debugfs(void *priv, void *priv_sta)

{

	struct ath_rate_priv *rc = priv_sta;

	debugfs_remove(rc->debugfs_rcstats);

}



#endif /* CONFIG_MAC80211_DEBUGFS && CONFIG_ATH9K_DEBUGFS */





static void *ath_rate_alloc(struct ieee80211_hw *hw, struct dentry *debugfsdir)

static void *ath_rate_alloc(struct ieee80211_hw *hw, struct dentry *debugfsdir)

{

{
@@ -1476,8 +1483,10 @@ static struct rate_control_ops ath_rate_ops = { 
	.free = ath_rate_free,

	.free = ath_rate_free,

	.alloc_sta = ath_rate_alloc_sta,

	.alloc_sta = ath_rate_alloc_sta,

	.free_sta = ath_rate_free_sta,

	.free_sta = ath_rate_free_sta,

#ifdef CONFIG_ATH9K_DEBUGFS



#if defined(CONFIG_MAC80211_DEBUGFS) && defined(CONFIG_ATH9K_DEBUGFS)

	.add_sta_debugfs = ath_rate_add_sta_debugfs,

	.add_sta_debugfs = ath_rate_add_sta_debugfs,

	.remove_sta_debugfs = ath_rate_remove_sta_debugfs,

#endif

#endif

};

};

drivers/net/wireless/ath/ath9k/rc.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -211,7 +211,9 @@ struct ath_rate_priv { 
	struct ath_rateset neg_ht_rates;

	struct ath_rateset neg_ht_rates;

	const struct ath_rate_table *rate_table;

	const struct ath_rate_table *rate_table;





#if defined(CONFIG_MAC80211_DEBUGFS) && defined(CONFIG_ATH9K_DEBUGFS)

	struct dentry *debugfs_rcstats;

	struct dentry *debugfs_rcstats;

#endif

	struct ath_rc_stats rcstats[RATE_TABLE_SIZE];

	struct ath_rc_stats rcstats[RATE_TABLE_SIZE];

};

};