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

Commit 1d60a79e authored by Wey-Yi Guy's avatar Wey-Yi Guy Committed by Reinette Chatre
Browse files

iwlwifi: separate statistics flag function for agn & 3945 



Since agn and 3945 have different statistics_notif data structure, each
should has its own statistics_flag function.

Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
parent a2064b7a

drivers/net/wireless/iwlwifi/iwl-3945-debugfs.c

+25 −3
Original line number Original line Diff line number Diff line
@@ -28,6 +28,28 @@ 




#include "iwl-3945-debugfs.h"

#include "iwl-3945-debugfs.h"







static int iwl3945_statistics_flag(struct iwl_priv *priv, char *buf, int bufsz)

{

	int p = 0;



	p += scnprintf(buf + p, bufsz - p, "Statistics Flag(0x%X):\n",

		       le32_to_cpu(priv->_3945.statistics.flag));

	if (le32_to_cpu(priv->_3945.statistics.flag) &

			UCODE_STATISTICS_CLEAR_MSK)

		p += scnprintf(buf + p, bufsz - p,

			       "\tStatistics have been cleared\n");

	p += scnprintf(buf + p, bufsz - p, "\tOperational Frequency: %s\n",

		       (le32_to_cpu(priv->_3945.statistics.flag) &

			UCODE_STATISTICS_FREQUENCY_MSK)

			? "2.4 GHz" : "5.2 GHz");

	p += scnprintf(buf + p, bufsz - p, "\tTGj Narrow Band: %s\n",

		       (le32_to_cpu(priv->_3945.statistics.flag) &

			UCODE_STATISTICS_NARROW_BAND_MSK)

			? "enabled" : "disabled");

	return p;

}



ssize_t iwl3945_ucode_rx_stats_read(struct file *file,

ssize_t iwl3945_ucode_rx_stats_read(struct file *file,

				    char __user *user_buf,

				    char __user *user_buf,

				    size_t count, loff_t *ppos)

				    size_t count, loff_t *ppos)
