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

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

iwlwifi: move iwl_set_flags_for_band 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 fedfa87a

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

+23 −0
Original line number Diff line number Diff line
@@ -620,6 +620,29 @@ void iwl_set_rxon_channel(struct iwl_priv *priv, struct ieee80211_channel *ch, 


}



void iwl_set_flags_for_band(struct iwl_priv *priv,

			    struct iwl_rxon_context *ctx,

			    enum ieee80211_band band,

			    struct ieee80211_vif *vif)

{

	if (band == IEEE80211_BAND_5GHZ) {

		ctx->staging.flags &=

		    ~(RXON_FLG_BAND_24G_MSK | RXON_FLG_AUTO_DETECT_MSK

		      | RXON_FLG_CCK_MSK);

		ctx->staging.flags |= RXON_FLG_SHORT_SLOT_MSK;

	} else {

		/* Copied from iwl_post_associate() */

		if (vif && vif->bss_conf.use_short_slot)

			ctx->staging.flags |= RXON_FLG_SHORT_SLOT_MSK;

		else

			ctx->staging.flags &= ~RXON_FLG_SHORT_SLOT_MSK;



		ctx->staging.flags |= RXON_FLG_BAND_24G_MSK;

		ctx->staging.flags |= RXON_FLG_AUTO_DETECT_MSK;

		ctx->staging.flags &= ~RXON_FLG_CCK_MSK;

	}

}



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

+4 −1
Original line number Diff line number Diff line
@@ -130,7 +130,10 @@ void iwlagn_config_ht40(struct ieee80211_conf *conf, 
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);



void iwl_set_flags_for_band(struct iwl_priv *priv,

			    struct iwl_rxon_context *ctx,

			    enum ieee80211_band band,

			    struct ieee80211_vif *vif);

/* 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 −23
Original line number Diff line number Diff line
@@ -43,29 +43,6 @@ 


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



void iwl_set_flags_for_band(struct iwl_priv *priv,

			    struct iwl_rxon_context *ctx,

			    enum ieee80211_band band,

			    struct ieee80211_vif *vif)

{

	if (band == IEEE80211_BAND_5GHZ) {

		ctx->staging.flags &=

		    ~(RXON_FLG_BAND_24G_MSK | RXON_FLG_AUTO_DETECT_MSK

		      | RXON_FLG_CCK_MSK);

		ctx->staging.flags |= RXON_FLG_SHORT_SLOT_MSK;

	} else {

		/* Copied from iwl_post_associate() */

		if (vif && vif->bss_conf.use_short_slot)

			ctx->staging.flags |= RXON_FLG_SHORT_SLOT_MSK;

		else

			ctx->staging.flags &= ~RXON_FLG_SHORT_SLOT_MSK;



		ctx->staging.flags |= RXON_FLG_BAND_24G_MSK;

		ctx->staging.flags |= RXON_FLG_AUTO_DETECT_MSK;

		ctx->staging.flags &= ~RXON_FLG_CCK_MSK;

	}

}



/*

 * initialize rxon structure with default values from eeprom

 */

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

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

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



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_connection_init_rx_config(struct iwl_priv *priv,

				   struct iwl_rxon_context *ctx);

void iwl_set_rate(struct iwl_priv *priv);