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

Commit c3f6e9cf authored by Wey-Yi Guy's avatar Wey-Yi Guy
Browse files

iwlagn: make rxon_assoc static function 



Move rxon_assoc to static function from ops

Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
parent e43e85c4

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

+0 −50
Original line number Diff line number Diff line
@@ -37,54 +37,6 @@ 
#include "iwl-io.h"

#include "iwl-agn.h"



int iwlagn_send_rxon_assoc(struct iwl_priv *priv,

			   struct iwl_rxon_context *ctx)

{

	int ret = 0;

	struct iwl5000_rxon_assoc_cmd rxon_assoc;

	const struct iwl_rxon_cmd *rxon1 = &ctx->staging;

	const struct iwl_rxon_cmd *rxon2 = &ctx->active;



	if ((rxon1->flags == rxon2->flags) &&

	    (rxon1->filter_flags == rxon2->filter_flags) &&

	    (rxon1->cck_basic_rates == rxon2->cck_basic_rates) &&

	    (rxon1->ofdm_ht_single_stream_basic_rates ==

	     rxon2->ofdm_ht_single_stream_basic_rates) &&

	    (rxon1->ofdm_ht_dual_stream_basic_rates ==

	     rxon2->ofdm_ht_dual_stream_basic_rates) &&

	    (rxon1->ofdm_ht_triple_stream_basic_rates ==

	     rxon2->ofdm_ht_triple_stream_basic_rates) &&

	    (rxon1->acquisition_data == rxon2->acquisition_data) &&

	    (rxon1->rx_chain == rxon2->rx_chain) &&

	    (rxon1->ofdm_basic_rates == rxon2->ofdm_basic_rates)) {

		IWL_DEBUG_INFO(priv, "Using current RXON_ASSOC.  Not resending.\n");

		return 0;

	}



	rxon_assoc.flags = ctx->staging.flags;

	rxon_assoc.filter_flags = ctx->staging.filter_flags;

	rxon_assoc.ofdm_basic_rates = ctx->staging.ofdm_basic_rates;

	rxon_assoc.cck_basic_rates = ctx->staging.cck_basic_rates;

	rxon_assoc.reserved1 = 0;

	rxon_assoc.reserved2 = 0;

	rxon_assoc.reserved3 = 0;

	rxon_assoc.ofdm_ht_single_stream_basic_rates =

	    ctx->staging.ofdm_ht_single_stream_basic_rates;

	rxon_assoc.ofdm_ht_dual_stream_basic_rates =

	    ctx->staging.ofdm_ht_dual_stream_basic_rates;

	rxon_assoc.rx_chain_select_flags = ctx->staging.rx_chain;

	rxon_assoc.ofdm_ht_triple_stream_basic_rates =

		 ctx->staging.ofdm_ht_triple_stream_basic_rates;

	rxon_assoc.acquisition_data = ctx->staging.acquisition_data;



	ret = iwl_send_cmd_pdu_async(priv, ctx->rxon_assoc_cmd,

				     sizeof(rxon_assoc), &rxon_assoc, NULL);

	if (ret)

		return ret;



	return ret;

}



int iwlagn_send_tx_ant_config(struct iwl_priv *priv, u8 valid_tx_ant)

