linux-wireless.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stanislaw Gruszka <sgruszka@redhat.com>
To: linux-wireless@vger.kernel.org
Cc: Helmut Schaa <helmut.schaa@googlemail.com>, Felix Fietkau <nbd@nbd.name>
Subject: [PATCH 06/10] rt2x00: fixup fill_tx_status for nomatch case
Date: Tue, 14 Feb 2017 13:46:04 +0100	[thread overview]
Message-ID: <1487076368-7020-7-git-send-email-sgruszka@redhat.com> (raw)
In-Reply-To: <1487076368-7020-1-git-send-email-sgruszka@redhat.com>

Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
---
 drivers/net/wireless/ralink/rt2x00/rt2x00dev.c   | 6 +++++-
 drivers/net/wireless/ralink/rt2x00/rt2x00queue.h | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
index 90fc259..258d94d 100644
--- a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
@@ -357,6 +357,9 @@ static void rt2x00lib_fill_tx_status(struct rt2x00_dev *rt2x00dev,
 	if (i < (IEEE80211_TX_MAX_RATES - 1))
 		tx_info->status.rates[i].idx = -1; /* terminate */
 
+	if (!test_bit(TXDONE_ACK_REQ, &txdesc->flags))
+		tx_info->flags |= IEEE80211_TX_CTL_NO_ACK;
+
 	if (!(tx_info->flags & IEEE80211_TX_CTL_NO_ACK)) {
 		if (success)
 			tx_info->flags |= IEEE80211_TX_STAT_ACK;
@@ -375,7 +378,8 @@ static void rt2x00lib_fill_tx_status(struct rt2x00_dev *rt2x00dev,
 	 */
 	if (test_bit(TXDONE_AMPDU, &txdesc->flags) ||
 	    tx_info->flags & IEEE80211_TX_CTL_AMPDU) {
-		tx_info->flags |= IEEE80211_TX_STAT_AMPDU;
+		tx_info->flags |= IEEE80211_TX_STAT_AMPDU |
+				  IEEE80211_TX_CTL_AMPDU;
 		tx_info->status.ampdu_len = 1;
 		tx_info->status.ampdu_ack_len = success ? 1 : 0;
 
diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00queue.h b/drivers/net/wireless/ralink/rt2x00/rt2x00queue.h
index 9b297fc..921f768 100644
--- a/drivers/net/wireless/ralink/rt2x00/rt2x00queue.h
+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00queue.h
@@ -215,6 +215,7 @@ enum txdone_entry_desc_flags {
 	TXDONE_FAILURE,
 	TXDONE_EXCESSIVE_RETRY,
 	TXDONE_AMPDU,
+	TXDONE_ACK_REQ,
 };
 
 /**
-- 
1.8.3.1

  parent reply	other threads:[~2017-02-14 12:51 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-02-14 12:45 [PATCH 00/10] rt2x00 patches 14.02.2017 Stanislaw Gruszka
2017-02-14 12:45 ` [PATCH 01/10] rt2x00: rt2800lib: move rt2800_drv_data declaration into rt2800lib.h Stanislaw Gruszka
2017-02-14 12:46 ` [PATCH 02/10] rt2800: identify station based on status WCID Stanislaw Gruszka
2017-02-14 13:10   ` Felix Fietkau
2017-02-14 13:32     ` Stanislaw Gruszka
2017-02-14 13:46       ` Felix Fietkau
2017-02-14 12:46 ` [PATCH 03/10] rt2x00: separte filling tx status from rt2x00lib_txdone Stanislaw Gruszka
2017-02-14 12:46 ` [PATCH 04/10] rt2x00: separte clearing entry " Stanislaw Gruszka
2017-02-14 12:46 ` [PATCH 05/10] rt2x00: add txdone nomatch function Stanislaw Gruszka
2017-02-14 12:46 ` Stanislaw Gruszka [this message]
2017-02-14 13:51   ` [PATCH 06/10] rt2x00: fixup fill_tx_status for nomatch case Felix Fietkau
2017-02-14 16:32   ` Kalle Valo
2017-02-14 12:46 ` [PATCH 07/10] rt2x00: use txdone_nomatch on rt2800usb Stanislaw Gruszka
2017-02-14 12:46 ` [PATCH 08/10] rt2800: status based rate flags for nomatch case Stanislaw Gruszka
2017-02-14 12:46 ` [PATCH 09/10] rt2800: use TXOP_BACKOFF for probe frames Stanislaw Gruszka
2017-02-14 12:46 ` [PATCH 10/10] rt2x00: fix rt2x00debug_dump_frame comment Stanislaw Gruszka

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1487076368-7020-7-git-send-email-sgruszka@redhat.com \
    --to=sgruszka@redhat.com \
    --cc=helmut.schaa@googlemail.com \
    --cc=linux-wireless@vger.kernel.org \
    --cc=nbd@nbd.name \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
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).