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

Commit b5a0c86a authored by Oleksij Rempel's avatar Oleksij Rempel Committed by John W. Linville
Browse files

ath9k & ath9k_htc: move ath_rx_stats to cmn 



and use it. This move need changes in both drivers.

Signed-off-by: default avatarOleksij Rempel <linux@rempel-privat.de>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 9d83cd5c

drivers/net/wireless/ath/ath9k/common-debug.c

+33 −0
Original line number Diff line number Diff line
@@ -86,3 +86,36 @@ void ath9k_cmn_debug_base_eeprom(struct dentry *debugfs_phy, 
			    &fops_base_eeprom);

}

EXPORT_SYMBOL(ath9k_cmn_debug_base_eeprom);



void ath9k_cmn_debug_stat_rx(struct ath_rx_stats *rxstats,

			     struct ath_rx_status *rs)

{

#define RX_PHY_ERR_INC(c) rxstats->phy_err_stats[c]++

#define RX_CMN_STAT_INC(c) (rxstats->c++)



	RX_CMN_STAT_INC(rx_pkts_all);

	rxstats->rx_bytes_all += rs->rs_datalen;



	if (rs->rs_status & ATH9K_RXERR_CRC)

		RX_CMN_STAT_INC(crc_err);

	if (rs->rs_status & ATH9K_RXERR_DECRYPT)

		RX_CMN_STAT_INC(decrypt_crc_err);

	if (rs->rs_status & ATH9K_RXERR_MIC)

		RX_CMN_STAT_INC(mic_err);

	if (rs->rs_status & ATH9K_RX_DELIM_CRC_PRE)

		RX_CMN_STAT_INC(pre_delim_crc_err);

	if (rs->rs_status & ATH9K_RX_DELIM_CRC_POST)

		RX_CMN_STAT_INC(post_delim_crc_err);

	if (rs->rs_status & ATH9K_RX_DECRYPT_BUSY)

		RX_CMN_STAT_INC(decrypt_busy_err);



	if (rs->rs_status & ATH9K_RXERR_PHY) {

		RX_CMN_STAT_INC(phy_err);

		if (rs->rs_phyerr < ATH9K_PHYERR_MAX)

			RX_PHY_ERR_INC(rs->rs_phyerr);

	}



#undef RX_CMN_STAT_INC

#undef RX_PHY_ERR_INC

}

EXPORT_SYMBOL(ath9k_cmn_debug_stat_rx);

drivers/net/wireless/ath/ath9k/common-debug.h

+48 −0
Original line number Diff line number Diff line
@@ -14,7 +14,55 @@ 
 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

 */







/**

 * struct ath_rx_stats - RX Statistics

 * @rx_pkts_all:  No. of total frames received, including ones that

	may have had errors.

 * @rx_bytes_all:  No. of total bytes received, including ones that

	may have had errors.

 * @crc_err: No. of frames with incorrect CRC value

 * @decrypt_crc_err: No. of frames whose CRC check failed after

	decryption process completed

 * @phy_err: No. of frames whose reception failed because the PHY

	encountered an error

 * @mic_err: No. of frames with incorrect TKIP MIC verification failure

 * @pre_delim_crc_err: Pre-Frame delimiter CRC error detections

 * @post_delim_crc_err: Post-Frame delimiter CRC error detections

 * @decrypt_busy_err: Decryption interruptions counter

 * @phy_err_stats: Individual PHY error statistics

 * @rx_len_err:  No. of frames discarded due to bad length.

 * @rx_oom_err:  No. of frames dropped due to OOM issues.

 * @rx_rate_err:  No. of frames dropped due to rate errors.

 * @rx_too_many_frags_err:  Frames dropped due to too-many-frags received.

 * @rx_beacons:  No. of beacons received.

 * @rx_frags:  No. of rx-fragements received.

 * @rx_spectral: No of spectral packets received.

 */

struct ath_rx_stats {

	u32 rx_pkts_all;

	u32 rx_bytes_all;

	u32 crc_err;

	u32 decrypt_crc_err;

	u32 phy_err;

	u32 mic_err;

	u32 pre_delim_crc_err;

	u32 post_delim_crc_err;

	u32 decrypt_busy_err;

	u32 phy_err_stats[ATH9K_PHYERR_MAX];

	u32 rx_len_err;

	u32 rx_oom_err;

	u32 rx_rate_err;

	u32 rx_too_many_frags_err;

	u32 rx_beacons;

	u32 rx_frags;

	u32 rx_spectral;

};



void ath9k_cmn_debug_modal_eeprom(struct dentry *debugfs_phy,

				  struct ath_hw *ah);

void ath9k_cmn_debug_base_eeprom(struct dentry *debugfs_phy,

				 struct ath_hw *ah);

void ath9k_cmn_debug_stat_rx(struct ath_rx_stats *rxstats,

			     struct ath_rx_status *rs);

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

