diff for duplicates of <877faeeedm.fsf@kamboji.qca.qualcomm.com>

diff --git a/a/1.txt b/N1/1.txt
index 663de32..2f5fde0 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -9,38 +9,36 @@ greearb@candelatech.com writes:
 >  drivers/net/wireless/ath/ath10k/mac.c | 5 +++++
 >  1 file changed, 5 insertions(+)
 >
-> diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
+> diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless=
+/ath/ath10k/mac.c
 > index f1bfb3a..3fc9006 100644
 > --- a/drivers/net/wireless/ath/ath10k/mac.c
 > +++ b/drivers/net/wireless/ath/ath10k/mac.c
-> @@ -7482,6 +7482,10 @@ static const struct ieee80211_iface_limit ath10k_10x_ct_if_limits[] = {
->  	.max	= 7,
->  	.types	= BIT(NL80211_IFTYPE_AP)
+> @@ -7482,6 +7482,10 @@ static const struct ieee80211_iface_limit ath10k_1=
+0x_ct_if_limits[] =3D {
+>  	.max	=3D 7,
+>  	.types	=3D BIT(NL80211_IFTYPE_AP)
 >  	},
 > +	{
-> +	.max	= 1,
-> +	.types	= BIT(NL80211_IFTYPE_ADHOC)
+> +	.max	=3D 1,
+> +	.types	=3D BIT(NL80211_IFTYPE_ADHOC)
 > +	},
 >  };
->  
->  static const struct ieee80211_iface_combination ath10k_if_comb[] = {
+> =20
+>  static const struct ieee80211_iface_combination ath10k_if_comb[] =3D {
 > @@ -7862,6 +7866,7 @@ int ath10k_mac_register(struct ath10k *ar)
->  			ar->hw->wiphy->iface_combinations = ath10k_10x_ct_if_comb;
->  			ar->hw->wiphy->n_iface_combinations =
+>  			ar->hw->wiphy->iface_combinations =3D ath10k_10x_ct_if_comb;
+>  			ar->hw->wiphy->n_iface_combinations =3D
 >  				ARRAY_SIZE(ath10k_10x_ct_if_comb);
-> +			ar->hw->wiphy->interface_modes |= BIT(NL80211_IFTYPE_ADHOC);
+> +			ar->hw->wiphy->interface_modes |=3D BIT(NL80211_IFTYPE_ADHOC);
 >  		} else {
->  			ar->hw->wiphy->iface_combinations = ath10k_10x_if_comb;
->  			ar->hw->wiphy->n_iface_combinations =
+>  			ar->hw->wiphy->iface_combinations =3D ath10k_10x_if_comb;
+>  			ar->hw->wiphy->n_iface_combinations =3D
 
 There should a feature flag ATH10K_FW_FEATURE_SUPPORTS_ADHOC and we use
 that flag as an indication to enable the mode. I wish we had done that
 from the beginning, using wmi_op_version to guess that just creates
 problems :(
 
--- 
-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 01072f1..24e83af 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -4,8 +4,8 @@
  "Subject\0Re: [PATCH v2 19/21] ath10k: Enable adhoc mode for CT firmware.\0"
  "Date\0Wed, 14 Sep 2016 14:37:42 +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"
@@ -19,40 +19,38 @@
  ">  drivers/net/wireless/ath/ath10k/mac.c | 5 +++++\n"
  ">  1 file changed, 5 insertions(+)\n"
  ">\n"
- "> diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c\n"
+ "> diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless=\n"
+ "/ath/ath10k/mac.c\n"
  "> index f1bfb3a..3fc9006 100644\n"
  "> --- a/drivers/net/wireless/ath/ath10k/mac.c\n"
  "> +++ b/drivers/net/wireless/ath/ath10k/mac.c\n"
- "> @@ -7482,6 +7482,10 @@ static const struct ieee80211_iface_limit ath10k_10x_ct_if_limits[] = {\n"
- ">  \t.max\t= 7,\n"
- ">  \t.types\t= BIT(NL80211_IFTYPE_AP)\n"
+ "> @@ -7482,6 +7482,10 @@ static const struct ieee80211_iface_limit ath10k_1=\n"
+ "0x_ct_if_limits[] =3D {\n"
+ ">  \t.max\t=3D 7,\n"
+ ">  \t.types\t=3D BIT(NL80211_IFTYPE_AP)\n"
  ">  \t},\n"
  "> +\t{\n"
- "> +\t.max\t= 1,\n"
- "> +\t.types\t= BIT(NL80211_IFTYPE_ADHOC)\n"
+ "> +\t.max\t=3D 1,\n"
+ "> +\t.types\t=3D BIT(NL80211_IFTYPE_ADHOC)\n"
  "> +\t},\n"
  ">  };\n"
- ">  \n"
- ">  static const struct ieee80211_iface_combination ath10k_if_comb[] = {\n"
+ "> =20\n"
+ ">  static const struct ieee80211_iface_combination ath10k_if_comb[] =3D {\n"
  "> @@ -7862,6 +7866,7 @@ int ath10k_mac_register(struct ath10k *ar)\n"
- ">  \t\t\tar->hw->wiphy->iface_combinations = ath10k_10x_ct_if_comb;\n"
- ">  \t\t\tar->hw->wiphy->n_iface_combinations =\n"
+ ">  \t\t\tar->hw->wiphy->iface_combinations =3D ath10k_10x_ct_if_comb;\n"
+ ">  \t\t\tar->hw->wiphy->n_iface_combinations =3D\n"
  ">  \t\t\t\tARRAY_SIZE(ath10k_10x_ct_if_comb);\n"
- "> +\t\t\tar->hw->wiphy->interface_modes |= BIT(NL80211_IFTYPE_ADHOC);\n"
+ "> +\t\t\tar->hw->wiphy->interface_modes |=3D BIT(NL80211_IFTYPE_ADHOC);\n"
  ">  \t\t} else {\n"
- ">  \t\t\tar->hw->wiphy->iface_combinations = ath10k_10x_if_comb;\n"
- ">  \t\t\tar->hw->wiphy->n_iface_combinations =\n"
+ ">  \t\t\tar->hw->wiphy->iface_combinations =3D ath10k_10x_if_comb;\n"
+ ">  \t\t\tar->hw->wiphy->n_iface_combinations =3D\n"
  "\n"
  "There should a feature flag ATH10K_FW_FEATURE_SUPPORTS_ADHOC and we use\n"
  "that flag as an indication to enable the mode. I wish we had done that\n"
  "from the beginning, using wmi_op_version to guess that just creates\n"
  "problems :(\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=
 
-b12ebfed68bd383c284d14d98c634aa72ba3eebe564e3f8ba848692d400d477c
+56fb1881d0f10a11a160fbe9277eb7352c238b8544a29202f51b892ea9b78eb2