@@ -70,7 +92,7 @@ ssize_t iwl3945_ucode_rx_stats_read(struct file *file, 
	max_cck = &priv->_3945.max_delta.rx.cck;

	max_cck = &priv->_3945.max_delta.rx.cck;

	max_general = &priv->_3945.max_delta.rx.general;

	max_general = &priv->_3945.max_delta.rx.general;





	pos += iwl_dbgfs_statistics_flag(priv, buf, bufsz);

	pos += iwl3945_statistics_flag(priv, buf, bufsz);

	pos += scnprintf(buf + pos, bufsz - pos, "%-32s     current"

	pos += scnprintf(buf + pos, bufsz - pos, "%-32s     current"

			 "acumulative       delta         max\n",

			 "acumulative       delta         max\n",

			 "Statistics_Rx - OFDM:");

			 "Statistics_Rx - OFDM:");
@@ -331,7 +353,7 @@ ssize_t iwl3945_ucode_tx_stats_read(struct file *file, 
	accum_tx = &priv->_3945.accum_statistics.tx;

	accum_tx = &priv->_3945.accum_statistics.tx;

	delta_tx = &priv->_3945.delta_statistics.tx;

	delta_tx = &priv->_3945.delta_statistics.tx;

	max_tx = &priv->_3945.max_delta.tx;

	max_tx = &priv->_3945.max_delta.tx;

	pos += iwl_dbgfs_statistics_flag(priv, buf, bufsz);

	pos += iwl3945_statistics_flag(priv, buf, bufsz);

	pos += scnprintf(buf + pos, bufsz - pos, "%-32s     current"

	pos += scnprintf(buf + pos, bufsz - pos, "%-32s     current"

			 "acumulative       delta         max\n",

			 "acumulative       delta         max\n",

			 "Statistics_Tx:");

			 "Statistics_Tx:");
@@ -438,7 +460,7 @@ ssize_t iwl3945_ucode_general_stats_read(struct file *file, 
	accum_div = &priv->_3945.accum_statistics.general.div;

	accum_div = &priv->_3945.accum_statistics.general.div;

	delta_div = &priv->_3945.delta_statistics.general.div;

	delta_div = &priv->_3945.delta_statistics.general.div;

	max_div = &priv->_3945.max_delta.general.div;

	max_div = &priv->_3945.max_delta.general.div;

	pos += iwl_dbgfs_statistics_flag(priv, buf, bufsz);

	pos += iwl3945_statistics_flag(priv, buf, bufsz);

	pos += scnprintf(buf + pos, bufsz - pos, "%-32s     current"

	pos += scnprintf(buf + pos, bufsz - pos, "%-32s     current"

			 "acumulative       delta         max\n",

			 "acumulative       delta         max\n",

			 "Statistics_General:");

			 "Statistics_General:");

drivers/net/wireless/iwlwifi/iwl-agn-debugfs.c

+24 −3
Original line number Original line Diff line number Diff line
@@ -28,6 +28,27 @@ 




#include "iwl-agn-debugfs.h"

#include "iwl-agn-debugfs.h"





static int iwl_statistics_flag(struct iwl_priv *priv, char *buf, int bufsz)

{

	int p = 0;



	p += scnprintf(buf + p, bufsz - p, "Statistics Flag(0x%X):\n",

		       le32_to_cpu(priv->_agn.statistics.flag));

	if (le32_to_cpu(priv->_agn.statistics.flag) &

			UCODE_STATISTICS_CLEAR_MSK)

		p += scnprintf(buf + p, bufsz - p,

			       "\tStatistics have been cleared\n");

	p += scnprintf(buf + p, bufsz - p, "\tOperational Frequency: %s\n",

		       (le32_to_cpu(priv->_agn.statistics.flag) &

			UCODE_STATISTICS_FREQUENCY_MSK)

			? "2.4 GHz" : "5.2 GHz");

	p += scnprintf(buf + p, bufsz - p, "\tTGj Narrow Band: %s\n",

		       (le32_to_cpu(priv->_agn.statistics.flag) &

			UCODE_STATISTICS_NARROW_BAND_MSK)

			? "enabled" : "disabled");

	return p;

}



ssize_t iwl_ucode_rx_stats_read(struct file *file, char __user *user_buf,

ssize_t iwl_ucode_rx_stats_read(struct file *file, char __user *user_buf,

				size_t count, loff_t *ppos)

				size_t count, loff_t *ppos)

  {

  {
@@ -75,7 +96,7 @@ ssize_t iwl_ucode_rx_stats_read(struct file *file, char __user *user_buf, 
	max_general = &priv->_agn.max_delta.rx.general;

	max_general = &priv->_agn.max_delta.rx.general;

	max_ht = &priv->_agn.max_delta.rx.ofdm_ht;

	max_ht = &priv->_agn.max_delta.rx.ofdm_ht;





	pos += iwl_dbgfs_statistics_flag(priv, buf, bufsz);

	pos += iwl_statistics_flag(priv, buf, bufsz);

	pos += scnprintf(buf + pos, bufsz - pos, "%-32s     current"

	pos += scnprintf(buf + pos, bufsz - pos, "%-32s     current"

			 "acumulative       delta         max\n",

			 "acumulative       delta         max\n",

			 "Statistics_Rx - OFDM:");

			 "Statistics_Rx - OFDM:");
@@ -543,7 +564,7 @@ ssize_t iwl_ucode_tx_stats_read(struct file *file, 
	accum_tx = &priv->_agn.accum_statistics.tx;

	accum_tx = &priv->_agn.accum_statistics.tx;

	delta_tx = &priv->_agn.delta_statistics.tx;

	delta_tx = &priv->_agn.delta_statistics.tx;

	max_tx = &priv->_agn.max_delta.tx;

	max_tx = &priv->_agn.max_delta.tx;

	pos += iwl_dbgfs_statistics_flag(priv, buf, bufsz);

	pos += iwl_statistics_flag(priv, buf, bufsz);

	pos += scnprintf(buf + pos, bufsz - pos,  "%-32s     current"

	pos += scnprintf(buf + pos, bufsz - pos,  "%-32s     current"

			 "acumulative       delta         max\n",

			 "acumulative       delta         max\n",

			 "Statistics_Tx:");

			 "Statistics_Tx:");
@@ -768,7 +789,7 @@ ssize_t iwl_ucode_general_stats_read(struct file *file, char __user *user_buf, 
	accum_div = &priv->_agn.accum_statistics.general.div;

	accum_div = &priv->_agn.accum_statistics.general.div;

	delta_div = &priv->_agn.delta_statistics.general.div;

	delta_div = &priv->_agn.delta_statistics.general.div;

	max_div = &priv->_agn.max_delta.general.div;

	max_div = &priv->_agn.max_delta.general.div;

	pos += iwl_dbgfs_statistics_flag(priv, buf, bufsz);

	pos += iwl_statistics_flag(priv, buf, bufsz);

	pos += scnprintf(buf + pos, bufsz - pos, "%-32s     current"

	pos += scnprintf(buf + pos, bufsz - pos, "%-32s     current"

			 "acumulative       delta         max\n",

			 "acumulative       delta         max\n",

			 "Statistics_General:");

			 "Statistics_General:");

drivers/net/wireless/iwlwifi/iwl-debugfs.c

+0 −22
Original line number Original line Diff line number Diff line
@@ -100,28 +100,6 @@ static const struct file_operations iwl_dbgfs_##name##_ops = { \ 
	.open = iwl_dbgfs_open_file_generic,                            \

	.open = iwl_dbgfs_open_file_generic,                            \

};

};





int iwl_dbgfs_statistics_flag(struct iwl_priv *priv, char *buf, int bufsz)

{

	int p = 0;



	p += scnprintf(buf + p, bufsz - p, "Statistics Flag(0x%X):\n",

		       le32_to_cpu(priv->_agn.statistics.flag));

	if (le32_to_cpu(priv->_agn.statistics.flag) &

			UCODE_STATISTICS_CLEAR_MSK)

		p += scnprintf(buf + p, bufsz - p,

			       "\tStatistics have been cleared\n");

	p += scnprintf(buf + p, bufsz - p, "\tOperational Frequency: %s\n",

		       (le32_to_cpu(priv->_agn.statistics.flag) &

			UCODE_STATISTICS_FREQUENCY_MSK)

			? "2.4 GHz" : "5.2 GHz");

	p += scnprintf(buf + p, bufsz - p, "\tTGj Narrow Band: %s\n",

		       (le32_to_cpu(priv->_agn.statistics.flag) &

			UCODE_STATISTICS_NARROW_BAND_MSK)

			? "enabled" : "disabled");

	return p;

}

EXPORT_SYMBOL(iwl_dbgfs_statistics_flag);



static ssize_t iwl_dbgfs_tx_statistics_read(struct file *file,

static ssize_t iwl_dbgfs_tx_statistics_read(struct file *file,

						char __user *user_buf,

						char __user *user_buf,

						size_t count, loff_t *ppos) {

						size_t count, loff_t *ppos) {