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

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

iwlwifi: move iwl_send_bt_config and mark it static 



Move this 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 e6a62a6e

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

+23 −0
Original line number Diff line number Diff line
@@ -726,6 +726,29 @@ static int iwlagn_send_tx_ant_config(struct iwl_priv *priv, u8 valid_tx_ant) 
	}

}



static void iwl_send_bt_config(struct iwl_priv *priv)

{

	struct iwl_bt_cmd bt_cmd = {

		.lead_time = BT_LEAD_TIME_DEF,

		.max_kill = BT_MAX_KILL_DEF,

		.kill_ack_mask = 0,

		.kill_cts_mask = 0,

	};



	if (!iwlagn_mod_params.bt_coex_active)

		bt_cmd.flags = BT_COEX_DISABLE;

	else

		bt_cmd.flags = BT_COEX_ENABLE;



	priv->bt_enable_flag = bt_cmd.flags;

	IWL_DEBUG_INFO(priv, "BT coex %s\n",

		(bt_cmd.flags == BT_COEX_DISABLE) ? "disable" : "active");



	if (iwl_dvm_send_cmd_pdu(priv, REPLY_BT_CONFIG,

			     CMD_SYNC, sizeof(struct iwl_bt_cmd), &bt_cmd))

		IWL_ERR(priv, "failed to send BT Coex Config\n");

}



/**

 * iwl_alive_start - called after REPLY_ALIVE notification received

 *                   from protocol/runtime uCode (initialization uCode's

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

+0 −23
Original line number Diff line number Diff line
@@ -66,29 +66,6 @@ void iwl_print_rx_config_cmd(struct iwl_priv *priv, 
}

#endif



void iwl_send_bt_config(struct iwl_priv *priv)

{

	struct iwl_bt_cmd bt_cmd = {

		.lead_time = BT_LEAD_TIME_DEF,

		.max_kill = BT_MAX_KILL_DEF,

		.kill_ack_mask = 0,

		.kill_cts_mask = 0,

	};



	if (!iwlagn_mod_params.bt_coex_active)

		bt_cmd.flags = BT_COEX_DISABLE;

	else

		bt_cmd.flags = BT_COEX_ENABLE;



	priv->bt_enable_flag = bt_cmd.flags;

	IWL_DEBUG_INFO(priv, "BT coex %s\n",

		(bt_cmd.flags == BT_COEX_DISABLE) ? "disable" : "active");



	if (iwl_dvm_send_cmd_pdu(priv, REPLY_BT_CONFIG,

			     CMD_SYNC, sizeof(struct iwl_bt_cmd), &bt_cmd))

		IWL_ERR(priv, "failed to send BT Coex Config\n");

}



int iwl_send_statistics_request(struct iwl_priv *priv, u8 flags, bool clear)

{

	struct iwl_statistics_cmd statistics_cmd = {

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

+0 −1
Original line number Diff line number Diff line
@@ -153,7 +153,6 @@ int __must_check iwl_scan_initiate(struct iwl_priv *priv, 
 *   S e n d i n g     H o s t     C o m m a n d s   *

 *****************************************************/



extern void iwl_send_bt_config(struct iwl_priv *priv);

extern int iwl_send_statistics_request(struct iwl_priv *priv,

				       u8 flags, bool clear);