Merge branch 'master' of... (e23535ca) · Commits · e / devices / android_kernel_teracube_emerald

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

+5 −7

Original line number	Original line	Diff line number	Diff line
	@@ -1218,10 +1218,10 @@ static int iwl4965_commit_rxon(struct iwl_priv priv, struct iwl_rxon_context c
	* receive commit_rxon request		* receive commit_rxon request
	* abort any previous channel switch if still in process		* abort any previous channel switch if still in process
	*/		*/
	if (priv->switch_rxon.switch_in_progress &&		if (test_bit(STATUS_CHANNEL_SWITCH_PENDING, &priv->status) &&
	(priv->switch_rxon.channel != ctx->staging.channel)) {		(priv->switch_channel != ctx->staging.channel)) {
	IWL_DEBUG_11H(priv, "abort channel switch on %d\n",		IWL_DEBUG_11H(priv, "abort channel switch on %d\n",
	le16_to_cpu(priv->switch_rxon.channel));		le16_to_cpu(priv->switch_channel));
	iwl_legacy_chswitch_done(priv, false);		iwl_legacy_chswitch_done(priv, false);
	}		}

	@@ -1237,7 +1237,7 @@ static int iwl4965_commit_rxon(struct iwl_priv priv, struct iwl_rxon_context c

	memcpy(active_rxon, &ctx->staging, sizeof(*active_rxon));		memcpy(active_rxon, &ctx->staging, sizeof(*active_rxon));
	iwl_legacy_print_rx_config_cmd(priv, ctx);		iwl_legacy_print_rx_config_cmd(priv, ctx);
	return 0;		goto set_tx_power;
	}		}

	/* If we are currently associated and the new config requires		/* If we are currently associated and the new config requires
	@@ -1317,6 +1317,7 @@ static int iwl4965_commit_rxon(struct iwl_priv priv, struct iwl_rxon_context c

	iwl4965_init_sensitivity(priv);		iwl4965_init_sensitivity(priv);

			set_tx_power:
	/* If we issue a new RXON command which required a tune then we must		/* If we issue a new RXON command which required a tune then we must
	* send a new TXPOWER command or we won't be able to Tx any frames */		* send a new TXPOWER command or we won't be able to Tx any frames */
	ret = iwl_legacy_set_tx_power(priv, priv->tx_power_next, true);		ret = iwl_legacy_set_tx_power(priv, priv->tx_power_next, true);
	@@ -1403,9 +1404,6 @@ static int iwl4965_hw_channel_switch(struct iwl_priv *priv,
	return rc;		return rc;
	}		}

	priv->switch_rxon.channel = cmd.channel;
	priv->switch_rxon.switch_in_progress = true;

	return iwl_legacy_send_cmd_pdu(priv,		return iwl_legacy_send_cmd_pdu(priv,
	REPLY_CHANNEL_SWITCH, sizeof(cmd), &cmd);		REPLY_CHANNEL_SWITCH, sizeof(cmd), &cmd);
	}		}

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

+13 −17

