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

Commit c8b03958 authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by John W. Linville
Browse files

iwlegacy: move rxon commands out of ctx structure 



Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent caf60a6c

drivers/net/wireless/iwlegacy/3945-mac.c

+36 −46
Original line number Diff line number Diff line
@@ -672,15 +672,13 @@ il3945_get_measurement(struct il_priv *il, 
	int rc;

	int spectrum_resp_status;

	int duration = le16_to_cpu(params->duration);

	struct il_rxon_context *ctx = &il->ctx;



	if (il_is_associated(il))

		add_time =

		    il_usecs_to_beacons(il,

					le64_to_cpu(params->start_time) -

					il->_3945.last_tsf,

					le16_to_cpu(ctx->timing.

						    beacon_interval));

					le16_to_cpu(il->timing.beacon_interval));



	memset(&spectrum, 0, sizeof(spectrum));
@@ -694,15 +692,14 @@ il3945_get_measurement(struct il_priv *il, 
	if (il_is_associated(il))

		spectrum.start_time =

		    il_add_beacon_time(il, il->_3945.last_beacon_time, add_time,

				       le16_to_cpu(ctx->timing.

						   beacon_interval));

				       le16_to_cpu(il->timing.beacon_interval));

	else

		spectrum.start_time = 0;



	spectrum.channels[0].duration = cpu_to_le32(duration * TIME_UNIT);

	spectrum.channels[0].channel = params->channel;

	spectrum.channels[0].type = type;

	if (ctx->active.flags & RXON_FLG_BAND_24G_MSK)

	if (il->active.flags & RXON_FLG_BAND_24G_MSK)

		spectrum.flags |=

		    RXON_FLG_BAND_24G_MSK | RXON_FLG_AUTO_DETECT_MSK |

		    RXON_FLG_TGG_PROTECT_MSK;
@@ -2150,7 +2147,6 @@ il3945_alive_start(struct il_priv *il) 
{

	int thermal_spin = 0;

	u32 rfkill;

	struct il_rxon_context *ctx = &il->ctx;



	D_INFO("Runtime Alive received.\n");
@@ -2206,13 +2202,13 @@ il3945_alive_start(struct il_priv *il) 


	if (il_is_associated(il)) {

		struct il3945_rxon_cmd *active_rxon =

		    (struct il3945_rxon_cmd *)(&ctx->active);

		    (struct il3945_rxon_cmd *)(&il->active);



		ctx->staging.filter_flags |= RXON_FILTER_ASSOC_MSK;

		il->staging.filter_flags |= RXON_FILTER_ASSOC_MSK;

		active_rxon->filter_flags &= ~RXON_FILTER_ASSOC_MSK;

	} else {

		/* Initialize our rx_config data */

		il_connection_init_rx_config(il, ctx);

		il_connection_init_rx_config(il, &il->ctx);

	}



	/* Configure Bluetooth device coexistence support */
@@ -2221,7 +2217,7 @@ il3945_alive_start(struct il_priv *il) 
	set_bit(S_READY, &il->status);



	/* Configure the adapter for unassociated operation */

	il3945_commit_rxon(il, ctx);

	il3945_commit_rxon(il, &il->ctx);



	il3945_reg_txpower_periodic(il);
@@ -2670,7 +2666,7 @@ il3945_post_scan(struct il_priv *il) 
	 * Since setting the RXON may have been deferred while

	 * performing the scan, fire one off if needed

	 */

	if (memcmp(&ctx->staging, &ctx->active, sizeof(ctx->staging)))

	if (memcmp(&il->staging, &il->active, sizeof(il->staging)))

		il3945_commit_rxon(il, ctx);

}
@@ -2728,7 +2724,7 @@ il3945_post_associate(struct il_priv *il) 
		return;



	D_ASSOC("Associated as %d to: %pM\n", ctx->vif->bss_conf.aid,

		ctx->active.bssid_addr);

		il->active.bssid_addr);



	if (test_bit(S_EXIT_PENDING, &il->status))

		return;
