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

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

iwlwifi: move iwl_set_rxon_ht 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 5edc565d

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

+90 −0
Original line number Diff line number Diff line
@@ -501,6 +501,96 @@ int iwlagn_set_pan_params(struct iwl_priv *priv) 
	return ret;

}



static void _iwl_set_rxon_ht(struct iwl_priv *priv,

			     struct iwl_ht_config *ht_conf,

			     struct iwl_rxon_context *ctx)

{

	struct iwl_rxon_cmd *rxon = &ctx->staging;



	if (!ctx->ht.enabled) {

		rxon->flags &= ~(RXON_FLG_CHANNEL_MODE_MSK |

			RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK |

			RXON_FLG_HT40_PROT_MSK |

			RXON_FLG_HT_PROT_MSK);

		return;

	}



	/* FIXME: if the definition of ht.protection changed, the "translation"

	 * will be needed for rxon->flags

	 */

	rxon->flags |= cpu_to_le32(ctx->ht.protection <<

				   RXON_FLG_HT_OPERATING_MODE_POS);



	/* Set up channel bandwidth:

	 * 20 MHz only, 20/40 mixed or pure 40 if ht40 ok */

	/* clear the HT channel mode before set the mode */

	rxon->flags &= ~(RXON_FLG_CHANNEL_MODE_MSK |

			 RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK);

	if (iwl_is_ht40_tx_allowed(priv, ctx, NULL)) {

		/* pure ht40 */

		if (ctx->ht.protection ==

		    IEEE80211_HT_OP_MODE_PROTECTION_20MHZ) {

			rxon->flags |= RXON_FLG_CHANNEL_MODE_PURE_40;

			/*

			 * Note: control channel is opposite of extension

			 * channel

			 */

			switch (ctx->ht.extension_chan_offset) {

			case IEEE80211_HT_PARAM_CHA_SEC_ABOVE:

				rxon->flags &=

					~RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK;

				break;

			case IEEE80211_HT_PARAM_CHA_SEC_BELOW:

				rxon->flags |=

					RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK;

				break;

			}

		} else {

			/*

			 * Note: control channel is opposite of extension

			 * channel

			 */

			switch (ctx->ht.extension_chan_offset) {

			case IEEE80211_HT_PARAM_CHA_SEC_ABOVE:

				rxon->flags &=

					~(RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK);

				rxon->flags |= RXON_FLG_CHANNEL_MODE_MIXED;

				break;

			case IEEE80211_HT_PARAM_CHA_SEC_BELOW:

				rxon->flags |= RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK;

				rxon->flags |= RXON_FLG_CHANNEL_MODE_MIXED;

				break;

			case IEEE80211_HT_PARAM_CHA_SEC_NONE:

			default:

				/*

				 * channel location only valid if in Mixed

				 * mode

				 */

				IWL_ERR(priv,

					"invalid extension channel offset\n");

				break;

			}

		}

	} else {

		rxon->flags |= RXON_FLG_CHANNEL_MODE_LEGACY;

	}



	iwlagn_set_rxon_chain(priv, ctx);



	IWL_DEBUG_ASSOC(priv, "rxon flags 0x%X operation mode :0x%X "

			"extension channel offset 0x%x\n",

			le32_to_cpu(rxon->flags), ctx->ht.protection,

			ctx->ht.extension_chan_offset);

}



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

{

	struct iwl_rxon_context *ctx;



	for_each_context(priv, ctx)

		_iwl_set_rxon_ht(priv, ht_conf, ctx);

}



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

+1 −0
Original line number Diff line number Diff line
@@ -127,6 +127,7 @@ void iwlagn_bss_info_changed(struct ieee80211_hw *hw, 
			     u32 changes);

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);



/* uCode */

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

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

+0 −75
Original line number Diff line number Diff line
@@ -43,81 +43,6 @@ 


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



static void _iwl_set_rxon_ht(struct iwl_priv *priv,

			     struct iwl_ht_config *ht_conf,

			     struct iwl_rxon_context *ctx)

{

	struct iwl_rxon_cmd *rxon = &ctx->staging;



	if (!ctx->ht.enabled) {

		rxon->flags &= ~(RXON_FLG_CHANNEL_MODE_MSK |

			RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK |

			RXON_FLG_HT40_PROT_MSK |

			RXON_FLG_HT_PROT_MSK);

		return;

	}



	/* FIXME: if the definition of ht.protection changed, the "translation"

	 * will be needed for rxon->flags

	 */

	rxon->flags |= cpu_to_le32(ctx->ht.protection << RXON_FLG_HT_OPERATING_MODE_POS);



	/* Set up channel bandwidth:

	 * 20 MHz only, 20/40 mixed or pure 40 if ht40 ok */

	/* clear the HT channel mode before set the mode */

	rxon->flags &= ~(RXON_FLG_CHANNEL_MODE_MSK |

			 RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK);

	if (iwl_is_ht40_tx_allowed(priv, ctx, NULL)) {

		/* pure ht40 */

		if (ctx->ht.protection == IEEE80211_HT_OP_MODE_PROTECTION_20MHZ) {

			rxon->flags |= RXON_FLG_CHANNEL_MODE_PURE_40;

			/* Note: control channel is opposite of extension channel */

			switch (ctx->ht.extension_chan_offset) {

			case IEEE80211_HT_PARAM_CHA_SEC_ABOVE:

				rxon->flags &= ~RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK;

				break;

			case IEEE80211_HT_PARAM_CHA_SEC_BELOW:

				rxon->flags |= RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK;

				break;

			}

		} else {

			/* Note: control channel is opposite of extension channel */

			switch (ctx->ht.extension_chan_offset) {

			case IEEE80211_HT_PARAM_CHA_SEC_ABOVE:

				rxon->flags &= ~(RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK);

				rxon->flags |= RXON_FLG_CHANNEL_MODE_MIXED;

				break;

			case IEEE80211_HT_PARAM_CHA_SEC_BELOW:

				rxon->flags |= RXON_FLG_CTRL_CHANNEL_LOC_HI_MSK;

				rxon->flags |= RXON_FLG_CHANNEL_MODE_MIXED;

				break;

			case IEEE80211_HT_PARAM_CHA_SEC_NONE:

			default:

				/* channel location only valid if in Mixed mode */

				IWL_ERR(priv, "invalid extension channel offset\n");

				break;

			}

		}

	} else {

		rxon->flags |= RXON_FLG_CHANNEL_MODE_LEGACY;

	}



	iwlagn_set_rxon_chain(priv, ctx);



	IWL_DEBUG_ASSOC(priv, "rxon flags 0x%X operation mode :0x%X "

			"extension channel offset 0x%x\n",

			le32_to_cpu(rxon->flags), ctx->ht.protection,

			ctx->ht.extension_chan_offset);

}



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

{

	struct iwl_rxon_context *ctx;



	for_each_context(priv, ctx)

		_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

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

+0 −1
Original line number Diff line number Diff line
@@ -84,7 +84,6 @@ 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_rxon_ht(struct iwl_priv *priv, struct iwl_ht_config *ht_conf);

void iwl_connection_init_rx_config(struct iwl_priv *priv,

				   struct iwl_rxon_context *ctx);

void iwl_set_rate(struct iwl_priv *priv);