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

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

iwlwifi: move iwl_set_rate to iwl-agn-rxon.c 



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 47042ac2

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

+13 −0
Original line number Diff line number Diff line
@@ -715,6 +715,19 @@ void iwl_set_flags_for_band(struct iwl_priv *priv, 
	}

}



void iwl_set_rate(struct iwl_priv *priv)

{

	struct iwl_rxon_context *ctx;



	for_each_context(priv, ctx) {

		ctx->staging.cck_basic_rates =

		    (IWL_CCK_BASIC_RATES_MASK >> IWL_FIRST_CCK_RATE) & 0xF;



		ctx->staging.ofdm_basic_rates =

		   (IWL_OFDM_BASIC_RATES_MASK >> IWL_FIRST_OFDM_RATE) & 0xFF;

	}

}



static void iwl_set_rxon_hwcrypto(struct iwl_priv *priv,

				  struct iwl_rxon_context *ctx, int hw_decrypt)

{

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

+2 −0
Original line number Diff line number Diff line
@@ -136,6 +136,8 @@ void iwl_set_flags_for_band(struct iwl_priv *priv, 
			    struct iwl_rxon_context *ctx,

			    enum ieee80211_band band,

			    struct ieee80211_vif *vif);

void iwl_set_rate(struct iwl_priv *priv);



/* uCode */

int iwl_send_bt_env(struct iwl_priv *priv, u8 action, u8 type);

void iwl_send_prio_tbl(struct iwl_priv *priv);

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

+0 −13
Original line number Diff line number Diff line
@@ -43,19 +43,6 @@ 


const u8 iwl_bcast_addr[ETH_ALEN] = { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF };



void iwl_set_rate(struct iwl_priv *priv)

{

	struct iwl_rxon_context *ctx;



	for_each_context(priv, ctx) {

		ctx->staging.cck_basic_rates =

		    (IWL_CCK_BASIC_RATES_MASK >> IWL_FIRST_CCK_RATE) & 0xF;



		ctx->staging.ofdm_basic_rates =

		   (IWL_OFDM_BASIC_RATES_MASK >> IWL_FIRST_OFDM_RATE) & 0xFF;

	}

}



void iwl_chswitch_done(struct iwl_priv *priv, bool is_success)

{

	/*

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

+0 −1
Original line number Diff line number Diff line
@@ -78,7 +78,6 @@ struct iwl_cmd; 
 *   L i b                 *

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



void iwl_set_rate(struct iwl_priv *priv);

int iwl_cmd_echo_test(struct iwl_priv *priv);

#ifdef CONFIG_IWLWIFI_DEBUGFS

int iwl_alloc_traffic_mem(struct iwl_priv *priv);