Commit df29ff37 authored May 22, 2009 by Reinette Chatre Committed by John W. Linville Jun 03, 2009

iwlwifi: fix merge error

This hunk of code was removed in patch "iwlwifi: do not
cancel delayed work inside spin_lock_irqsave" submitted at
http://marc.info/?l=linux-wireless&m=124267503030042&w=2



This same patch in this repo does not remove this hunk.
Remove it here.

Signed-off-by: Reinette Chatre <reinette.chatre@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent ce2ebc9b

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

+0 −7

Original line number	Diff line number	Diff line
		@@ -2685,13 +2685,6 @@ int iwl_set_mode(struct iwl_priv *priv, int mode)
		if (!iwl_is_ready_rf(priv))
		return -EAGAIN;

		cancel_delayed_work(&priv->scan_check);
		if (iwl_scan_cancel_timeout(priv, 100)) {
		IWL_WARN(priv, "Aborted scan still in progress after 100ms\n");
		IWL_DEBUG_MAC80211(priv, "leaving - scan abort failed.\n");
		return -EAGAIN;
		}

		iwlcore_commit_rxon(priv);

		return 0;

Admin message