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>,
	Stanislaw Gruszka <sgruszka@redhat.com>
Subject: [PATCH 05/10] rt2800: make ba_size depend on ampdu_factor
Date: Wed,  2 Nov 2016 15:11:00 +0100	[thread overview]
Message-ID: <1478095865-8651-6-git-send-email-sgruszka@redhat.com> (raw)
In-Reply-To: <1478095865-8651-1-git-send-email-sgruszka@redhat.com>

We can calculate BA window size (max number of pending frames not
yet block acked) of remote station using Maximum A-MPDU length factor
for that station.

Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
---
 drivers/net/wireless/ralink/rt2x00/rt2x00queue.c |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c b/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c
index 68b620b..9da89e3 100644
--- a/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c
+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00queue.c
@@ -305,14 +305,19 @@ static void rt2x00queue_create_tx_descriptor_ht(struct rt2x00_dev *rt2x00dev,
 	struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
 	struct ieee80211_tx_rate *txrate = &tx_info->control.rates[0];
 	struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
-	struct rt2x00_sta *sta_priv = NULL;
+	u8 ba_size = 0;
 
 	if (sta) {
-		txdesc->u.ht.mpdu_density =
-		    sta->ht_cap.ampdu_density;
+		struct rt2x00_sta *sta_priv = sta_to_rt2x00_sta(sta);
 
-		sta_priv = sta_to_rt2x00_sta(sta);
+		txdesc->u.ht.mpdu_density = sta->ht_cap.ampdu_density;
 		txdesc->u.ht.wcid = sta_priv->wcid;
+
+		if (!(tx_info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE)) {
+			ba_size = IEEE80211_MIN_AMPDU_BUF;
+			ba_size <<= sta->ht_cap.ampdu_factor;
+			ba_size = min_t(int, 63, ba_size - 1);
+		}
 	}
 
 	/*
@@ -345,7 +350,7 @@ static void rt2x00queue_create_tx_descriptor_ht(struct rt2x00_dev *rt2x00dev,
 		return;
 	}
 
-	txdesc->u.ht.ba_size = 7;	/* FIXME: What value is needed? */
+	txdesc->u.ht.ba_size = ba_size;
 
 	/*
 	 * Only one STBC stream is supported for now.
-- 
1.7.1

  parent reply	other threads:[~2016-11-02 14:12 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-11-02 14:10 [PATCH 00/10] rt2800: random fixes Stanislaw Gruszka
2016-11-02 14:10 ` [PATCH 01/10] rt2800: correctly report MCS TX parameters Stanislaw Gruszka
2016-11-02 14:10 ` [PATCH 02/10] rt2800usb: do not wipe out USB_DMA_CFG settings Stanislaw Gruszka
2016-11-02 14:10 ` [PATCH 03/10] rt2800: OFDM rates are mandatory Stanislaw Gruszka
2016-11-02 14:10 ` [PATCH 04/10] rt2800: do not overwrite WPDMA_GLO_CFG_WP_DMA_BURST_SIZE Stanislaw Gruszka
2016-11-05 12:55   ` Mathias Kresin
2016-11-14  8:42     ` Stanislaw Gruszka
2016-11-16  8:10       ` Mathias Kresin
2016-11-16 11:53   ` [PATCH v2 " Stanislaw Gruszka
2016-11-17  6:29     ` Kalle Valo
2016-11-02 14:11 ` Stanislaw Gruszka [this message]
2016-11-05 12:56   ` [PATCH 05/10] rt2800: make ba_size depend on ampdu_factor Mathias Kresin
2016-11-14  8:45     ` Stanislaw Gruszka
2016-11-14  9:41       ` Julian Calaby
2016-11-14  9:44         ` Stanislaw Gruszka
2016-11-14 12:43       ` Stanislaw Gruszka
2016-11-16  8:07         ` Mathias Kresin
2016-11-16 12:02           ` Stanislaw Gruszka
2016-11-16 15:54             ` Mathias Kresin
2016-11-14 12:45   ` Stanislaw Gruszka
2016-11-16 13:59   ` [05/10] " Kalle Valo
2016-11-02 14:11 ` [PATCH 06/10] rt2800: correct AUTO_RSP_CFG Stanislaw Gruszka
2016-11-02 14:11 ` [PATCH 07/10] rt2800: correct TX_SW_CFG1 for 5592 Stanislaw Gruszka
2016-11-02 14:11 ` [PATCH 08/10] rt2800: use RTS/CTS protection instead of CTS-to-self Stanislaw Gruszka
2016-11-02 14:11 ` [PATCH 09/10] rt2800: tune *_PROT_CFG parameters Stanislaw Gruszka
2016-11-02 14:11 ` [PATCH 10/10] rt2800: disable CCK rates on HT 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=1478095865-8651-6-git-send-email-sgruszka@redhat.com \
    --to=sgruszka@redhat.com \
    --cc=helmut.schaa@googlemail.com \
    --cc=linux-wireless@vger.kernel.org \
    /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).