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

iwlwifi: move check health code into iwl-rx.c 



Remove check_plcp_health and check_ack_health ops methods, they are
unneeded after iwlegacy driver split. Merge check health code into to
iwl-rx.c and make functions static.

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 b7977ffa

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

+0 −2
Original line number Diff line number Diff line
@@ -232,8 +232,6 @@ static struct iwl_lib_ops iwl1000_lib = { 
		.bt_stats_read = iwl_ucode_bt_stats_read,

		.reply_tx_error = iwl_reply_tx_error_read,

	},

	.check_plcp_health = iwl_good_plcp_health,

	.check_ack_health = iwl_good_ack_health,

	.txfifo_flush = iwlagn_txfifo_flush,

	.dev_txfifo_flush = iwlagn_dev_txfifo_flush,

	.tt_ops = {

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

+0 −2
Original line number Diff line number Diff line
@@ -315,8 +315,6 @@ static struct iwl_lib_ops iwl2000_lib = { 
		.bt_stats_read = iwl_ucode_bt_stats_read,

		.reply_tx_error = iwl_reply_tx_error_read,

	},

	.check_plcp_health = iwl_good_plcp_health,

	.check_ack_health = iwl_good_ack_health,

	.txfifo_flush = iwlagn_txfifo_flush,

	.dev_txfifo_flush = iwlagn_dev_txfifo_flush,

	.tt_ops = {

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

+0 −4
Original line number Diff line number Diff line
@@ -402,8 +402,6 @@ static struct iwl_lib_ops iwl5000_lib = { 
		.bt_stats_read = iwl_ucode_bt_stats_read,

		.reply_tx_error = iwl_reply_tx_error_read,

	},

	.check_plcp_health = iwl_good_plcp_health,

	.check_ack_health = iwl_good_ack_health,

	.txfifo_flush = iwlagn_txfifo_flush,

	.dev_txfifo_flush = iwlagn_dev_txfifo_flush,

	.tt_ops = {
@@ -471,8 +469,6 @@ static struct iwl_lib_ops iwl5150_lib = { 
		.bt_stats_read = iwl_ucode_bt_stats_read,

		.reply_tx_error = iwl_reply_tx_error_read,

	},

	.check_plcp_health = iwl_good_plcp_health,

	.check_ack_health = iwl_good_ack_health,

	.txfifo_flush = iwlagn_txfifo_flush,

	.dev_txfifo_flush = iwlagn_dev_txfifo_flush,

	.tt_ops = {

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

+0 −4
Original line number Diff line number Diff line
@@ -343,8 +343,6 @@ static struct iwl_lib_ops iwl6000_lib = { 
		.bt_stats_read = iwl_ucode_bt_stats_read,

		.reply_tx_error = iwl_reply_tx_error_read,

	},

	.check_plcp_health = iwl_good_plcp_health,

	.check_ack_health = iwl_good_ack_health,

	.txfifo_flush = iwlagn_txfifo_flush,

	.dev_txfifo_flush = iwlagn_dev_txfifo_flush,

	.tt_ops = {
@@ -415,8 +413,6 @@ static struct iwl_lib_ops iwl6030_lib = { 
		.bt_stats_read = iwl_ucode_bt_stats_read,

		.reply_tx_error = iwl_reply_tx_error_read,

	},

	.check_plcp_health = iwl_good_plcp_health,

	.check_ack_health = iwl_good_ack_health,

	.txfifo_flush = iwlagn_txfifo_flush,

	.dev_txfifo_flush = iwlagn_dev_txfifo_flush,

	.tt_ops = {

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

+0 −87
Original line number Diff line number Diff line
@@ -169,93 +169,6 @@ static void iwl_accumulative_statistics(struct iwl_priv *priv, 


#define REG_RECALIB_PERIOD (60)



/**

 * iwl_good_plcp_health - checks for plcp error.

 *

 * When the plcp error is exceeding the thresholds, reset the radio

 * to improve the throughput.

 */

bool iwl_good_plcp_health(struct iwl_priv *priv,

				struct iwl_rx_packet *pkt)

{

	bool rc = true;

	int combined_plcp_delta;

	unsigned int plcp_msec;

	unsigned long plcp_received_jiffies;



	if (priv->cfg->base_params->plcp_delta_threshold ==

	    IWL_MAX_PLCP_ERR_THRESHOLD_DISABLE) {

		IWL_DEBUG_RADIO(priv, "plcp_err check disabled\n");

		return rc;

	}



	/*

	 * check for plcp_err and trigger radio reset if it exceeds

	 * the plcp error threshold plcp_delta.

	 */

	plcp_received_jiffies = jiffies;

	plcp_msec = jiffies_to_msecs((long) plcp_received_jiffies -

					(long) priv->plcp_jiffies);

	priv->plcp_jiffies = plcp_received_jiffies;

	/*

	 * check to make sure plcp_msec is not 0 to prevent division

	 * by zero.

	 */

	if (plcp_msec) {

		struct statistics_rx_phy *ofdm;

		struct statistics_rx_ht_phy *ofdm_ht;



		if (iwl_bt_statistics(priv)) {

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

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

			combined_plcp_delta =

			   (le32_to_cpu(ofdm->plcp_err) -

			   le32_to_cpu(priv->_agn.statistics_bt.

				       rx.ofdm.plcp_err)) +

			   (le32_to_cpu(ofdm_ht->plcp_err) -

			   le32_to_cpu(priv->_agn.statistics_bt.

				       rx.ofdm_ht.plcp_err));

		} else {

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

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

			combined_plcp_delta =

			    (le32_to_cpu(ofdm->plcp_err) -

			    le32_to_cpu(priv->_agn.statistics.

					rx.ofdm.plcp_err)) +

			    (le32_to_cpu(ofdm_ht->plcp_err) -

			    le32_to_cpu(priv->_agn.statistics.

					rx.ofdm_ht.plcp_err));

		}



		if ((combined_plcp_delta > 0) &&

		    ((combined_plcp_delta * 100) / plcp_msec) >

			priv->cfg->base_params->plcp_delta_threshold) {

			/*

			 * if plcp_err exceed the threshold,

			 * the following data is printed in csv format:

			 *    Text: plcp_err exceeded %d,

			 *    Received ofdm.plcp_err,

			 *    Current ofdm.plcp_err,

			 *    Received ofdm_ht.plcp_err,

			 *    Current ofdm_ht.plcp_err,

			 *    combined_plcp_delta,

			 *    plcp_msec

			 */

			IWL_DEBUG_RADIO(priv, "plcp_err exceeded %u, "

				"%u, %u, %u, %u, %d, %u mSecs\n",

				priv->cfg->base_params->plcp_delta_threshold,

				le32_to_cpu(ofdm->plcp_err),

				le32_to_cpu(ofdm->plcp_err),

				le32_to_cpu(ofdm_ht->plcp_err),

				le32_to_cpu(ofdm_ht->plcp_err),

				combined_plcp_delta, plcp_msec);



			rc = false;

		}

	}

	return rc;

}



void iwl_rx_statistics(struct iwl_priv *priv,

			      struct iwl_rx_mem_buffer *rxb)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE