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

Commit 14023641 authored by Abhijeet Kolekar's avatar Abhijeet Kolekar Committed by Reinette Chatre
Browse files

iwl3945: fix internal scan 

Port of internal scan to iwl3945 missed introduction
of iwl3945_get_single_channel_for_scan.

Fix the following bug by introducing the iwl3945_get_single_channel_for_scan
http://bugzilla.intellinuxwireless.org/show_bug.cgi?id=2208



Signed-off-by: default avatarAbhijeet Kolekar <abhijeet.kolekar@intel.com>
Signed-off-by: default avatarReinette Chatre <reinette.chatre@intel.com>
parent a6866ac9

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

+2 −28
Original line number Diff line number Diff line
@@ -1119,10 +1119,9 @@ static int iwl_get_single_channel_for_scan(struct iwl_priv *priv, 
					   struct iwl_scan_channel *scan_ch)

{

	const struct ieee80211_supported_band *sband;

	const struct iwl_channel_info *ch_info;

	u16 passive_dwell = 0;

	u16 active_dwell = 0;

	int i, added = 0;

	int added = 0;

	u16 channel = 0;



	sband = iwl_get_hw_mode(priv, band);
@@ -1137,32 +1136,7 @@ static int iwl_get_single_channel_for_scan(struct iwl_priv *priv, 
	if (passive_dwell <= active_dwell)

		passive_dwell = active_dwell + 1;



	/* only scan single channel, good enough to reset the RF */

	/* pick the first valid not in-use channel */

	if (band == IEEE80211_BAND_5GHZ) {

		for (i = 14; i < priv->channel_count; i++) {

			if (priv->channel_info[i].channel !=

			    le16_to_cpu(priv->staging_rxon.channel)) {

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

				ch_info = iwl_get_channel_info(priv,

					band, channel);

				if (is_channel_valid(ch_info))

					break;

			}

		}

	} else {

		for (i = 0; i < 14; i++) {

			if (priv->channel_info[i].channel !=

			    le16_to_cpu(priv->staging_rxon.channel)) {

					channel =

						priv->channel_info[i].channel;

					ch_info = iwl_get_channel_info(priv,

						band, channel);

					if (is_channel_valid(ch_info))

						break;

			}

		}

	}

	channel = iwl_get_single_channel_number(priv, band);

	if (channel) {

		scan_ch->channel = cpu_to_le16(channel);

		scan_ch->type = SCAN_CHANNEL_TYPE_PASSIVE;

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

+39 −0
Original line number Diff line number Diff line
@@ -854,6 +854,45 @@ void iwl_set_rxon_chain(struct iwl_priv *priv) 
}

EXPORT_SYMBOL(iwl_set_rxon_chain);



/* Return valid channel */

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;



	/* only scan single channel, good enough to reset the RF */

	/* pick the first valid not in-use channel */

	if (band == IEEE80211_BAND_5GHZ) {

		for (i = 14; i < priv->channel_count; i++) {

			if (priv->channel_info[i].channel !=

			    le16_to_cpu(priv->staging_rxon.channel)) {

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

				ch_info = iwl_get_channel_info(priv,

					band, channel);

				if (is_channel_valid(ch_info))

					break;

			}

		}

	} else {

		for (i = 0; i < 14; i++) {

			if (priv->channel_info[i].channel !=

			    le16_to_cpu(priv->staging_rxon.channel)) {

					channel =

						priv->channel_info[i].channel;

					ch_info = iwl_get_channel_info(priv,

						band, channel);

					if (is_channel_valid(ch_info))

						break;

			}

		}

	}



	return channel;

}

EXPORT_SYMBOL(iwl_get_single_channel_number);



/**

 * iwl_set_rxon_channel - Set the phymode and channel values in staging RXON

 * @phymode: MODE_IEEE80211A sets to 5.2GHz; all else set to 2.4GHz

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

+2 −0
Original line number Diff line number Diff line
@@ -343,6 +343,8 @@ int iwl_check_rxon_cmd(struct iwl_priv *priv); 
int iwl_full_rxon_required(struct iwl_priv *priv);

void iwl_set_rxon_chain(struct iwl_priv *priv);

int iwl_set_rxon_channel(struct iwl_priv *priv, struct ieee80211_channel *ch);

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

u8 iwl_is_ht40_tx_allowed(struct iwl_priv *priv,

			 struct ieee80211_sta_ht_cap *sta_ht_inf);

drivers/net/wireless/iwlwifi/iwl3945-base.c

+53 −3
Original line number Diff line number Diff line
@@ -1844,6 +1844,49 @@ static void iwl3945_irq_tasklet(struct iwl_priv *priv) 
#endif

}



static int iwl3945_get_single_channel_for_scan(struct iwl_priv *priv,

					       struct ieee80211_vif *vif,

					       enum ieee80211_band band,

					       struct iwl3945_scan_channel *scan_ch)

{

	const struct ieee80211_supported_band *sband;

	u16 passive_dwell = 0;

	u16 active_dwell = 0;

	int added = 0;

	u8 channel = 0;



	sband = iwl_get_hw_mode(priv, band);

	if (!sband) {

		IWL_ERR(priv, "invalid band\n");

		return added;

	}



	active_dwell = iwl_get_active_dwell_time(priv, band, 0);

	passive_dwell = iwl_get_passive_dwell_time(priv, band, vif);



	if (passive_dwell <= active_dwell)

		passive_dwell = active_dwell + 1;





	channel = iwl_get_single_channel_number(priv, band);



	if (channel) {

		scan_ch->channel = channel;

		scan_ch->type = 0;	/* passive */

		scan_ch->active_dwell = cpu_to_le16(active_dwell);

		scan_ch->passive_dwell = cpu_to_le16(passive_dwell);

		/* Set txpower levels to defaults */

		scan_ch->tpc.dsp_atten = 110;

		if (band == IEEE80211_BAND_5GHZ)

			scan_ch->tpc.tx_gain = ((1 << 5) | (3 << 3)) | 3;

		else

			scan_ch->tpc.tx_gain = ((1 << 5) | (5 << 3));

		added++;

	} else

		IWL_ERR(priv, "no valid channel found\n");

	return added;

}



static int iwl3945_get_channels_for_scan(struct iwl_priv *priv,

					 enum ieee80211_band band,

				     u8 is_active, u8 n_probes,
@@ -2992,9 +3035,16 @@ void iwl3945_request_scan(struct iwl_priv *priv, struct ieee80211_vif *vif) 
	/* select Rx antennas */

	scan->flags |= iwl3945_get_antenna_flags(priv);



	if (priv->is_internal_short_scan) {

		scan->channel_count =

			iwl3945_get_single_channel_for_scan(priv, vif, band,

				(void *)&scan->data[le16_to_cpu(

				scan->tx_cmd.len)]);

	} else {

		scan->channel_count =

			iwl3945_get_channels_for_scan(priv, band, is_active, n_probes,

				(void *)&scan->data[le16_to_cpu(scan->tx_cmd.len)], vif);

	}



	if (scan->channel_count == 0) {

		IWL_DEBUG_SCAN(priv, "channel count %d\n", scan->channel_count);