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

Commit 25b9ea5c authored Mar 06, 2013 by Emmanuel Grumbach Committed by Johannes Berg Mar 06, 2013

iwlwifi: mvm: the SCD byte count is a TLV flag



The SCD byte count layout is decided by the configuration
done in fw, it is then logical to export it as a TLV flag
and not per HW SKU.

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent f9477c17

drivers/net/wireless/iwlwifi/iwl-fw.h

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -73,12 +73,14 @@
	* treats good CRC threshold as a boolean		* treats good CRC threshold as a boolean
	* @IWL_UCODE_TLV_FLAGS_MFP: This uCode image supports MFP (802.11w).		* @IWL_UCODE_TLV_FLAGS_MFP: This uCode image supports MFP (802.11w).
	* @IWL_UCODE_TLV_FLAGS_P2P: This uCode image supports P2P.		* @IWL_UCODE_TLV_FLAGS_P2P: This uCode image supports P2P.
			* @IWL_UCODE_TLV_FLAGS_DW_BC_TABLE: The SCD byte count table is in DWORDS
	*/		*/
	enum iwl_ucode_tlv_flag {		enum iwl_ucode_tlv_flag {
	IWL_UCODE_TLV_FLAGS_PAN = BIT(0),		IWL_UCODE_TLV_FLAGS_PAN = BIT(0),
	IWL_UCODE_TLV_FLAGS_NEWSCAN = BIT(1),		IWL_UCODE_TLV_FLAGS_NEWSCAN = BIT(1),
	IWL_UCODE_TLV_FLAGS_MFP = BIT(2),		IWL_UCODE_TLV_FLAGS_MFP = BIT(2),
	IWL_UCODE_TLV_FLAGS_P2P = BIT(3),		IWL_UCODE_TLV_FLAGS_P2P = BIT(3),
			IWL_UCODE_TLV_FLAGS_DW_BC_TABLE = BIT(4),
	};		};

	/* The default calibrate table size if not specified by firmware file */		/* The default calibrate table size if not specified by firmware file */

drivers/net/wireless/iwlwifi/mvm/ops.c

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -370,8 +370,7 @@ iwl_op_mode_mvm_start(struct iwl_trans trans, const struct iwl_cfg cfg,
	trans_cfg.n_no_reclaim_cmds = ARRAY_SIZE(no_reclaim_cmds);		trans_cfg.n_no_reclaim_cmds = ARRAY_SIZE(no_reclaim_cmds);
	trans_cfg.rx_buf_size_8k = iwlwifi_mod_params.amsdu_size_8K;		trans_cfg.rx_buf_size_8k = iwlwifi_mod_params.amsdu_size_8K;

	/* TODO: this should really be a TLV */		if (mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_DW_BC_TABLE)
	if (cfg->device_family == IWL_DEVICE_FAMILY_7000)
	trans_cfg.bc_table_dword = true;		trans_cfg.bc_table_dword = true;

	if (!iwlwifi_mod_params.wd_disable)		if (!iwlwifi_mod_params.wd_disable)