diff for duplicates of <87o9syf1uf.fsf@kamboji.qca.qualcomm.com>
diff --git a/a/1.txt b/N1/1.txt
index 7a7f3a5..9efdcf4 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -1,23 +1,20 @@
Matthias Frei <mf@frei.media> writes:
-> Set the a-mpdu reference number in ath10k to make it accessible in the re=
-ceivers radiotap header. Implemented as in ath9k.=20
-> The reference number is needed for troubleshooting and research at the re=
-ceivers site (e.g. to identify mpdu's that were aggregated in an a-mpdu)
+> Set the a-mpdu reference number in ath10k to make it accessible in the receivers radiotap header. Implemented as in ath9k.
+> The reference number is needed for troubleshooting and research at the receivers site (e.g. to identify mpdu's that were aggregated in an a-mpdu)
>
> Signed-off-by: Matthias Frei <mf@frei.media>
I did some changes in pending branch, please review them:
-https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git/commit/?h=3Dp=
-ending&id=3Df722728460a5c9e9200a7f1362fa605a714c1968
+https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git/commit/?h=pending&id=f722728460a5c9e9200a7f1362fa605a714c1968
> --- a/drivers/net/wireless/ath/ath10k/core.h
> +++ b/drivers/net/wireless/ath/ath10k/core.h
> @@ -989,6 +989,9 @@ struct ath10k {
> u32 reg_ack_cts_timeout_orig;
> } fw_coverage;
-> =20
+>
> + /* AMPDU */
> + u32 ampdu_ref;
@@ -31,14 +28,13 @@ mac80211 name.
> --- a/drivers/net/wireless/ath/ath10k/htt_rx.c
> +++ b/drivers/net/wireless/ath/ath10k/htt_rx.c
> @@ -877,16 +877,24 @@ static void ath10k_htt_rx_h_ppdu(struct ath10k *ar,
-> status->nss =3D 0;
-> status->encoding =3D RX_ENC_LEGACY;
-> status->bw =3D RATE_INFO_BW_20;
-> - status->flag &=3D ~RX_FLAG_MACTIME_END;
-> - status->flag |=3D RX_FLAG_NO_SIGNAL_VAL;
-> + status->flag &=3D ~(RX_FLAG_MACTIME_END | RX_FLAG_AMPDU_IS_LAST);
-> + status->flag |=3D RX_FLAG_NO_SIGNAL_VAL | RX_FLAG_AMPDU_DETAILS | RX_F=
-LAG_AMPDU_LAST_KNOWN;
+> status->nss = 0;
+> status->encoding = RX_ENC_LEGACY;
+> status->bw = RATE_INFO_BW_20;
+> - status->flag &= ~RX_FLAG_MACTIME_END;
+> - status->flag |= RX_FLAG_NO_SIGNAL_VAL;
+> + status->flag &= ~(RX_FLAG_MACTIME_END | RX_FLAG_AMPDU_IS_LAST);
+> + status->flag |= RX_FLAG_NO_SIGNAL_VAL | RX_FLAG_AMPDU_DETAILS | RX_FLAG_AMPDU_LAST_KNOWN;
This added a new warning:
@@ -47,7 +43,7 @@ drivers/net/wireless/ath/ath10k/htt_rx.c:894: line over 90 characters
I fixed that by separating the setting of ampdu flags.
> + /* set ampdu ref */
-> + status->ampdu_reference =3D ar->ampdu_ref;
+> + status->ampdu_reference = ar->ampdu_ref;
The comment is not telling anything new so removed it.
@@ -56,11 +52,15 @@ The comment is not telling anything new so removed it.
> ath10k_htt_rx_h_mactime(ar, status, rxd);
> +
> + /* set ampdu last segment flag */
-> + status->flag |=3D RX_FLAG_AMPDU_IS_LAST;
+> + status->flag |= RX_FLAG_AMPDU_IS_LAST;
> + ar->ampdu_ref++;
> + }
So this counter is per wiphy, not per vdev. Is that ok?
---=20
-Kalle Valo=
\ No newline at end of file
+--
+Kalle Valo
+_______________________________________________
+ath10k mailing list
+ath10k@lists.infradead.org
+http://lists.infradead.org/mailman/listinfo/ath10k
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index 54df9b1..54fc5c9 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -14,8 +14,8 @@
"To\0Matthias Frei <mf\@frei.media>\0"
]
[
- "Cc\0ath10k\@lists.infradead.org <ath10k\@lists.infradead.org>",
- " linux-wireless\@vger.kernel.org <linux-wireless\@vger.kernel.org>\0"
+ "Cc\0linux-wireless\@vger.kernel.org <linux-wireless\@vger.kernel.org>",
+ " ath10k\@lists.infradead.org <ath10k\@lists.infradead.org>\0"
]
[
"\0000:1\0"
@@ -26,24 +26,21 @@
[
"Matthias Frei <mf\@frei.media> writes:\n",
"\n",
- "> Set the a-mpdu reference number in ath10k to make it accessible in the re=\n",
- "ceivers radiotap header. Implemented as in ath9k.=20\n",
- "> The reference number is needed for troubleshooting and research at the re=\n",
- "ceivers site (e.g. to identify mpdu's that were aggregated in an a-mpdu)\n",
+ "> Set the a-mpdu reference number in ath10k to make it accessible in the receivers radiotap header. Implemented as in ath9k. \n",
+ "> The reference number is needed for troubleshooting and research at the receivers site (e.g. to identify mpdu's that were aggregated in an a-mpdu)\n",
">\n",
"> Signed-off-by: Matthias Frei <mf\@frei.media>\n",
"\n",
"I did some changes in pending branch, please review them:\n",
"\n",
- "https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git/commit/?h=3Dp=\n",
- "ending&id=3Df722728460a5c9e9200a7f1362fa605a714c1968\n",
+ "https://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git/commit/?h=pending&id=f722728460a5c9e9200a7f1362fa605a714c1968\n",
"\n",
"> --- a/drivers/net/wireless/ath/ath10k/core.h\n",
"> +++ b/drivers/net/wireless/ath/ath10k/core.h\n",
"> \@\@ -989,6 +989,9 \@\@ struct ath10k {\n",
"> \t\tu32 reg_ack_cts_timeout_orig;\n",
"> \t} fw_coverage;\n",
- "> =20\n",
+ "> \n",
"> +\t/* AMPDU */\n",
"> +\tu32 ampdu_ref;\n",
"\n",
@@ -57,14 +54,13 @@
"> --- a/drivers/net/wireless/ath/ath10k/htt_rx.c\n",
"> +++ b/drivers/net/wireless/ath/ath10k/htt_rx.c\n",
"> \@\@ -877,16 +877,24 \@\@ static void ath10k_htt_rx_h_ppdu(struct ath10k *ar,\n",
- "> \t\tstatus->nss =3D 0;\n",
- "> \t\tstatus->encoding =3D RX_ENC_LEGACY;\n",
- "> \t\tstatus->bw =3D RATE_INFO_BW_20;\n",
- "> -\t\tstatus->flag &=3D ~RX_FLAG_MACTIME_END;\n",
- "> -\t\tstatus->flag |=3D RX_FLAG_NO_SIGNAL_VAL;\n",
- "> +\t\tstatus->flag &=3D ~(RX_FLAG_MACTIME_END | RX_FLAG_AMPDU_IS_LAST);\n",
- "> +\t\tstatus->flag |=3D RX_FLAG_NO_SIGNAL_VAL | RX_FLAG_AMPDU_DETAILS | RX_F=\n",
- "LAG_AMPDU_LAST_KNOWN;\n",
+ "> \t\tstatus->nss = 0;\n",
+ "> \t\tstatus->encoding = RX_ENC_LEGACY;\n",
+ "> \t\tstatus->bw = RATE_INFO_BW_20;\n",
+ "> -\t\tstatus->flag &= ~RX_FLAG_MACTIME_END;\n",
+ "> -\t\tstatus->flag |= RX_FLAG_NO_SIGNAL_VAL;\n",
+ "> +\t\tstatus->flag &= ~(RX_FLAG_MACTIME_END | RX_FLAG_AMPDU_IS_LAST);\n",
+ "> +\t\tstatus->flag |= RX_FLAG_NO_SIGNAL_VAL | RX_FLAG_AMPDU_DETAILS | RX_FLAG_AMPDU_LAST_KNOWN;\n",
"\n",
"This added a new warning:\n",
"\n",
@@ -73,7 +69,7 @@
"I fixed that by separating the setting of ampdu flags.\n",
"\n",
"> +\t\t/* set ampdu ref */\n",
- "> +\t\tstatus->ampdu_reference =3D ar->ampdu_ref;\n",
+ "> +\t\tstatus->ampdu_reference = ar->ampdu_ref;\n",
"\n",
"The comment is not telling anything new so removed it.\n",
"\n",
@@ -82,14 +78,18 @@
"> \t\tath10k_htt_rx_h_mactime(ar, status, rxd);\n",
"> +\n",
"> +\t\t/* set ampdu last segment flag */\n",
- "> +\t\tstatus->flag |=3D RX_FLAG_AMPDU_IS_LAST;\n",
+ "> +\t\tstatus->flag |= RX_FLAG_AMPDU_IS_LAST;\n",
"> +\t\tar->ampdu_ref++;\n",
"> +\t}\n",
"\n",
"So this counter is per wiphy, not per vdev. Is that ok?\n",
"\n",
- "--=20\n",
- "Kalle Valo="
+ "-- \n",
+ "Kalle Valo\n",
+ "_______________________________________________\n",
+ "ath10k mailing list\n",
+ "ath10k\@lists.infradead.org\n",
+ "http://lists.infradead.org/mailman/listinfo/ath10k"
]
-714e6bb92ea84f70c392d2e71aa0a41ffcfc284a5affb087a8ae2960f876c4ee
+6ae125b0c3f66fbb0c479a2059eff43c6ce48df5e1857d75fdf531a4a3eb9131
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.