diff for duplicates of <87fup2eey2.fsf@kamboji.qca.qualcomm.com>

diff --git a/a/1.txt b/N1/1.txt
index 8b2fe62..cb92152 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -13,53 +13,59 @@ greearb@candelatech.com writes:
 >  drivers/net/wireless/ath/ath10k/pci.c   | 2 ++
 >  3 files changed, 5 insertions(+)
 >
-> diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h
+> diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireles=
+s/ath/ath10k/core.h
 > index 6aa7a14..e7c228a 100644
 > --- a/drivers/net/wireless/ath/ath10k/core.h
 > +++ b/drivers/net/wireless/ath/ath10k/core.h
 > @@ -698,6 +698,7 @@ struct ath10k {
->  
+> =20
 >  	enum ath10k_hw_rev hw_rev;
 >  	u16 dev_id;
 > +	bool fw_powerup_failed; /* If true, might take reboot to recover. */
 >  	u32 chip_id;
 >  	u32 target_version;
 >  	u8 fw_version_major;
-> diff --git a/drivers/net/wireless/ath/ath10k/debug.c b/drivers/net/wireless/ath/ath10k/debug.c
+> diff --git a/drivers/net/wireless/ath/ath10k/debug.c b/drivers/net/wirele=
+ss/ath/ath10k/debug.c
 > index 76b5163..05b5ea4 100644
 > --- a/drivers/net/wireless/ath/ath10k/debug.c
 > +++ b/drivers/net/wireless/ath/ath10k/debug.c
-> @@ -1541,6 +1541,7 @@ static const char ath10k_gstrings_stats[][ETH_GSTRING_LEN] = {
+> @@ -1541,6 +1541,7 @@ static const char ath10k_gstrings_stats[][ETH_GSTRI=
+NG_LEN] =3D {
 >  	"d_fw_crash_count",
 >  	"d_fw_warm_reset_count",
 >  	"d_fw_cold_reset_count",
 > +	"d_fw_powerup_failed", /* boolean */
 >  };
->  
+> =20
 >  #define ATH10K_SSTATS_LEN ARRAY_SIZE(ath10k_gstrings_stats)
-> @@ -1640,6 +1641,7 @@ void ath10k_debug_get_et_stats(struct ieee80211_hw *hw,
->  	data[i++] = ar->stats.fw_crash_counter;
->  	data[i++] = ar->stats.fw_warm_reset_counter;
->  	data[i++] = ar->stats.fw_cold_reset_counter;
-> +	data[i++] = ar->fw_powerup_failed;
->  
+> @@ -1640,6 +1641,7 @@ void ath10k_debug_get_et_stats(struct ieee80211_hw =
+*hw,
+>  	data[i++] =3D ar->stats.fw_crash_counter;
+>  	data[i++] =3D ar->stats.fw_warm_reset_counter;
+>  	data[i++] =3D ar->stats.fw_cold_reset_counter;
+> +	data[i++] =3D ar->fw_powerup_failed;
+> =20
 >  	spin_unlock_bh(&ar->data_lock);
->  
-> diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c
+> =20
+> diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless=
+/ath/ath10k/pci.c
 > index dbf0db8..2adc459 100644
 > --- a/drivers/net/wireless/ath/ath10k/pci.c
 > +++ b/drivers/net/wireless/ath/ath10k/pci.c
-> @@ -2709,10 +2709,12 @@ static int ath10k_pci_hif_power_up(struct ath10k *ar)
+> @@ -2709,10 +2709,12 @@ static int ath10k_pci_hif_power_up(struct ath10k =
+*ar)
 >  		goto err_ce;
 >  	}
->  
-> +	ar->fw_powerup_failed = false;
+> =20
+> +	ar->fw_powerup_failed =3D false;
 >  	return 0;
->  
+> =20
 >  err_ce:
 >  	ath10k_pci_ce_deinit(ar);
-> +	ar->fw_powerup_failed = true;
->  
+> +	ar->fw_powerup_failed =3D true;
+> =20
 >  err_sleep:
 >  	return ret;
 
@@ -71,9 +77,5 @@ an error and the interface would stay down. IMHO that's enough of
 indications to the user space, I don't see how providing this boolean
 via ethtool stats is really needed.
 
--- 
-Kalle Valo
-_______________________________________________
-ath10k mailing list
-ath10k@lists.infradead.org
-http://lists.infradead.org/mailman/listinfo/ath10k
+--=20
+Kalle Valo=
diff --git a/a/content_digest b/N1/content_digest
index f4b62bc..5551934 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -4,8 +4,8 @@
  "Subject\0Re: [PATCH v2 11/21] ath10k: add fw-powerup-fail to ethtool stats.\0"
  "Date\0Wed, 14 Sep 2016 14:25:26 +0000\0"
  "To\0greearb@candelatech.com <greearb@candelatech.com>\0"
- "Cc\0linux-wireless@vger.kernel.org <linux-wireless@vger.kernel.org>"
- " ath10k@lists.infradead.org <ath10k@lists.infradead.org>\0"
+ "Cc\0ath10k@lists.infradead.org <ath10k@lists.infradead.org>"
+ " linux-wireless@vger.kernel.org <linux-wireless@vger.kernel.org>\0"
  "\00:1\0"
  "b\0"
  "greearb@candelatech.com writes:\n"
@@ -23,53 +23,59 @@
  ">  drivers/net/wireless/ath/ath10k/pci.c   | 2 ++\n"
  ">  3 files changed, 5 insertions(+)\n"
  ">\n"
- "> diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h\n"
+ "> diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireles=\n"
+ "s/ath/ath10k/core.h\n"
  "> index 6aa7a14..e7c228a 100644\n"
  "> --- a/drivers/net/wireless/ath/ath10k/core.h\n"
  "> +++ b/drivers/net/wireless/ath/ath10k/core.h\n"
  "> @@ -698,6 +698,7 @@ struct ath10k {\n"
- ">  \n"
+ "> =20\n"
  ">  \tenum ath10k_hw_rev hw_rev;\n"
  ">  \tu16 dev_id;\n"
  "> +\tbool fw_powerup_failed; /* If true, might take reboot to recover. */\n"
  ">  \tu32 chip_id;\n"
  ">  \tu32 target_version;\n"
  ">  \tu8 fw_version_major;\n"
- "> diff --git a/drivers/net/wireless/ath/ath10k/debug.c b/drivers/net/wireless/ath/ath10k/debug.c\n"
+ "> diff --git a/drivers/net/wireless/ath/ath10k/debug.c b/drivers/net/wirele=\n"
+ "ss/ath/ath10k/debug.c\n"
  "> index 76b5163..05b5ea4 100644\n"
  "> --- a/drivers/net/wireless/ath/ath10k/debug.c\n"
  "> +++ b/drivers/net/wireless/ath/ath10k/debug.c\n"
- "> @@ -1541,6 +1541,7 @@ static const char ath10k_gstrings_stats[][ETH_GSTRING_LEN] = {\n"
+ "> @@ -1541,6 +1541,7 @@ static const char ath10k_gstrings_stats[][ETH_GSTRI=\n"
+ "NG_LEN] =3D {\n"
  ">  \t\"d_fw_crash_count\",\n"
  ">  \t\"d_fw_warm_reset_count\",\n"
  ">  \t\"d_fw_cold_reset_count\",\n"
  "> +\t\"d_fw_powerup_failed\", /* boolean */\n"
  ">  };\n"
- ">  \n"
+ "> =20\n"
  ">  #define ATH10K_SSTATS_LEN ARRAY_SIZE(ath10k_gstrings_stats)\n"
- "> @@ -1640,6 +1641,7 @@ void ath10k_debug_get_et_stats(struct ieee80211_hw *hw,\n"
- ">  \tdata[i++] = ar->stats.fw_crash_counter;\n"
- ">  \tdata[i++] = ar->stats.fw_warm_reset_counter;\n"
- ">  \tdata[i++] = ar->stats.fw_cold_reset_counter;\n"
- "> +\tdata[i++] = ar->fw_powerup_failed;\n"
- ">  \n"
+ "> @@ -1640,6 +1641,7 @@ void ath10k_debug_get_et_stats(struct ieee80211_hw =\n"
+ "*hw,\n"
+ ">  \tdata[i++] =3D ar->stats.fw_crash_counter;\n"
+ ">  \tdata[i++] =3D ar->stats.fw_warm_reset_counter;\n"
+ ">  \tdata[i++] =3D ar->stats.fw_cold_reset_counter;\n"
+ "> +\tdata[i++] =3D ar->fw_powerup_failed;\n"
+ "> =20\n"
  ">  \tspin_unlock_bh(&ar->data_lock);\n"
- ">  \n"
- "> diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c\n"
+ "> =20\n"
+ "> diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless=\n"
+ "/ath/ath10k/pci.c\n"
  "> index dbf0db8..2adc459 100644\n"
  "> --- a/drivers/net/wireless/ath/ath10k/pci.c\n"
  "> +++ b/drivers/net/wireless/ath/ath10k/pci.c\n"
- "> @@ -2709,10 +2709,12 @@ static int ath10k_pci_hif_power_up(struct ath10k *ar)\n"
+ "> @@ -2709,10 +2709,12 @@ static int ath10k_pci_hif_power_up(struct ath10k =\n"
+ "*ar)\n"
  ">  \t\tgoto err_ce;\n"
  ">  \t}\n"
- ">  \n"
- "> +\tar->fw_powerup_failed = false;\n"
+ "> =20\n"
+ "> +\tar->fw_powerup_failed =3D false;\n"
  ">  \treturn 0;\n"
- ">  \n"
+ "> =20\n"
  ">  err_ce:\n"
  ">  \tath10k_pci_ce_deinit(ar);\n"
- "> +\tar->fw_powerup_failed = true;\n"
- ">  \n"
+ "> +\tar->fw_powerup_failed =3D true;\n"
+ "> =20\n"
  ">  err_sleep:\n"
  ">  \treturn ret;\n"
  "\n"
@@ -81,11 +87,7 @@
  "indications to the user space, I don't see how providing this boolean\n"
  "via ethtool stats is really needed.\n"
  "\n"
- "-- \n"
- "Kalle Valo\n"
- "_______________________________________________\n"
- "ath10k mailing list\n"
- "ath10k@lists.infradead.org\n"
- http://lists.infradead.org/mailman/listinfo/ath10k
+ "--=20\n"
+ Kalle Valo=
 
-3adab91baff98ff7feebf791aa531be449e493a32cd8b8631216386732c879e4
+bbdd6237dea0920c2f407b2ec78538ff31e69333ec9fea50881670a691608f0b
