| Message ID | 1478095865-8651-6-git-send-email-sgruszka@redhat.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Delegated to: | Kalle Valo |
| Headers | show |
02.11.2016 15:11, Stanislaw Gruszka: > 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. > Having this patch applied, the throughput on a vgv7510kw22 (RT3062F) in AP mode using LEDE head is decreased by somewhat around 10 Mbits/sec. I'm using iperf3 for throughput tests and having this patch reverted the throughout is back to 80 Mbits/sec. When bringing down the wifi interface the following messages are logged with the patch applied: [ 281.738373] ieee80211 phy0: rt2x00queue_flush_queue: Warning - Queue 2 failed to flush [ 281.906380] ieee80211 phy0: rt2x00queue_flush_queue: Warning - Queue 2 failed to flush Mathias
On Wed, Nov 02, 2016 at 03:11:00PM +0100, Stanislaw Gruszka wrote: > 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> Kalle, please drop this patch from the set, it requires some rework. Thanks Stanislaw > --- > 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 >
Stanislaw Gruszka <sgruszka@redhat.com> wrote: > 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> Dropping as requested by Stanislaw. Patch set to Changes Requested.
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.
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(-)