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

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

iwlwifi: move iwl_get_single_channel_number and mark it static 



iwl_get_single_channel_number is used only in
iwl-scan.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 55620921

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

+0 −40
Original line number Diff line number Diff line
@@ -162,46 +162,6 @@ void iwl_set_rxon_ht(struct iwl_priv *priv, struct iwl_ht_config *ht_conf) 
		_iwl_set_rxon_ht(priv, ht_conf, ctx);

}



/* Return valid, unused, channel for a passive scan to reset the RF */

u8 iwl_get_single_channel_number(struct iwl_priv *priv,

				 enum ieee80211_band band)

{

	const struct iwl_channel_info *ch_info;

	int i;

	u8 channel = 0;

	u8 min, max;

	struct iwl_rxon_context *ctx;



	if (band == IEEE80211_BAND_5GHZ) {

		min = 14;

		max = priv->channel_count;

	} else {

		min = 0;

		max = 14;

	}



	for (i = min; i < max; i++) {

		bool busy = false;



		for_each_context(priv, ctx) {

			busy = priv->channel_info[i].channel ==

				le16_to_cpu(ctx->staging.channel);

			if (busy)

				break;

		}



		if (busy)

			continue;



		channel = priv->channel_info[i].channel;

		ch_info = iwl_get_channel_info(priv, band, channel);

		if (is_channel_valid(ch_info))

			break;

	}



	return channel;

}



/**

 * 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 −2
Original line number Diff line number Diff line
@@ -99,8 +99,6 @@ void iwl_set_flags_for_band(struct iwl_priv *priv, 
			    struct iwl_rxon_context *ctx,

			    enum ieee80211_band band,

			    struct ieee80211_vif *vif);

u8 iwl_get_single_channel_number(struct iwl_priv *priv,

				  enum ieee80211_band band);

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

bool iwl_is_ht40_tx_allowed(struct iwl_priv *priv,

			    struct iwl_rxon_context *ctx,

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

+40 −0
Original line number Diff line number Diff line
@@ -451,6 +451,46 @@ static u16 iwl_get_passive_dwell_time(struct iwl_priv *priv, 
	return iwl_limit_dwell(priv, passive);

}



/* Return valid, unused, channel for a passive scan to reset the RF */

static u8 iwl_get_single_channel_number(struct iwl_priv *priv,

				 enum ieee80211_band band)

{

	const struct iwl_channel_info *ch_info;

	int i;

	u8 channel = 0;

	u8 min, max;

	struct iwl_rxon_context *ctx;



	if (band == IEEE80211_BAND_5GHZ) {

		min = 14;

		max = priv->channel_count;

	} else {

		min = 0;

		max = 14;

	}



	for (i = min; i < max; i++) {

		bool busy = false;



		for_each_context(priv, ctx) {

			busy = priv->channel_info[i].channel ==

				le16_to_cpu(ctx->staging.channel);

			if (busy)

				break;

		}



		if (busy)

			continue;



		channel = priv->channel_info[i].channel;

		ch_info = iwl_get_channel_info(priv, band, channel);

		if (is_channel_valid(ch_info))

			break;

	}



	return channel;

}



static int iwl_get_single_channel_for_scan(struct iwl_priv *priv,

					   struct ieee80211_vif *vif,

					   enum ieee80211_band band,