+1 −25
Original line number Diff line number Diff line
@@ -998,31 +998,7 @@ static ssize_t read_file_recv(struct file *file, char __user *user_buf, 


void ath_debug_stat_rx(struct ath_softc *sc, struct ath_rx_status *rs)

{

#define RX_PHY_ERR_INC(c) sc->debug.stats.rxstats.phy_err_stats[c]++



	RX_STAT_INC(rx_pkts_all);

	sc->debug.stats.rxstats.rx_bytes_all += rs->rs_datalen;



	if (rs->rs_status & ATH9K_RXERR_CRC)

		RX_STAT_INC(crc_err);

	if (rs->rs_status & ATH9K_RXERR_DECRYPT)

		RX_STAT_INC(decrypt_crc_err);

	if (rs->rs_status & ATH9K_RXERR_MIC)

		RX_STAT_INC(mic_err);

	if (rs->rs_status & ATH9K_RX_DELIM_CRC_PRE)

		RX_STAT_INC(pre_delim_crc_err);

	if (rs->rs_status & ATH9K_RX_DELIM_CRC_POST)

		RX_STAT_INC(post_delim_crc_err);

	if (rs->rs_status & ATH9K_RX_DECRYPT_BUSY)

		RX_STAT_INC(decrypt_busy_err);



	if (rs->rs_status & ATH9K_RXERR_PHY) {

		RX_STAT_INC(phy_err);

		if (rs->rs_phyerr < ATH9K_PHYERR_MAX)

			RX_PHY_ERR_INC(rs->rs_phyerr);

	}



#undef RX_PHY_ERR_INC

	ath9k_cmn_debug_stat_rx(&sc->debug.stats.rxstats, rs);

}



static const struct file_operations fops_recv = {

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

+0 −44
Original line number Diff line number Diff line
@@ -221,50 +221,6 @@ struct ath_rx_rate_stats { 
	} cck_stats[4];

};



/**

 * struct ath_rx_stats - RX Statistics

 * @rx_pkts_all:  No. of total frames received, including ones that

	may have had errors.

 * @rx_bytes_all:  No. of total bytes received, including ones that

	may have had errors.

 * @crc_err: No. of frames with incorrect CRC value

 * @decrypt_crc_err: No. of frames whose CRC check failed after

	decryption process completed

 * @phy_err: No. of frames whose reception failed because the PHY

	encountered an error

 * @mic_err: No. of frames with incorrect TKIP MIC verification failure

 * @pre_delim_crc_err: Pre-Frame delimiter CRC error detections

 * @post_delim_crc_err: Post-Frame delimiter CRC error detections

 * @decrypt_busy_err: Decryption interruptions counter

 * @phy_err_stats: Individual PHY error statistics

 * @rx_len_err:  No. of frames discarded due to bad length.

 * @rx_oom_err:  No. of frames dropped due to OOM issues.

 * @rx_rate_err:  No. of frames dropped due to rate errors.

 * @rx_too_many_frags_err:  Frames dropped due to too-many-frags received.

 * @rx_beacons:  No. of beacons received.

 * @rx_frags:  No. of rx-fragements received.

 * @rx_spectral: No of spectral packets received.

 */

struct ath_rx_stats {

	u32 rx_pkts_all;

	u32 rx_bytes_all;

	u32 crc_err;

	u32 decrypt_crc_err;

	u32 phy_err;

	u32 mic_err;

	u32 pre_delim_crc_err;

	u32 post_delim_crc_err;

	u32 decrypt_busy_err;

	u32 phy_err_stats[ATH9K_PHYERR_MAX];

	u32 rx_len_err;

	u32 rx_oom_err;

	u32 rx_rate_err;

	u32 rx_too_many_frags_err;

	u32 rx_beacons;

	u32 rx_frags;

	u32 rx_spectral;

};



#define ANT_MAIN 0

#define ANT_ALT  1

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

+5 −12
Original line number Diff line number Diff line
@@ -325,14 +325,14 @@ static inline struct ath9k_htc_tx_ctl *HTC_SKB_CB(struct sk_buff *skb) 


#define TX_STAT_INC(c) (hif_dev->htc_handle->drv_priv->debug.tx_stats.c++)

#define TX_STAT_ADD(c, a) (hif_dev->htc_handle->drv_priv->debug.tx_stats.c += a)

#define RX_STAT_INC(c) (hif_dev->htc_handle->drv_priv->debug.rx_stats.c++)

#define RX_STAT_ADD(c, a) (hif_dev->htc_handle->drv_priv->debug.rx_stats.c += a)

#define RX_STAT_INC(c) (hif_dev->htc_handle->drv_priv->debug.skbrx_stats.c++)

#define RX_STAT_ADD(c, a) (hif_dev->htc_handle->drv_priv->debug.skbrx_stats.c += a)

#define CAB_STAT_INC   priv->debug.tx_stats.cab_queued++



#define TX_QSTAT_INC(q) (priv->debug.tx_stats.queue_stats[q]++)



void ath9k_htc_err_stat_rx(struct ath9k_htc_priv *priv,

			   struct ath_htc_rx_status *rxs);

			   struct ath_rx_status *rs);



struct ath_tx_stats {

	u32 buf_queued;
@@ -345,25 +345,18 @@ struct ath_tx_stats { 
	u32 queue_stats[IEEE80211_NUM_ACS];

};



struct ath_rx_stats {

struct ath_skbrx_stats {

	u32 skb_allocated;

	u32 skb_completed;

	u32 skb_completed_bytes;

	u32 skb_dropped;

	u32 err_crc;

	u32 err_decrypt_crc;

	u32 err_mic;

	u32 err_pre_delim;

	u32 err_post_delim;

	u32 err_decrypt_busy;

	u32 err_phy;

	u32 err_phy_stats[ATH9K_PHYERR_MAX];

};



struct ath9k_debug {

	struct dentry *debugfs_phy;

	struct ath_tx_stats tx_stats;

	struct ath_rx_stats rx_stats;

	struct ath_skbrx_stats skbrx_stats;

};



void ath9k_htc_get_et_strings(struct ieee80211_hw *hw,