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

Commit 9f60e7ee authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by John W. Linville
Browse files

iwlwifi: introduce iwl_bt_statistics 



We use priv->cfg->bt_params && priv->cfg->bt_params->bt_statistics
conditional in few places, merge it into one function.

Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Acked-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 8c9f514b

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

+3 −6
Original line number Diff line number Diff line
@@ -631,8 +631,7 @@ void iwl_sensitivity_calibration(struct iwl_priv *priv, void *resp) 
	}



	spin_lock_irqsave(&priv->lock, flags);

	if (priv->cfg->bt_params &&

	    priv->cfg->bt_params->bt_statistics) {

	if (iwl_bt_statistics(priv)) {

		rx_info = &(((struct iwl_bt_notif_statistics *)resp)->

			      rx.general.common);

		ofdm = &(((struct iwl_bt_notif_statistics *)resp)->rx.ofdm);
@@ -897,8 +896,7 @@ void iwl_chain_noise_calibration(struct iwl_priv *priv, void *stat_resp) 
	}



	spin_lock_irqsave(&priv->lock, flags);

	if (priv->cfg->bt_params &&

	    priv->cfg->bt_params->bt_statistics) {

	if (iwl_bt_statistics(priv)) {

		rx_info = &(((struct iwl_bt_notif_statistics *)stat_resp)->

			      rx.general.common);

	} else {
@@ -913,8 +911,7 @@ void iwl_chain_noise_calibration(struct iwl_priv *priv, void *stat_resp) 


	rxon_band24 = !!(ctx->staging.flags & RXON_FLG_BAND_24G_MSK);

	rxon_chnum = le16_to_cpu(ctx->staging.channel);

	if (priv->cfg->bt_params &&

	    priv->cfg->bt_params->bt_statistics) {

	if (iwl_bt_statistics(priv)) {

		stat_band24 = !!(((struct iwl_bt_notif_statistics *)

				 stat_resp)->flag &

				 STATISTICS_REPLY_FLG_BAND_24G_MSK);

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

+4 −8
Original line number Diff line number Diff line
@@ -39,8 +39,7 @@ static int iwl_statistics_flag(struct iwl_priv *priv, char *buf, int bufsz) 
	int p = 0;

	u32 flag;



	if (priv->cfg->bt_params &&

	    priv->cfg->bt_params->bt_statistics)

	if (iwl_bt_statistics(priv))

		flag = le32_to_cpu(priv->_agn.statistics_bt.flag);

	else

		flag = le32_to_cpu(priv->_agn.statistics.flag);
@@ -89,8 +88,7 @@ ssize_t iwl_ucode_rx_stats_read(struct file *file, char __user *user_buf, 
	 * the last statistics notification from uCode

	 * might not reflect the current uCode activity

	 */

	if (priv->cfg->bt_params &&

	    priv->cfg->bt_params->bt_statistics) {

	if (iwl_bt_statistics(priv)) {

		ofdm = &priv->_agn.statistics_bt.rx.ofdm;

		cck = &priv->_agn.statistics_bt.rx.cck;

		general = &priv->_agn.statistics_bt.rx.general.common;
@@ -536,8 +534,7 @@ ssize_t iwl_ucode_tx_stats_read(struct file *file, 
	  * the last statistics notification from uCode

	  * might not reflect the current uCode activity

	  */

	if (priv->cfg->bt_params &&

	    priv->cfg->bt_params->bt_statistics) {

	if (iwl_bt_statistics(priv)) {

		tx = &priv->_agn.statistics_bt.tx;

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

		delta_tx = &priv->_agn.delta_statistics_bt.tx;
@@ -737,8 +734,7 @@ ssize_t iwl_ucode_general_stats_read(struct file *file, char __user *user_buf, 
	  * the last statistics notification from uCode

	  * might not reflect the current uCode activity

	  */

	if (priv->cfg->bt_params &&

	    priv->cfg->bt_params->bt_statistics) {

	if (iwl_bt_statistics(priv)) {

		general = &priv->_agn.statistics_bt.general.common;

		dbg = &priv->_agn.statistics_bt.general.common.dbg;

		div = &priv->_agn.statistics_bt.general.common.div;

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

+5 −10
Original line number Diff line number Diff line
@@ -73,8 +73,7 @@ static void iwl_rx_calc_noise(struct iwl_priv *priv) 
	int bcn_silence_a, bcn_silence_b, bcn_silence_c;

	int last_rx_noise;



	if (priv->cfg->bt_params &&

	    priv->cfg->bt_params->bt_statistics)

	if (iwl_bt_statistics(priv))

		rx_info = &(priv->_agn.statistics_bt.rx.general.common);

	else

		rx_info = &(priv->_agn.statistics.rx.general);
@@ -125,8 +124,7 @@ static void iwl_accumulative_statistics(struct iwl_priv *priv, 
	struct statistics_general_common *general, *accum_general;

	struct statistics_tx *tx, *accum_tx;



	if (priv->cfg->bt_params &&

	    priv->cfg->bt_params->bt_statistics) {

	if (iwl_bt_statistics(priv)) {

		prev_stats = (__le32 *)&priv->_agn.statistics_bt;

		accum_stats = (u32 *)&priv->_agn.accum_statistics_bt;

		size = sizeof(struct iwl_bt_notif_statistics);
@@ -207,8 +205,7 @@ bool iwl_good_plcp_health(struct iwl_priv *priv, 
		struct statistics_rx_phy *ofdm;

		struct statistics_rx_ht_phy *ofdm_ht;



		if (priv->cfg->bt_params &&

		    priv->cfg->bt_params->bt_statistics) {

		if (iwl_bt_statistics(priv)) {

			ofdm = &pkt->u.stats_bt.rx.ofdm;

			ofdm_ht = &pkt->u.stats_bt.rx.ofdm_ht;

			combined_plcp_delta =
@@ -265,8 +262,7 @@ void iwl_rx_statistics(struct iwl_priv *priv, 
	int change;

	struct iwl_rx_packet *pkt = rxb_addr(rxb);



	if (priv->cfg->bt_params &&

	    priv->cfg->bt_params->bt_statistics) {

	if (iwl_bt_statistics(priv)) {

		IWL_DEBUG_RX(priv,

			     "Statistics notification received (%d vs %d).\n",

			     (int)sizeof(struct iwl_bt_notif_statistics),
@@ -304,8 +300,7 @@ void iwl_rx_statistics(struct iwl_priv *priv, 


	iwl_recover_from_statistics(priv, pkt);



	if (priv->cfg->bt_params &&

	    priv->cfg->bt_params->bt_statistics)

	if (iwl_bt_statistics(priv))

		memcpy(&priv->_agn.statistics_bt, &pkt->u.stats_bt,

			sizeof(priv->_agn.statistics_bt));

	else

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

+1 −2
Original line number Diff line number Diff line
@@ -3077,8 +3077,7 @@ static void iwl_bg_run_time_calib_work(struct work_struct *work) 
	}



	if (priv->start_calib) {

		if (priv->cfg->bt_params &&

		    priv->cfg->bt_params->bt_statistics) {

		if (iwl_bt_statistics(priv)) {

			iwl_chain_noise_calibration(priv,

					(void *)&priv->_agn.statistics_bt);

			iwl_sensitivity_calibration(priv,

drivers/net/wireless/iwlwifi/iwl-core.h

+5 −0
Original line number Diff line number Diff line
@@ -747,6 +747,11 @@ static inline bool iwl_advanced_bt_coexist(struct iwl_priv *priv) 
	       priv->cfg->bt_params->advanced_bt_coexist;

}



static inline bool iwl_bt_statistics(struct iwl_priv *priv)

{

	return priv->cfg->bt_params && priv->cfg->bt_params->bt_statistics;

}



extern bool bt_coex_active;

extern bool bt_siso_mode;