linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] iwlwifi: dbg_ini: fix bad ini tlv parsing
@ 2018-12-19  9:29 Emmanuel Grumbach
  2018-12-19  9:36 ` [PATCH v2] " Emmanuel Grumbach
  0 siblings, 1 reply; 4+ messages in thread
From: Emmanuel Grumbach @ 2018-12-19  9:29 UTC (permalink / raw)
  To: linux-wireless; +Cc: sara.sharon, sfr, kvalo, Shahar S Matityahu

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.

type=bugfix
ticket=none
fixes=I76eba109fa3d0ff5cbda3da850ff7c2c5f895cce
fixes=Ibd8d7bc971d83f6aed5b73118ebdc6243a636a4e

Change-Id: Ic4f681055bad81e72acafa12f81d5ba3f1afeb11
Signed-off-by: Shahar S Matityahu <shahar.s.matityahu@intel.com>
Reviewed-on: https://git-amr-3.devtools.intel.com/gerrit/199704
automatic-review: ec ger unix iil jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM>
Tested-by: ec ger unix iil jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM>
Reviewed-by: Coelho, Luciano <luciano.coelho@intel.com>
---
 drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c | 1 +
 drivers/net/wireless/intel/iwlwifi/iwl-drv.c     | 1 +
 2 files changed, 2 insertions(+)

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;
-- 
2.14.4


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [PATCH v2] iwlwifi: dbg_ini: fix bad ini tlv parsing
  2018-12-19  9:29 [PATCH] iwlwifi: dbg_ini: fix bad ini tlv parsing Emmanuel Grumbach
@ 2018-12-19  9:36 ` Emmanuel Grumbach
  2018-12-19 12:39   ` Kalle Valo
  2018-12-20  7:16   ` Kalle Valo
  0 siblings, 2 replies; 4+ messages in thread
From: Emmanuel Grumbach @ 2018-12-19  9:36 UTC (permalink / raw)
  To: linux-wireless
  Cc: sara.sharon, sfr, kvalo, Shahar S Matityahu, Emmanuel Grumbach

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(+)

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;
-- 
2.14.4


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* Re: [PATCH v2] iwlwifi: dbg_ini: fix bad ini tlv parsing
  2018-12-19  9:36 ` [PATCH v2] " Emmanuel Grumbach
@ 2018-12-19 12:39   ` Kalle Valo
  2018-12-20  7:16   ` Kalle Valo
  1 sibling, 0 replies; 4+ messages in thread
From: Kalle Valo @ 2018-12-19 12:39 UTC (permalink / raw)
  To: Emmanuel Grumbach; +Cc: linux-wireless, sara.sharon, sfr, Shahar S Matityahu

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

^ permalink raw reply	[flat|nested] 4+ messages in thread
* Re: [PATCH v2] iwlwifi: dbg_ini: fix bad ini tlv parsing
  2018-12-19  9:36 ` [PATCH v2] " Emmanuel Grumbach
  2018-12-19 12:39   ` Kalle Valo
@ 2018-12-20  7:16   ` Kalle Valo
  1 sibling, 0 replies; 4+ messages in thread
From: Kalle Valo @ 2018-12-20  7:16 UTC (permalink / raw)
  To: Emmanuel Grumbach
  Cc: linux-wireless, sara.sharon, sfr, Shahar S Matityahu, Emmanuel Grumbach

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

-- 
https://patchwork.kernel.org/patch/10736967/

https://wireless.wiki.kernel.org/en/developers/documentation/submittingpatches


^ permalink raw reply	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-12-20  7:16 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-12-19  9:29 [PATCH] iwlwifi: dbg_ini: fix bad ini tlv parsing Emmanuel Grumbach
2018-12-19  9:36 ` [PATCH v2] " Emmanuel Grumbach
2018-12-19 12:39   ` Kalle Valo
2018-12-20  7:16   ` Kalle Valo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).