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

Commit 76c9cc18 authored Feb 17, 2010 by Johannes Berg Committed by Reinette Chatre Mar 09, 2010

iwlwifi: remove alive start adhoc restart



This code will never trigger, because when
we call this during interface start, neither
priv->vif nor priv->iw_mode conditions will
be true, and when it happens during reset
then priv->vif is also NULL. Also, in both
cases the same code will be executed as part
of iwl_bss_info_changed(), which contains a
copy of this code.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>

parent 67d613ae

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

+0 −9

Original line number	Original line	Diff line number	Diff line
	@@ -2144,15 +2144,6 @@ static void iwl_alive_start(struct iwl_priv *priv)

	iwl_power_update_mode(priv, true);		iwl_power_update_mode(priv, true);

	/* reassociate for ADHOC mode */
	if (priv->vif && (priv->iw_mode == NL80211_IFTYPE_ADHOC)) {
	struct sk_buff *beacon = ieee80211_beacon_get(priv->hw,
	priv->vif);
	if (beacon)
	iwl_mac_beacon_update(priv->hw, beacon);
	}


	if (test_and_clear_bit(STATUS_MODE_PENDING, &priv->status))		if (test_and_clear_bit(STATUS_MODE_PENDING, &priv->status))
	iwl_set_mode(priv, priv->iw_mode);		iwl_set_mode(priv, priv->iw_mode);

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

+0 −8

Original line number	Original line	Diff line number	Diff line
	@@ -2537,14 +2537,6 @@ static void iwl3945_alive_start(struct iwl_priv *priv)
	set_bit(STATUS_READY, &priv->status);		set_bit(STATUS_READY, &priv->status);
	wake_up_interruptible(&priv->wait_command_queue);		wake_up_interruptible(&priv->wait_command_queue);

	/* reassociate for ADHOC mode */
	if (priv->vif && (priv->iw_mode == NL80211_IFTYPE_ADHOC)) {
	struct sk_buff *beacon = ieee80211_beacon_get(priv->hw,
	priv->vif);
	if (beacon)
	iwl_mac_beacon_update(priv->hw, beacon);
	}

	if (test_and_clear_bit(STATUS_MODE_PENDING, &priv->status))		if (test_and_clear_bit(STATUS_MODE_PENDING, &priv->status))
	iwl_set_mode(priv, priv->iw_mode);		iwl_set_mode(priv, priv->iw_mode);