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

Commit 47f4a587 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by John W. Linville
Browse files

iwlwifi: move iwl4965_rf_kill_ct_config to iwl-core.c 



This patch moves iwl4965_rf_kill_ct_config to iwl-core.c.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarZhu Yi <yi.zhu@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent f53696de

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

+0 −24
Original line number Diff line number Diff line
@@ -556,30 +556,6 @@ static int iwl4965_apm_reset(struct iwl_priv *priv) 


#define REG_RECALIB_PERIOD (60)



void iwl4965_rf_kill_ct_config(struct iwl_priv *priv)

{

	struct iwl4965_ct_kill_config cmd;

	unsigned long flags;

	int ret = 0;



	spin_lock_irqsave(&priv->lock, flags);

	iwl_write32(priv, CSR_UCODE_DRV_GP1_CLR,

		    CSR_UCODE_DRV_GP1_REG_BIT_CT_KILL_EXIT);

	spin_unlock_irqrestore(&priv->lock, flags);



	cmd.critical_temperature_R =

		cpu_to_le32(priv->hw_params.ct_kill_threshold);



	ret = iwl_send_cmd_pdu(priv, REPLY_CT_KILL_CONFIG_CMD,

			       sizeof(cmd), &cmd);

	if (ret)

		IWL_ERROR("REPLY_CT_KILL_CONFIG_CMD failed\n");

	else

		IWL_DEBUG_INFO("REPLY_CT_KILL_CONFIG_CMD succeeded, "

			"critical temperature is %d\n",

			cmd.critical_temperature_R);

}



/* Reset differential Rx gains in NIC to prepare for chain noise calibration.

 * Called after every association, but this runs only once!

 *  ... once chain noise is calibrated the first time, it's good forever.  */

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

+1 −1
Original line number Diff line number Diff line
@@ -2078,7 +2078,7 @@ struct iwl4965_card_state_notif { 
#define RF_CARD_DISABLED   0x04

#define RXON_CARD_DISABLED 0x10



struct iwl4965_ct_kill_config {

struct iwl_ct_kill_config {

	__le32   reserved;

	__le32   critical_temperature_M;

	__le32   critical_temperature_R;

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

+23 −0
Original line number Diff line number Diff line
@@ -1326,4 +1326,27 @@ void iwl_dump_nic_event_log(struct iwl_priv *priv) 
}

EXPORT_SYMBOL(iwl_dump_nic_event_log);



void iwl_rf_kill_ct_config(struct iwl_priv *priv)

{

	struct iwl_ct_kill_config cmd;

	unsigned long flags;

	int ret = 0;



	spin_lock_irqsave(&priv->lock, flags);

	iwl_write32(priv, CSR_UCODE_DRV_GP1_CLR,

		    CSR_UCODE_DRV_GP1_REG_BIT_CT_KILL_EXIT);

	spin_unlock_irqrestore(&priv->lock, flags);



	cmd.critical_temperature_R =

		cpu_to_le32(priv->hw_params.ct_kill_threshold);



	ret = iwl_send_cmd_pdu(priv, REPLY_CT_KILL_CONFIG_CMD,

			       sizeof(cmd), &cmd);

	if (ret)

		IWL_ERROR("REPLY_CT_KILL_CONFIG_CMD failed\n");

	else

		IWL_DEBUG_INFO("REPLY_CT_KILL_CONFIG_CMD succeeded, "

			"critical temperature is %d\n",

			cmd.critical_temperature_R);

}

EXPORT_SYMBOL(iwl_rf_kill_ct_config);

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

+1 −0
Original line number Diff line number Diff line
@@ -371,6 +371,7 @@ int iwlcore_low_level_notify(struct iwl_priv *priv, 
			     enum iwlcore_card_notify notify);

extern int iwl_send_statistics_request(struct iwl_priv *priv, u8 flags);

extern int iwl_verify_ucode(struct iwl_priv *priv);

extern void iwl_rf_kill_ct_config(struct iwl_priv *priv);

int iwl_send_lq_cmd(struct iwl_priv *priv,

		    struct iwl_link_quality_cmd *lq, u8 flags);

drivers/net/wireless/iwlwifi/iwl4965-base.c

+1 −1
Original line number Diff line number Diff line
@@ -2295,7 +2295,7 @@ static void iwl_alive_start(struct iwl_priv *priv) 
	iwl4965_commit_rxon(priv);



	/* At this point, the NIC is initialized and operational */

	iwl4965_rf_kill_ct_config(priv);

	iwl_rf_kill_ct_config(priv);



	iwl_leds_register(priv);