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

Commit 7314c2b3 authored by Johannes Berg's avatar Johannes Berg Committed by Wey-Yi Guy
Browse files

iwlagn: rename iwl_commit_rxon 



iwl_commit_rxon really should be named
iwlagn_commit_rxon, so rename it.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent 15a6321d

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

+1 −1
Original line number Diff line number Diff line
@@ -2216,7 +2216,7 @@ static void iwl4965_cancel_deferred_work(struct iwl_priv *priv) 


static struct iwl_hcmd_ops iwl4965_hcmd = {

	.rxon_assoc = iwl4965_send_rxon_assoc,

	.commit_rxon = iwl_commit_rxon,

	.commit_rxon = iwlagn_commit_rxon,

	.set_rxon_chain = iwl_set_rxon_chain,

	.send_bt_config = iwl_send_bt_config,

};

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

+2 −2
Original line number Diff line number Diff line
@@ -360,7 +360,7 @@ static int iwlagn_set_pan_params(struct iwl_priv *priv) 


struct iwl_hcmd_ops iwlagn_hcmd = {

	.rxon_assoc = iwlagn_send_rxon_assoc,

	.commit_rxon = iwl_commit_rxon,

	.commit_rxon = iwlagn_commit_rxon,

	.set_rxon_chain = iwl_set_rxon_chain,

	.set_tx_ant = iwlagn_send_tx_ant_config,

	.send_bt_config = iwl_send_bt_config,
@@ -369,7 +369,7 @@ struct iwl_hcmd_ops iwlagn_hcmd = { 


struct iwl_hcmd_ops iwlagn_bt_hcmd = {

	.rxon_assoc = iwlagn_send_rxon_assoc,

	.commit_rxon = iwl_commit_rxon,

	.commit_rxon = iwlagn_commit_rxon,

	.set_rxon_chain = iwl_set_rxon_chain,

	.set_tx_ant = iwlagn_send_tx_ant_config,

	.send_bt_config = iwlagn_send_advance_bt_config,

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

+2 −2
Original line number Diff line number Diff line
@@ -91,14 +91,14 @@ static int iwlagn_ant_coupling; 
static bool iwlagn_bt_ch_announce = 1;



/**

 * iwl_commit_rxon - commit staging_rxon to hardware

 * iwlagn_commit_rxon - commit staging_rxon to hardware

 *

 * The RXON command in staging_rxon is committed to the hardware and

 * the active_rxon structure is updated with the new data.  This

 * function correctly transitions out of the RXON_ASSOC_MSK state if

 * a HW tune is required based on the RXON structure changes.

 */

int iwl_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *ctx)

int iwlagn_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *ctx)

{

	/* cast away the const for active_rxon in this function */

	struct iwl_rxon_cmd *active_rxon = (void *)&ctx->active;

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

+3 −0
Original line number Diff line number Diff line
@@ -129,6 +129,9 @@ void iwlagn_txq_set_sched(struct iwl_priv *priv, u32 mask); 
void iwl_free_tfds_in_queue(struct iwl_priv *priv,

			    int sta_id, int tid, int freed);



/* RXON */

int iwlagn_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *ctx);



/* uCode */

int iwlagn_load_ucode(struct iwl_priv *priv);

void iwlagn_rx_calib_result(struct iwl_priv *priv,

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

+0 −1
Original line number Diff line number Diff line
@@ -432,7 +432,6 @@ void iwl_bss_info_changed(struct ieee80211_hw *hw, 
				     struct ieee80211_vif *vif,

				     struct ieee80211_bss_conf *bss_conf,

				     u32 changes);

int iwl_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *ctx);

int iwl_mac_add_interface(struct ieee80211_hw *hw,

			  struct ieee80211_vif *vif);

void iwl_mac_remove_interface(struct ieee80211_hw *hw,