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

Commit 66cd9e39 authored by Meenakshi Venkataraman's avatar Meenakshi Venkataraman Committed by Wey-Yi Guy
Browse files

iwlwifi: move iwl_force_rf_reset to iwl-agn-rx.c 



Move this function as part of iwl-core.c cleanup.

Signed-off-by: default avatarMeenakshi Venkataraman <meenakshi.venkataraman@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent 1591129d

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

+39 −0
Original line number Diff line number Diff line
@@ -284,6 +284,45 @@ static bool iwlagn_good_plcp_health(struct iwl_priv *priv, 
	return true;

}



int iwl_force_rf_reset(struct iwl_priv *priv, bool external)

{

	struct iwl_rf_reset *rf_reset;



	if (test_bit(STATUS_EXIT_PENDING, &priv->status))

		return -EAGAIN;



	if (!iwl_is_any_associated(priv)) {

		IWL_DEBUG_SCAN(priv, "force reset rejected: not associated\n");

		return -ENOLINK;

	}



	rf_reset = &priv->rf_reset;

	rf_reset->reset_request_count++;

	if (!external && rf_reset->last_reset_jiffies &&

	    time_after(rf_reset->last_reset_jiffies +

		       IWL_DELAY_NEXT_FORCE_RF_RESET, jiffies)) {

		IWL_DEBUG_INFO(priv, "RF reset rejected\n");

		rf_reset->reset_reject_count++;

		return -EAGAIN;

	}

	rf_reset->reset_success_count++;

	rf_reset->last_reset_jiffies = jiffies;



	/*

	 * There is no easy and better way to force reset the radio,

	 * the only known method is switching channel which will force to

	 * reset and tune the radio.

	 * Use internal short scan (single channel) operation to should

	 * achieve this objective.

	 * Driver should reset the radio when number of consecutive missed

	 * beacon, or any other uCode error condition detected.

	 */

	IWL_DEBUG_INFO(priv, "perform radio reset.\n");

	iwl_internal_short_hw_scan(priv);

	return 0;

}





static void iwlagn_recover_from_statistics(struct iwl_priv *priv,

				struct statistics_rx_phy *cur_ofdm,

				struct statistics_rx_ht_phy *cur_ofdm_ht,

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

+0 −39
Original line number Diff line number Diff line
@@ -277,45 +277,6 @@ void iwl_update_stats(struct iwl_priv *priv, bool is_tx, __le16 fc, u16 len) 
}

#endif



int iwl_force_rf_reset(struct iwl_priv *priv, bool external)

{

	struct iwl_rf_reset *rf_reset;



	if (test_bit(STATUS_EXIT_PENDING, &priv->status))

		return -EAGAIN;



	if (!iwl_is_any_associated(priv)) {

		IWL_DEBUG_SCAN(priv, "force reset rejected: not associated\n");

		return -ENOLINK;

	}



	rf_reset = &priv->rf_reset;

	rf_reset->reset_request_count++;

	if (!external && rf_reset->last_reset_jiffies &&

	    time_after(rf_reset->last_reset_jiffies +

		       IWL_DELAY_NEXT_FORCE_RF_RESET, jiffies)) {

		IWL_DEBUG_INFO(priv, "RF reset rejected\n");

		rf_reset->reset_reject_count++;

		return -EAGAIN;

	}

	rf_reset->reset_success_count++;

	rf_reset->last_reset_jiffies = jiffies;



	/*

	 * There is no easy and better way to force reset the radio,

	 * the only known method is switching channel which will force to

	 * reset and tune the radio.

	 * Use internal short scan (single channel) operation to should

	 * achieve this objective.

	 * Driver should reset the radio when number of consecutive missed

	 * beacon, or any other uCode error condition detected.

	 */

	IWL_DEBUG_INFO(priv, "perform radio reset.\n");

	iwl_internal_short_hw_scan(priv);

	return 0;

}





int iwl_cmd_echo_test(struct iwl_priv *priv)

{

	int ret;