@@ -2737,30 +2733,30 @@ il3945_post_associate(struct il_priv *il) 


	conf = &il->hw->conf;



	ctx->staging.filter_flags &= ~RXON_FILTER_ASSOC_MSK;

	il->staging.filter_flags &= ~RXON_FILTER_ASSOC_MSK;

	il3945_commit_rxon(il, ctx);



	rc = il_send_rxon_timing(il, ctx);

	if (rc)

		IL_WARN("C_RXON_TIMING failed - " "Attempting to continue.\n");



	ctx->staging.filter_flags |= RXON_FILTER_ASSOC_MSK;

	il->staging.filter_flags |= RXON_FILTER_ASSOC_MSK;



	ctx->staging.assoc_id = cpu_to_le16(ctx->vif->bss_conf.aid);

	il->staging.assoc_id = cpu_to_le16(ctx->vif->bss_conf.aid);



	D_ASSOC("assoc id %d beacon interval %d\n", ctx->vif->bss_conf.aid,

		ctx->vif->bss_conf.beacon_int);



	if (ctx->vif->bss_conf.use_short_preamble)

		ctx->staging.flags |= RXON_FLG_SHORT_PREAMBLE_MSK;

		il->staging.flags |= RXON_FLG_SHORT_PREAMBLE_MSK;

	else

		ctx->staging.flags &= ~RXON_FLG_SHORT_PREAMBLE_MSK;

		il->staging.flags &= ~RXON_FLG_SHORT_PREAMBLE_MSK;



	if (ctx->staging.flags & RXON_FLG_BAND_24G_MSK) {

	if (il->staging.flags & RXON_FLG_BAND_24G_MSK) {

		if (ctx->vif->bss_conf.use_short_slot)

			ctx->staging.flags |= RXON_FLG_SHORT_SLOT_MSK;

			il->staging.flags |= RXON_FLG_SHORT_SLOT_MSK;

		else

			ctx->staging.flags &= ~RXON_FLG_SHORT_SLOT_MSK;

			il->staging.flags &= ~RXON_FLG_SHORT_SLOT_MSK;

	}



	il3945_commit_rxon(il, ctx);
@@ -2902,7 +2898,7 @@ il3945_config_ap(struct il_priv *il) 
	if (!(il_is_associated(il))) {



		/* RXON - unassoc (to set timing command) */

		ctx->staging.filter_flags &= ~RXON_FILTER_ASSOC_MSK;

		il->staging.filter_flags &= ~RXON_FILTER_ASSOC_MSK;

		il3945_commit_rxon(il, ctx);



		/* RXON Timing */
@@ -2911,21 +2907,21 @@ il3945_config_ap(struct il_priv *il) 
			IL_WARN("C_RXON_TIMING failed - "

				"Attempting to continue.\n");



		ctx->staging.assoc_id = 0;

		il->staging.assoc_id = 0;



		if (vif->bss_conf.use_short_preamble)

			ctx->staging.flags |= RXON_FLG_SHORT_PREAMBLE_MSK;

			il->staging.flags |= RXON_FLG_SHORT_PREAMBLE_MSK;

		else

			ctx->staging.flags &= ~RXON_FLG_SHORT_PREAMBLE_MSK;

			il->staging.flags &= ~RXON_FLG_SHORT_PREAMBLE_MSK;



		if (ctx->staging.flags & RXON_FLG_BAND_24G_MSK) {

		if (il->staging.flags & RXON_FLG_BAND_24G_MSK) {

			if (vif->bss_conf.use_short_slot)

				ctx->staging.flags |= RXON_FLG_SHORT_SLOT_MSK;

				il->staging.flags |= RXON_FLG_SHORT_SLOT_MSK;

			else

				ctx->staging.flags &= ~RXON_FLG_SHORT_SLOT_MSK;

				il->staging.flags &= ~RXON_FLG_SHORT_SLOT_MSK;

		}

		/* restore RXON assoc */

		ctx->staging.filter_flags |= RXON_FILTER_ASSOC_MSK;

		il->staging.filter_flags |= RXON_FILTER_ASSOC_MSK;

		il3945_commit_rxon(il, ctx);

	}

	il3945_send_beacon_cmd(il);
@@ -3032,7 +3028,6 @@ il3945_configure_filter(struct ieee80211_hw *hw, unsigned int changed_flags, 
{

	struct il_priv *il = hw->priv;

	__le32 filter_or = 0, filter_nand = 0;

	struct il_rxon_context *ctx = &il->ctx;



#define CHK(test, flag)	do { \

	if (*total_flags & (test))		\
@@ -3052,8 +3047,8 @@ il3945_configure_filter(struct ieee80211_hw *hw, unsigned int changed_flags, 


	mutex_lock(&il->mutex);



	ctx->staging.filter_flags &= ~filter_nand;

	ctx->staging.filter_flags |= filter_or;

	il->staging.filter_flags &= ~filter_nand;

	il->staging.filter_flags |= filter_or;



	/*

	 * Not committing directly because hardware can perform a scan,
@@ -3170,9 +3165,8 @@ static ssize_t 
il3945_show_flags(struct device *d, struct device_attribute *attr, char *buf)

{

	struct il_priv *il = dev_get_drvdata(d);

	struct il_rxon_context *ctx = &il->ctx;



	return sprintf(buf, "0x%04X\n", ctx->active.flags);

	return sprintf(buf, "0x%04X\n", il->active.flags);

}



static ssize_t
@@ -3181,17 +3175,16 @@ il3945_store_flags(struct device *d, struct device_attribute *attr, 
{

	struct il_priv *il = dev_get_drvdata(d);

	u32 flags = simple_strtoul(buf, NULL, 0);

	struct il_rxon_context *ctx = &il->ctx;



	mutex_lock(&il->mutex);

	if (le32_to_cpu(ctx->staging.flags) != flags) {

	if (le32_to_cpu(il->staging.flags) != flags) {

		/* Cancel any currently running scans... */

		if (il_scan_cancel_timeout(il, 100))

			IL_WARN("Could not cancel scan.\n");

		else {

			D_INFO("Committing rxon.flags = 0x%04X\n", flags);

			ctx->staging.flags = cpu_to_le32(flags);

			il3945_commit_rxon(il, ctx);

			il->staging.flags = cpu_to_le32(flags);

			il3945_commit_rxon(il, &il->ctx);

		}

	}

	mutex_unlock(&il->mutex);
@@ -3207,9 +3200,8 @@ il3945_show_filter_flags(struct device *d, struct device_attribute *attr, 
			 char *buf)

{

	struct il_priv *il = dev_get_drvdata(d);

	struct il_rxon_context *ctx = &il->ctx;



	return sprintf(buf, "0x%04X\n", le32_to_cpu(ctx->active.filter_flags));

	return sprintf(buf, "0x%04X\n", le32_to_cpu(il->active.filter_flags));

}



static ssize_t
@@ -3217,19 +3209,18 @@ il3945_store_filter_flags(struct device *d, struct device_attribute *attr, 
			  const char *buf, size_t count)

{

	struct il_priv *il = dev_get_drvdata(d);

	struct il_rxon_context *ctx = &il->ctx;

	u32 filter_flags = simple_strtoul(buf, NULL, 0);



	mutex_lock(&il->mutex);

	if (le32_to_cpu(ctx->staging.filter_flags) != filter_flags) {

	if (le32_to_cpu(il->staging.filter_flags) != filter_flags) {

		/* Cancel any currently running scans... */

		if (il_scan_cancel_timeout(il, 100))

			IL_WARN("Could not cancel scan.\n");

		else {

			D_INFO("Committing rxon.filter_flags = " "0x%04X\n",

			       filter_flags);

			ctx->staging.filter_flags = cpu_to_le32(filter_flags);

			il3945_commit_rxon(il, ctx);

			il->staging.filter_flags = cpu_to_le32(filter_flags);

			il3945_commit_rxon(il, &il->ctx);

		}

	}

	mutex_unlock(&il->mutex);
@@ -3278,9 +3269,8 @@ il3945_store_measurement(struct device *d, struct device_attribute *attr, 
			 const char *buf, size_t count)

{

	struct il_priv *il = dev_get_drvdata(d);

	struct il_rxon_context *ctx = &il->ctx;

	struct ieee80211_measurement_params params = {

		.channel = le16_to_cpu(ctx->active.channel),

		.channel = le16_to_cpu(il->active.channel),

		.start_time = cpu_to_le64(il->_3945.last_tsf),

		.duration = cpu_to_le16(1),

	};

drivers/net/wireless/iwlegacy/3945-rs.c

+1 −1
Original line number Diff line number Diff line
@@ -944,7 +944,7 @@ il3945_rate_scale_init(struct ieee80211_hw *hw, s32 sta_id) 
	switch (il->band) {

	case IEEE80211_BAND_2GHZ:

		/* TODO: this always does G, not a regression */

		if (il->ctx.active.flags & RXON_FLG_TGG_PROTECT_MSK) {

		if (il->active.flags & RXON_FLG_TGG_PROTECT_MSK) {

			rs_sta->tgg = 1;

			rs_sta->expected_tpt = il3945_expected_tpt_g_prot;

		} else

drivers/net/wireless/iwlegacy/3945.c

+11 −11
Original line number Diff line number Diff line
@@ -1388,7 +1388,7 @@ il3945_send_tx_power(struct il_priv *il) 
	int rate_idx, i;

	const struct il_channel_info *ch_info = NULL;

	struct il3945_txpowertable_cmd txpower = {

		.channel = il->ctx.active.channel,

		.channel = il->active.channel,

	};

	u16 chan;
@@ -1397,7 +1397,7 @@ il3945_send_tx_power(struct il_priv *il) 
	     "TX Power requested while scanning!\n"))

		return -EAGAIN;



	chan = le16_to_cpu(il->ctx.active.channel);

	chan = le16_to_cpu(il->active.channel);



	txpower.band = (il->band == IEEE80211_BAND_5GHZ) ? 0 : 1;

	ch_info = il_get_channel_info(il, il->band, chan);
@@ -1673,8 +1673,8 @@ il3945_send_rxon_assoc(struct il_priv *il, struct il_rxon_context *ctx) 
		.flags = CMD_WANT_SKB,

		.data = &rxon_assoc,

	};

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

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

	const struct il_rxon_cmd *rxon1 = &il->staging;

	const struct il_rxon_cmd *rxon2 = &il->active;



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

	    rxon1->filter_flags == rxon2->filter_flags &&
@@ -1684,10 +1684,10 @@ il3945_send_rxon_assoc(struct il_priv *il, struct il_rxon_context *ctx) 
		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.flags = il->staging.flags;

	rxon_assoc.filter_flags = il->staging.filter_flags;

	rxon_assoc.ofdm_basic_rates = il->staging.ofdm_basic_rates;

	rxon_assoc.cck_basic_rates = il->staging.cck_basic_rates;

	rxon_assoc.reserved = 0;



	rc = il_send_cmd_sync(il, &cmd);
@@ -1717,8 +1717,8 @@ int 
il3945_commit_rxon(struct il_priv *il, struct il_rxon_context *ctx)

{

	/* cast away the const for active_rxon in this function */

	struct il3945_rxon_cmd *active_rxon = (void *)&ctx->active;

	struct il3945_rxon_cmd *staging_rxon = (void *)&ctx->staging;

	struct il3945_rxon_cmd *active_rxon = (void *)&il->active;

	struct il3945_rxon_cmd *staging_rxon = (void *)&il->staging;

	int rc = 0;

	bool new_assoc = !!(staging_rxon->filter_flags & RXON_FILTER_ASSOC_MSK);
@@ -1776,7 +1776,7 @@ il3945_commit_rxon(struct il_priv *il, struct il_rxon_context *ctx) 
		active_rxon->reserved4 = 0;

		active_rxon->reserved5 = 0;

		rc = il_send_cmd_pdu(il, C_RXON, sizeof(struct il3945_rxon_cmd),

				     &il->ctx.active);

				     &il->active);



		/* If the mask clearing failed then we set

		 * active_rxon back to what it was previously */

drivers/net/wireless/iwlegacy/4965-calib.c

+2 −4
Original line number Diff line number Diff line
@@ -806,8 +806,6 @@ il4965_chain_noise_calibration(struct il_priv *il, void *stat_resp) 
	unsigned long flags;

	struct stats_rx_non_phy *rx_info;



	struct il_rxon_context *ctx = &il->ctx;



	if (il->disable_chain_noise_cal)

		return;
@@ -833,8 +831,8 @@ il4965_chain_noise_calibration(struct il_priv *il, void *stat_resp) 
		return;

	}



	rxon_band24 = !!(ctx->staging.flags & RXON_FLG_BAND_24G_MSK);

	rxon_chnum = le16_to_cpu(ctx->staging.channel);

	rxon_band24 = !!(il->staging.flags & RXON_FLG_BAND_24G_MSK);

	rxon_chnum = le16_to_cpu(il->staging.channel);



	stat_band24 =

	    !!(((struct il_notif_stats *)stat_resp)->

drivers/net/wireless/iwlegacy/4965-mac.c

+15 −16
Original line number Diff line number Diff line
@@ -926,8 +926,7 @@ il4965_request_scan(struct il_priv *il, struct ieee80211_vif *vif) 
	case IEEE80211_BAND_2GHZ:

		scan->flags = RXON_FLG_BAND_24G_MSK | RXON_FLG_AUTO_DETECT_MSK;

		chan_mod =

		    le32_to_cpu(il->ctx.active.

				flags & RXON_FLG_CHANNEL_MODE_MSK) >>

		    le32_to_cpu(il->active.flags & RXON_FLG_CHANNEL_MODE_MSK) >>

		    RXON_FLG_CHANNEL_MODE_POS;

		if (chan_mod == CHANNEL_MODE_PURE_40) {

			rate = RATE_6M_PLCP;
@@ -1164,14 +1163,14 @@ il4965_set_rxon_chain(struct il_priv *il, struct il_rxon_context *ctx) 
	rx_chain |= active_rx_cnt << RXON_RX_CHAIN_MIMO_CNT_POS;

	rx_chain |= idle_rx_cnt << RXON_RX_CHAIN_CNT_POS;



	ctx->staging.rx_chain = cpu_to_le16(rx_chain);

	il->staging.rx_chain = cpu_to_le16(rx_chain);



	if (!is_single && active_rx_cnt >= IL_NUM_RX_CHAINS_SINGLE && is_cam)

		ctx->staging.rx_chain |= RXON_RX_CHAIN_MIMO_FORCE_MSK;

		il->staging.rx_chain |= RXON_RX_CHAIN_MIMO_FORCE_MSK;

	else

		ctx->staging.rx_chain &= ~RXON_RX_CHAIN_MIMO_FORCE_MSK;

		il->staging.rx_chain &= ~RXON_RX_CHAIN_MIMO_FORCE_MSK;



	D_ASSOC("rx_chain=0x%X active=%d idle=%d\n", ctx->staging.rx_chain,

	D_ASSOC("rx_chain=0x%X active=%d idle=%d\n", il->staging.rx_chain,

		active_rx_cnt, idle_rx_cnt);



	WARN_ON(active_rx_cnt == 0 || idle_rx_cnt == 0 ||
@@ -3378,7 +3377,7 @@ il4965_update_chain_flags(struct il_priv *il) 
{

	if (il->cfg->ops->hcmd->set_rxon_chain) {

		il->cfg->ops->hcmd->set_rxon_chain(il, &il->ctx);

		if (il->ctx.active.rx_chain != il->ctx.staging.rx_chain)

		if (il->active.rx_chain != il->staging.rx_chain)

			il_commit_rxon(il, &il->ctx);

	}

}
@@ -5019,11 +5018,11 @@ il4965_alive_start(struct il_priv *il) 


	il->active_rate = RATES_MASK;



	if (il_is_associated_ctx(ctx)) {

	if (il_is_associated(il)) {

		struct il_rxon_cmd *active_rxon =

		    (struct il_rxon_cmd *)&ctx->active;

		    (struct il_rxon_cmd *)&il->active;

		/* apply any changes in staging */

		ctx->staging.filter_flags |= RXON_FILTER_ASSOC_MSK;

		il->staging.filter_flags |= RXON_FILTER_ASSOC_MSK;

		active_rxon->filter_flags &= ~RXON_FILTER_ASSOC_MSK;

	} else {

		/* Initialize our rx_config data */
@@ -5768,14 +5767,14 @@ il4965_mac_channel_switch(struct ieee80211_hw *hw, 
	    test_bit(S_CHANNEL_SWITCH_PENDING, &il->status))

		goto out;



	if (!il_is_associated_ctx(ctx))

	if (!il_is_associated(il))

		goto out;



	if (!il->cfg->ops->lib->set_channel_switch)

		goto out;



	ch = channel->hw_value;

	if (le16_to_cpu(ctx->active.channel) == ch)

	if (le16_to_cpu(il->active.channel) == ch)

		goto out;



	ch_info = il_get_channel_info(il, channel->band, ch);
@@ -5807,8 +5806,8 @@ il4965_mac_channel_switch(struct ieee80211_hw *hw, 
	} else

		ctx->ht.is_40mhz = false;



	if ((le16_to_cpu(ctx->staging.channel) != ch))

		ctx->staging.flags = 0;

	if ((le16_to_cpu(il->staging.channel) != ch))

		il->staging.flags = 0;



	il_set_rxon_channel(il, channel, ctx);

	il_set_rxon_ht(il, ht_conf);
@@ -5860,8 +5859,8 @@ il4965_configure_filter(struct ieee80211_hw *hw, unsigned int changed_flags, 


	mutex_lock(&il->mutex);



	il->ctx.staging.filter_flags &= ~filter_nand;

	il->ctx.staging.filter_flags |= filter_or;

	il->staging.filter_flags &= ~filter_nand;

	il->staging.filter_flags |= filter_or;



	/*

	 * Not committing directly because hardware can perform a scan,