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

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

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



Moving 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 dd64173e

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

+29 −0
Original line number Diff line number Diff line
@@ -591,6 +591,35 @@ void iwl_set_rxon_ht(struct iwl_priv *priv, struct iwl_ht_config *ht_conf) 
		_iwl_set_rxon_ht(priv, ht_conf, ctx);

}



/**

 * iwl_set_rxon_channel - Set the band and channel values in staging RXON

 * @ch: requested channel as a pointer to struct ieee80211_channel



 * NOTE:  Does not commit to the hardware; it sets appropriate bit fields

 * in the staging RXON flag structure based on the ch->band

 */

void iwl_set_rxon_channel(struct iwl_priv *priv, struct ieee80211_channel *ch,

			 struct iwl_rxon_context *ctx)

{

	enum ieee80211_band band = ch->band;

	u16 channel = ch->hw_value;



	if ((le16_to_cpu(ctx->staging.channel) == channel) &&

	    (priv->band == band))

		return;



	ctx->staging.channel = cpu_to_le16(channel);

	if (band == IEEE80211_BAND_5GHZ)

		ctx->staging.flags &= ~RXON_FLG_BAND_24G_MSK;

	else

		ctx->staging.flags |= RXON_FLG_BAND_24G_MSK;



	priv->band = band;



	IWL_DEBUG_INFO(priv, "Staging channel set to %d [%d]\n", channel, band);



}



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
@@ -128,6 +128,8 @@ void iwlagn_bss_info_changed(struct ieee80211_hw *hw, 
void iwlagn_config_ht40(struct ieee80211_conf *conf,

			struct iwl_rxon_context *ctx);

void iwl_set_rxon_ht(struct iwl_priv *priv, struct iwl_ht_config *ht_conf);

void iwl_set_rxon_channel(struct iwl_priv *priv, struct ieee80211_channel *ch,

			 struct iwl_rxon_context *ctx);



/* uCode */

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

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

+0 −29
Original line number Diff line number Diff line
@@ -43,35 +43,6 @@ 


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



/**

 * iwl_set_rxon_channel - Set the band and channel values in staging RXON

 * @ch: requested channel as a pointer to struct ieee80211_channel



 * NOTE:  Does not commit to the hardware; it sets appropriate bit fields

 * in the staging RXON flag structure based on the ch->band

 */

void iwl_set_rxon_channel(struct iwl_priv *priv, struct ieee80211_channel *ch,

			 struct iwl_rxon_context *ctx)

{

	enum ieee80211_band band = ch->band;

	u16 channel = ch->hw_value;



	if ((le16_to_cpu(ctx->staging.channel) == channel) &&

	    (priv->band == band))

		return;



	ctx->staging.channel = cpu_to_le16(channel);

	if (band == IEEE80211_BAND_5GHZ)

		ctx->staging.flags &= ~RXON_FLG_BAND_24G_MSK;

	else

		ctx->staging.flags |= RXON_FLG_BAND_24G_MSK;



	priv->band = band;



	IWL_DEBUG_INFO(priv, "Staging channel set to %d [%d]\n", channel, band);



}



void iwl_set_flags_for_band(struct iwl_priv *priv,

			    struct iwl_rxon_context *ctx,

			    enum ieee80211_band band,

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

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

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



void iwl_set_rxon_channel(struct iwl_priv *priv, struct ieee80211_channel *ch,

			 struct iwl_rxon_context *ctx);

void iwl_set_flags_for_band(struct iwl_priv *priv,

			    struct iwl_rxon_context *ctx,

			    enum ieee80211_band band,