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

Commit b7e21bf0 authored by Meenakshi Venkataraman's avatar Meenakshi Venkataraman Committed by John W. Linville
Browse files

iwlwifi: use iwlagn_fw_error instead of iwl_nic_error 



In the process, make iwlagn_fw_error
a non-static function, as it is used
by more than one file.

Signed-off-by: default avatarMeenakshi Venkataraman <meenakshi.venkataraman@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent a18f61bc

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

+1 −1
Original line number Diff line number Diff line
@@ -1562,7 +1562,7 @@ static void iwl_cmd_queue_full(struct iwl_op_mode *op_mode) 


	if (!iwl_check_for_ct_kill(priv)) {

		IWL_ERR(priv, "Restarting adapter queue is full\n");

		iwl_nic_error(op_mode);

		iwlagn_fw_error(priv, false);

	}

}

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

+1 −0
Original line number Diff line number Diff line
@@ -132,6 +132,7 @@ int iwl_send_calib_results(struct iwl_priv *priv); 
int iwl_calib_set(struct iwl_priv *priv,

		  const struct iwl_calib_hdr *cmd, int len);

void iwl_calib_free_results(struct iwl_priv *priv);

void iwlagn_fw_error(struct iwl_priv *priv, bool ondemand);



/* lib */

int iwlagn_send_tx_power(struct iwl_priv *priv);

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

+1 −1
Original line number Diff line number Diff line
@@ -828,7 +828,7 @@ void iwl_print_rx_config_cmd(struct iwl_priv *priv, 
}

#endif



static void iwlagn_fw_error(struct iwl_priv *priv, bool ondemand)

void iwlagn_fw_error(struct iwl_priv *priv, bool ondemand)

{

	unsigned int reload_msec;

	unsigned long reload_jiffies;