{

	struct iwl_tx_ant_config_cmd tx_ant_cmd = {
@@ -364,7 +316,6 @@ static int iwlagn_set_pan_params(struct iwl_priv *priv) 
}



struct iwl_hcmd_ops iwlagn_hcmd = {

	.rxon_assoc = iwlagn_send_rxon_assoc,

	.commit_rxon = iwlagn_commit_rxon,

	.set_rxon_chain = iwlagn_set_rxon_chain,

	.set_tx_ant = iwlagn_send_tx_ant_config,
@@ -373,7 +324,6 @@ struct iwl_hcmd_ops iwlagn_hcmd = { 
};



struct iwl_hcmd_ops iwlagn_bt_hcmd = {

	.rxon_assoc = iwlagn_send_rxon_assoc,

	.commit_rxon = iwlagn_commit_rxon,

	.set_rxon_chain = iwlagn_set_rxon_chain,

	.set_tx_ant = iwlagn_send_tx_ant_config,

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

+49 −1
Original line number Diff line number Diff line
@@ -121,6 +121,54 @@ static int iwlagn_update_beacon(struct iwl_priv *priv, 
	return iwlagn_send_beacon_cmd(priv);

}



static int iwlagn_send_rxon_assoc(struct iwl_priv *priv,

			   struct iwl_rxon_context *ctx)

{

	int ret = 0;

	struct iwl5000_rxon_assoc_cmd rxon_assoc;

	const struct iwl_rxon_cmd *rxon1 = &ctx->staging;

	const struct iwl_rxon_cmd *rxon2 = &ctx->active;



	if ((rxon1->flags == rxon2->flags) &&

	    (rxon1->filter_flags == rxon2->filter_flags) &&

	    (rxon1->cck_basic_rates == rxon2->cck_basic_rates) &&

	    (rxon1->ofdm_ht_single_stream_basic_rates ==

	     rxon2->ofdm_ht_single_stream_basic_rates) &&

	    (rxon1->ofdm_ht_dual_stream_basic_rates ==

	     rxon2->ofdm_ht_dual_stream_basic_rates) &&

	    (rxon1->ofdm_ht_triple_stream_basic_rates ==

	     rxon2->ofdm_ht_triple_stream_basic_rates) &&

	    (rxon1->acquisition_data == rxon2->acquisition_data) &&

	    (rxon1->rx_chain == rxon2->rx_chain) &&

	    (rxon1->ofdm_basic_rates == rxon2->ofdm_basic_rates)) {

		IWL_DEBUG_INFO(priv, "Using current RXON_ASSOC.  Not resending.\n");

		return 0;

	}



	rxon_assoc.flags = ctx->staging.flags;

	rxon_assoc.filter_flags = ctx->staging.filter_flags;

	rxon_assoc.ofdm_basic_rates = ctx->staging.ofdm_basic_rates;

	rxon_assoc.cck_basic_rates = ctx->staging.cck_basic_rates;

	rxon_assoc.reserved1 = 0;

	rxon_assoc.reserved2 = 0;

	rxon_assoc.reserved3 = 0;

	rxon_assoc.ofdm_ht_single_stream_basic_rates =

	    ctx->staging.ofdm_ht_single_stream_basic_rates;

	rxon_assoc.ofdm_ht_dual_stream_basic_rates =

	    ctx->staging.ofdm_ht_dual_stream_basic_rates;

	rxon_assoc.rx_chain_select_flags = ctx->staging.rx_chain;

	rxon_assoc.ofdm_ht_triple_stream_basic_rates =

		 ctx->staging.ofdm_ht_triple_stream_basic_rates;

	rxon_assoc.acquisition_data = ctx->staging.acquisition_data;



	ret = iwl_send_cmd_pdu_async(priv, ctx->rxon_assoc_cmd,

				     sizeof(rxon_assoc), &rxon_assoc, NULL);

	if (ret)

		return ret;



	return ret;

}



/**

 * iwlagn_commit_rxon - commit staging_rxon to hardware

 *
@@ -200,7 +248,7 @@ int iwlagn_commit_rxon(struct iwl_priv *priv, struct iwl_rxon_context *ctx) 
	 * and other flags for the current radio configuration.

	 */

	if (!iwl_full_rxon_required(priv, ctx)) {

		ret = iwl_send_rxon_assoc(priv, ctx);

		ret = iwlagn_send_rxon_assoc(priv, ctx);

		if (ret) {

			IWL_ERR(priv, "Error setting RXON_ASSOC (%d)\n", ret);

			return ret;

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

+0 −2
Original line number Diff line number Diff line
@@ -256,8 +256,6 @@ int iwlagn_manage_ibss_station(struct iwl_priv *priv, 
			       struct ieee80211_vif *vif, bool add);



/* hcmd */

int iwlagn_send_rxon_assoc(struct iwl_priv *priv,

			   struct iwl_rxon_context *ctx);

int iwlagn_send_tx_ant_config(struct iwl_priv *priv, u8 valid_tx_ant);

int iwlagn_send_beacon_cmd(struct iwl_priv *priv);

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

+0 −6
Original line number Diff line number Diff line
@@ -90,7 +90,6 @@ struct iwl_cmd; 
#define IWL_CMD(x) case x: return #x



struct iwl_hcmd_ops {

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

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

	void (*set_rxon_chain)(struct iwl_priv *priv,

			       struct iwl_rxon_context *ctx);
@@ -645,11 +644,6 @@ void iwl_apm_stop(struct iwl_priv *priv); 
int iwl_apm_init(struct iwl_priv *priv);



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

static inline int iwl_send_rxon_assoc(struct iwl_priv *priv,

				      struct iwl_rxon_context *ctx)

{

	return priv->cfg->ops->hcmd->rxon_assoc(priv, ctx);

}

static inline int iwlcore_commit_rxon(struct iwl_priv *priv,

				      struct iwl_rxon_context *ctx)

{