Commit 496bab39 authored Mar 06, 2012 by Johannes Berg Committed by John W. Linville Mar 07, 2012

iwlwifi: remove AMT check from transport



As iwl_prepare_card_hw() is idempotent (and
many cards support AMT anyway) there's no
point in calling iwl_prepare_card_hw() only
for AMT capable devices -- call it always
and simplify the code that way.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Wey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent 3995deaf

drivers/net/wireless/iwlwifi/iwl-trans-pcie.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1033,8 +1033,8 @@ static int iwl_trans_pcie_start_fw(struct iwl_trans *trans,
		trans_pcie->mcast_queue[IWL_RXON_CTX_BSS] = 0;
		trans_pcie->mcast_queue[IWL_RXON_CTX_PAN] = IWL_IPAN_MCAST_QUEUE;

		if ((hw_params(trans).sku & EEPROM_SKU_CAP_AMT_ENABLE) &&
		iwl_prepare_card_hw(trans)) {
		/* This may fail if AMT took ownership of the device */
		if (iwl_prepare_card_hw(trans)) {
		IWL_WARN(trans, "Exit HW not ready\n");
		return -EIO;
		}