diff mbox series

[v2] iwlwifi: dbg_ini: fix bad ini tlv parsing

Message ID 20181219093619.9867-1-emmanuel.grumbach@intel.com (mailing list archive)
State Accepted
Commit 19de2fa86e692e918eade4042989d7725039df89
Delegated to: Kalle Valo
Headers show
Series [v2] iwlwifi: dbg_ini: fix bad ini tlv parsing | expand

Commit Message

Emmanuel Grumbach Dec. 19, 2018, 9:36 a.m. UTC 
From: Shahar S Matityahu <shahar.s.matityahu@intel.com>

Add a break at the end of the ini tlv case.
Fix both the internal and external tlv parsing.

Signed-off-by: Shahar S Matityahu <shahar.s.matityahu@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
---
v2: remove our internal tags
---
 drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c | 1 +
 drivers/net/wireless/intel/iwlwifi/iwl-drv.c     | 1 +
 2 files changed, 2 insertions(+)

Comments

Kalle Valo Dec. 19, 2018, 12:39 p.m. UTC | #1 
Emmanuel Grumbach <emmanuel.grumbach@intel.com> writes:

> From: Shahar S Matityahu <shahar.s.matityahu@intel.com>
>
> Add a break at the end of the ini tlv case.
> Fix both the internal and external tlv parsing.
>
> Signed-off-by: Shahar S Matityahu <shahar.s.matityahu@intel.com>
> Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>

Thanks, I'll apply this directly to wireless-drivers-next.
Kalle Valo Dec. 20, 2018, 7:16 a.m. UTC | #2 
Emmanuel Grumbach <emmanuel.grumbach@intel.com> wrote:

> From: Shahar S Matityahu <shahar.s.matityahu@intel.com>
> 
> Add a break at the end of the ini tlv case.
> Fix both the internal and external tlv parsing.
> 
> Signed-off-by: Shahar S Matityahu <shahar.s.matityahu@intel.com>
> Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>

Patch applied to wireless-drivers-next.git, thanks.

19de2fa86e69 iwlwifi: dbg_ini: fix bad ini tlv parsing
diff mbox series

Patch

diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c b/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c
index bc1e4d4bb42d..43d815cb3ce9 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c
@@ -201,6 +201,7 @@  static int iwl_parse_fw_dbg_tlv(struct iwl_trans *trans, const u8 *data,
 		case IWL_UCODE_TLV_TYPE_TRIGGERS:
 		case IWL_UCODE_TLV_TYPE_DEBUG_FLOW:
 			iwl_fw_dbg_copy_tlv(trans, tlv, true);
+			break;
 		default:
 			WARN_ONCE(1, "Invalid TLV %x\n", tlv_type);
 			break;
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
index a65ba955783d..bf1be985f36b 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
@@ -1097,6 +1097,7 @@  static int iwl_parse_tlv_firmware(struct iwl_drv *drv,
 		case IWL_UCODE_TLV_TYPE_DEBUG_FLOW:
 			if (iwlwifi_mod_params.enable_ini)
 				iwl_fw_dbg_copy_tlv(drv->trans, tlv, false);
+			break;
 		default:
 			IWL_DEBUG_INFO(drv, "unknown TLV: %d\n", tlv_type);
 			break;