Commit a8e82c36 authored by Johannes Berg's avatar Johannes Berg Committed by Luca Coelho
Browse files

iwlwifi: pcie: remove some dead code 



We can never get into this code with a gen2/3 device, and therefore
don't need to allocate the byte count tables in a single contiguous
DMA region. Just WARN and bail out if something is misconfigured.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20200425130140.a748d33252ef.If2f5810016efb40b041f93fe8c6b4c251542e2f1@changeid
parent 281277b2

drivers/net/wireless/intel/iwlwifi/pcie/tx.c

+6 −6
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 
 * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH

 * Copyright(c) 2016 - 2017 Intel Deutschland GmbH

 * Copyright(c) 2018 - 2019 Intel Corporation

 * Copyright(c) 2018 - 2020 Intel Corporation

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms of version 2 of the GNU General Public License as
@@ -31,7 +31,7 @@ 
 * Copyright(c) 2003 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH

 * Copyright(c) 2016 - 2017 Intel Deutschland GmbH

 * Copyright(c) 2018 - 2019 Intel Corporation

 * Copyright(c) 2018 - 2020 Intel Corporation

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -954,10 +954,10 @@ static int iwl_pcie_tx_alloc(struct iwl_trans *trans) 
	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);

	u16 bc_tbls_size = trans->trans_cfg->base_params->num_of_queues;



	bc_tbls_size *= (trans->trans_cfg->device_family >=

			 IWL_DEVICE_FAMILY_AX210) ?

		sizeof(struct iwl_gen3_bc_tbl) :

		sizeof(struct iwlagn_scd_bc_tbl);

	if (WARN_ON(trans->trans_cfg->device_family >= IWL_DEVICE_FAMILY_AX210))

		return -EINVAL;



	bc_tbls_size *= sizeof(struct iwlagn_scd_bc_tbl);



	/*It is not allowed to alloc twice, so warn when this happens.

	 * We cannot rely on the previous allocation, so free and fail */

CRA Git | Maintained and supported by SUSTech CRA and CCSE