Original line number	Original line	Diff line number	Diff line
	@@ -859,12 +859,8 @@ void iwl_legacy_chswitch_done(struct iwl_priv *priv, bool is_success)
	if (test_bit(STATUS_EXIT_PENDING, &priv->status))		if (test_bit(STATUS_EXIT_PENDING, &priv->status))
	return;		return;

	if (priv->switch_rxon.switch_in_progress) {		if (test_and_clear_bit(STATUS_CHANNEL_SWITCH_PENDING, &priv->status))
	ieee80211_chswitch_done(ctx->vif, is_success);		ieee80211_chswitch_done(ctx->vif, is_success);
	mutex_lock(&priv->mutex);
	priv->switch_rxon.switch_in_progress = false;
	mutex_unlock(&priv->mutex);
	}
	}		}
	EXPORT_SYMBOL(iwl_legacy_chswitch_done);		EXPORT_SYMBOL(iwl_legacy_chswitch_done);

	@@ -876,9 +872,10 @@ void iwl_legacy_rx_csa(struct iwl_priv priv, struct iwl_rx_mem_buffer rxb)
	struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];		struct iwl_rxon_context *ctx = &priv->contexts[IWL_RXON_CTX_BSS];
	struct iwl_legacy_rxon_cmd rxon = (void )&ctx->active;		struct iwl_legacy_rxon_cmd rxon = (void )&ctx->active;

	if (priv->switch_rxon.switch_in_progress) {		if (!test_bit(STATUS_CHANNEL_SWITCH_PENDING, &priv->status))
	if (!le32_to_cpu(csa->status) &&		return;
	(csa->channel == priv->switch_rxon.channel)) {
			if (!le32_to_cpu(csa->status) && csa->channel == priv->switch_channel) {
	rxon->channel = csa->channel;		rxon->channel = csa->channel;
	ctx->staging.channel = csa->channel;		ctx->staging.channel = csa->channel;
	IWL_DEBUG_11H(priv, "CSA notif: channel %d\n",		IWL_DEBUG_11H(priv, "CSA notif: channel %d\n",
	@@ -890,7 +887,6 @@ void iwl_legacy_rx_csa(struct iwl_priv priv, struct iwl_rx_mem_buffer rxb)
	iwl_legacy_chswitch_done(priv, false);		iwl_legacy_chswitch_done(priv, false);
	}		}
	}		}
	}
	EXPORT_SYMBOL(iwl_legacy_rx_csa);		EXPORT_SYMBOL(iwl_legacy_rx_csa);

	#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG		#ifdef CONFIG_IWLWIFI_LEGACY_DEBUG

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -560,7 +560,7 @@ void iwl_legacy_free_geos(struct iwl_priv *priv);
	#define STATUS_SCAN_HW 15		#define STATUS_SCAN_HW 15
	#define STATUS_POWER_PMI 16		#define STATUS_POWER_PMI 16
	#define STATUS_FW_ERROR 17		#define STATUS_FW_ERROR 17
			#define STATUS_CHANNEL_SWITCH_PENDING 18

	static inline int iwl_legacy_is_ready(struct iwl_priv *priv)		static inline int iwl_legacy_is_ready(struct iwl_priv *priv)
	{		{

drivers/net/wireless/iwlegacy/iwl-dev.h

+1 −12

Original line number	Original line	Diff line number	Diff line
	@@ -854,17 +854,6 @@ struct traffic_stats {
	#endif		#endif
	};		};

	/*
	* iwl_switch_rxon: "channel switch" structure
	*
	* @ switch_in_progress: channel switch in progress
	* @ channel: new channel
	*/
	struct iwl_switch_rxon {
	bool switch_in_progress;
	__le16 channel;
	};

	/*		/*
	* schedule the timer to wake up every UCODE_TRACE_PERIOD milliseconds		* schedule the timer to wake up every UCODE_TRACE_PERIOD milliseconds
	* to perform continuous uCode event logging operation if enabled		* to perform continuous uCode event logging operation if enabled
	@@ -1115,7 +1104,7 @@ struct iwl_priv {

	struct iwl_rxon_context contexts[NUM_IWL_RXON_CTX];		struct iwl_rxon_context contexts[NUM_IWL_RXON_CTX];

	struct iwl_switch_rxon switch_rxon;		__le16 switch_channel;

	/* 1st responses from initialize and runtime uCode images.		/* 1st responses from initialize and runtime uCode images.
	* _4965's initialize alive response contains some calibration data. */		* _4965's initialize alive response contains some calibration data. */

drivers/net/wireless/iwlegacy/iwl4965-base.c

+10 −10

Original line number	Original line	Diff line number	Diff line
	@@ -2861,16 +2861,13 @@ void iwl4965_mac_channel_switch(struct ieee80211_hw *hw,
	goto out;		goto out;

	if (test_bit(STATUS_EXIT_PENDING, &priv->status) \|\|		if (test_bit(STATUS_EXIT_PENDING, &priv->status) \|\|
	test_bit(STATUS_SCANNING, &priv->status))		test_bit(STATUS_SCANNING, &priv->status) \|\|
			test_bit(STATUS_CHANNEL_SWITCH_PENDING, &priv->status))
	goto out;		goto out;

	if (!iwl_legacy_is_associated_ctx(ctx))		if (!iwl_legacy_is_associated_ctx(ctx))
	goto out;		goto out;

	/* channel switch in progress */
	if (priv->switch_rxon.switch_in_progress == true)
	goto out;

	if (priv->cfg->ops->lib->set_channel_switch) {		if (priv->cfg->ops->lib->set_channel_switch) {

	ch = channel->hw_value;		ch = channel->hw_value;
	@@ -2919,15 +2916,18 @@ void iwl4965_mac_channel_switch(struct ieee80211_hw *hw,
	* at this point, staging_rxon has the		* at this point, staging_rxon has the
	* configuration for channel switch		* configuration for channel switch
	*/		*/
	if (priv->cfg->ops->lib->set_channel_switch(priv,		set_bit(STATUS_CHANNEL_SWITCH_PENDING, &priv->status);
	ch_switch))		priv->switch_channel = cpu_to_le16(ch);
	priv->switch_rxon.switch_in_progress = false;		if (priv->cfg->ops->lib->set_channel_switch(priv, ch_switch)) {
			clear_bit(STATUS_CHANNEL_SWITCH_PENDING,
			&priv->status);
			priv->switch_channel = 0;
			ieee80211_chswitch_done(ctx->vif, false);
			}
	}		}
	}		}
	out:		out:
	mutex_unlock(&priv->mutex);		mutex_unlock(&priv->mutex);
	if (!priv->switch_rxon.switch_in_progress)
	ieee80211_chswitch_done(ctx->vif, false);
	IWL_DEBUG_MAC80211(priv, "leave\n");		IWL_DEBUG_MAC80211(priv, "leave\n");
	}		}