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

Commit 354a4530 authored by Meenakshi Venkataraman's avatar Meenakshi Venkataraman Committed by John W. Linville
Browse files

iwlwifi: move iwl_set_rxon_hwcrypto and mark it static 



iwl_set_rxon_hwcrypto is used only in
iwl-agn-rxon.c. Move it there and mark it
static.

Signed-off-by: default avatarMeenakshi Venkataraman <meenakshi.venkataraman@intel.com>
Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent dff96c1e

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

+12 −0
Original line number Diff line number Diff line
@@ -500,6 +500,18 @@ int iwlagn_set_pan_params(struct iwl_priv *priv) 
	return ret;

}



static void iwl_set_rxon_hwcrypto(struct iwl_priv *priv,

				  struct iwl_rxon_context *ctx, int hw_decrypt)

{

	struct iwl_rxon_cmd *rxon = &ctx->staging;



	if (hw_decrypt)

		rxon->filter_flags &= ~RXON_FILTER_DIS_DECRYPT_MSK;

	else

		rxon->filter_flags |= RXON_FILTER_DIS_DECRYPT_MSK;



}



/**

 * iwlagn_commit_rxon - commit staging_rxon to hardware

 *

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

+0 −12
Original line number Diff line number Diff line
@@ -88,18 +88,6 @@ bool iwl_is_ht40_tx_allowed(struct iwl_priv *priv, 
			ctx->ht.extension_chan_offset);

}



void iwl_set_rxon_hwcrypto(struct iwl_priv *priv, struct iwl_rxon_context *ctx,

			   int hw_decrypt)

{

	struct iwl_rxon_cmd *rxon = &ctx->staging;



	if (hw_decrypt)

		rxon->filter_flags &= ~RXON_FILTER_DIS_DECRYPT_MSK;

	else

		rxon->filter_flags |= RXON_FILTER_DIS_DECRYPT_MSK;



}



/* validate RXON structure is valid */

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

{

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

+0 −2
Original line number Diff line number Diff line
@@ -93,8 +93,6 @@ struct iwl_lib_ops { 
 *   L i b                 *

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



void iwl_set_rxon_hwcrypto(struct iwl_priv *priv, struct iwl_rxon_context *ctx,

			   int hw_decrypt);

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

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

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