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

Commit 8931b576 authored by Meenakshi Venkataraman's avatar Meenakshi Venkataraman Committed by John W. Linville
Browse files

iwlwifi: move iwl_check_rxon_cmd and mark it static 



iwl_check_rxon_cmd 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 354a4530

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

+73 −0
Original line number Diff line number Diff line
@@ -512,6 +512,79 @@ static void iwl_set_rxon_hwcrypto(struct iwl_priv *priv, 


}



/* validate RXON structure is valid */

static int iwl_check_rxon_cmd(struct iwl_priv *priv,

			      struct iwl_rxon_context *ctx)

{

	struct iwl_rxon_cmd *rxon = &ctx->staging;

	u32 errors = 0;



	if (rxon->flags & RXON_FLG_BAND_24G_MSK) {

		if (rxon->flags & RXON_FLG_TGJ_NARROW_BAND_MSK) {

			IWL_WARN(priv, "check 2.4G: wrong narrow\n");

			errors |= BIT(0);

		}

		if (rxon->flags & RXON_FLG_RADAR_DETECT_MSK) {

			IWL_WARN(priv, "check 2.4G: wrong radar\n");

			errors |= BIT(1);

		}

	} else {

		if (!(rxon->flags & RXON_FLG_SHORT_SLOT_MSK)) {

			IWL_WARN(priv, "check 5.2G: not short slot!\n");

			errors |= BIT(2);

		}

		if (rxon->flags & RXON_FLG_CCK_MSK) {

			IWL_WARN(priv, "check 5.2G: CCK!\n");

			errors |= BIT(3);

		}

	}

	if ((rxon->node_addr[0] | rxon->bssid_addr[0]) & 0x1) {

		IWL_WARN(priv, "mac/bssid mcast!\n");

		errors |= BIT(4);

	}



	/* make sure basic rates 6Mbps and 1Mbps are supported */

	if ((rxon->ofdm_basic_rates & IWL_RATE_6M_MASK) == 0 &&

	    (rxon->cck_basic_rates & IWL_RATE_1M_MASK) == 0) {

		IWL_WARN(priv, "neither 1 nor 6 are basic\n");

		errors |= BIT(5);

	}



	if (le16_to_cpu(rxon->assoc_id) > 2007) {

		IWL_WARN(priv, "aid > 2007\n");

		errors |= BIT(6);

	}



	if ((rxon->flags & (RXON_FLG_CCK_MSK | RXON_FLG_SHORT_SLOT_MSK))

			== (RXON_FLG_CCK_MSK | RXON_FLG_SHORT_SLOT_MSK)) {

		IWL_WARN(priv, "CCK and short slot\n");

		errors |= BIT(7);

	}



	if ((rxon->flags & (RXON_FLG_CCK_MSK | RXON_FLG_AUTO_DETECT_MSK))

			== (RXON_FLG_CCK_MSK | RXON_FLG_AUTO_DETECT_MSK)) {

		IWL_WARN(priv, "CCK and auto detect");

		errors |= BIT(8);

	}



	if ((rxon->flags & (RXON_FLG_AUTO_DETECT_MSK |

			    RXON_FLG_TGG_PROTECT_MSK)) ==

			    RXON_FLG_TGG_PROTECT_MSK) {

		IWL_WARN(priv, "TGg but no auto-detect\n");

		errors |= BIT(9);

	}



	if (rxon->channel == 0) {

		IWL_WARN(priv, "zero channel is invalid\n");

		errors |= BIT(10);

	}



	WARN(errors, "Invalid RXON (%#x), channel %d",

	     errors, le16_to_cpu(rxon->channel));



	return errors ? -EINVAL : 0;

}



/**

 * iwlagn_commit_rxon - commit staging_rxon to hardware

 *

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

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

}



/* validate RXON structure is valid */

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

{

	struct iwl_rxon_cmd *rxon = &ctx->staging;

	u32 errors = 0;



	if (rxon->flags & RXON_FLG_BAND_24G_MSK) {

		if (rxon->flags & RXON_FLG_TGJ_NARROW_BAND_MSK) {

			IWL_WARN(priv, "check 2.4G: wrong narrow\n");

			errors |= BIT(0);

		}

		if (rxon->flags & RXON_FLG_RADAR_DETECT_MSK) {

			IWL_WARN(priv, "check 2.4G: wrong radar\n");

			errors |= BIT(1);

		}

	} else {

		if (!(rxon->flags & RXON_FLG_SHORT_SLOT_MSK)) {

			IWL_WARN(priv, "check 5.2G: not short slot!\n");

			errors |= BIT(2);

		}

		if (rxon->flags & RXON_FLG_CCK_MSK) {

			IWL_WARN(priv, "check 5.2G: CCK!\n");

			errors |= BIT(3);

		}

	}

	if ((rxon->node_addr[0] | rxon->bssid_addr[0]) & 0x1) {

		IWL_WARN(priv, "mac/bssid mcast!\n");

		errors |= BIT(4);

	}



	/* make sure basic rates 6Mbps and 1Mbps are supported */

	if ((rxon->ofdm_basic_rates & IWL_RATE_6M_MASK) == 0 &&

	    (rxon->cck_basic_rates & IWL_RATE_1M_MASK) == 0) {

		IWL_WARN(priv, "neither 1 nor 6 are basic\n");

		errors |= BIT(5);

	}



	if (le16_to_cpu(rxon->assoc_id) > 2007) {

		IWL_WARN(priv, "aid > 2007\n");

		errors |= BIT(6);

	}



	if ((rxon->flags & (RXON_FLG_CCK_MSK | RXON_FLG_SHORT_SLOT_MSK))

			== (RXON_FLG_CCK_MSK | RXON_FLG_SHORT_SLOT_MSK)) {

		IWL_WARN(priv, "CCK and short slot\n");

		errors |= BIT(7);

	}



	if ((rxon->flags & (RXON_FLG_CCK_MSK | RXON_FLG_AUTO_DETECT_MSK))

			== (RXON_FLG_CCK_MSK | RXON_FLG_AUTO_DETECT_MSK)) {

		IWL_WARN(priv, "CCK and auto detect");

		errors |= BIT(8);

	}



	if ((rxon->flags & (RXON_FLG_AUTO_DETECT_MSK |

			    RXON_FLG_TGG_PROTECT_MSK)) ==

			    RXON_FLG_TGG_PROTECT_MSK) {

		IWL_WARN(priv, "TGg but no auto-detect\n");

		errors |= BIT(9);

	}



	if (rxon->channel == 0) {

		IWL_WARN(priv, "zero channel is invalid\n");

		errors |= BIT(10);

	}



	WARN(errors, "Invalid RXON (%#x), channel %d",

	     errors, le16_to_cpu(rxon->channel));



	return errors ? -EINVAL : 0;

}



/**

 * iwl_full_rxon_required - check if full RXON (vs RXON_ASSOC) cmd is needed

 * @priv: staging_rxon is compared to active_rxon

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

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

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



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,

			 struct iwl_rxon_context *ctx);