[PATCH] ath9k: Dont update rate control for every AMPDU

[PATCH] ath9k: Dont update rate control for every AMPDU

[Vasanthakumar Thiagarajan]

Update rate control only with the tx status of first AMPDU
of an aggregation. This fixes frequent drops in throughput.

Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
---
 drivers/net/wireless/ath9k/rc.c   |    3 ++-
 drivers/net/wireless/ath9k/rc.h   |    1 +
 drivers/net/wireless/ath9k/xmit.c |    2 ++
 3 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/drivers/net/wireless/ath9k/rc.c b/drivers/net/wireless/ath9k/rc.c
index e118824..7d1913d 100644
--- a/drivers/net/wireless/ath9k/rc.c
+++ b/drivers/net/wireless/ath9k/rc.c
@@ -1413,7 +1413,8 @@ static void ath_tx_status(void *priv, struct ieee80211_supported_band *sband,
 	an = (struct ath_node *)sta->drv_priv;
 	final_ts_idx = tx_info_priv->tx.ts_rateindex;
 
-	if (!an || !priv_sta || !ieee80211_is_data(fc))
+	if (!an || !priv_sta || !ieee80211_is_data(fc) ||
+	    !tx_info_priv->update_rc)
 		goto exit;
 
 	if (tx_info_priv->tx.ts_status & ATH9K_TXERR_FILT)
diff --git a/drivers/net/wireless/ath9k/rc.h b/drivers/net/wireless/ath9k/rc.h
index 297dff9..083e006 100644
--- a/drivers/net/wireless/ath9k/rc.h
+++ b/drivers/net/wireless/ath9k/rc.h
@@ -188,6 +188,7 @@ struct ath_tx_info_priv {
 	struct ath_tx_status tx;
 	int n_frames;
 	int n_bad_frames;
+	u8 update_rc;
 };
 
 #define ATH_TX_INFO_PRIV(tx_info) \
diff --git a/drivers/net/wireless/ath9k/xmit.c b/drivers/net/wireless/ath9k/xmit.c
index 50d4105..bea48c3 100644
--- a/drivers/net/wireless/ath9k/xmit.c
+++ b/drivers/net/wireless/ath9k/xmit.c
@@ -950,6 +950,7 @@ static void ath_tx_rc_status(struct ath_buf *bf, struct ath_desc *ds, int nbad)
 	struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
 	struct ath_tx_info_priv *tx_info_priv = ATH_TX_INFO_PRIV(tx_info);
 
+	tx_info_priv->update_rc = 0;
 	if (ds->ds_txstat.ts_status & ATH9K_TXERR_FILT)
 		tx_info->flags |= IEEE80211_TX_STAT_TX_FILTERED;
 
@@ -960,6 +961,7 @@ static void ath_tx_rc_status(struct ath_buf *bf, struct ath_desc *ds, int nbad)
 			       sizeof(tx_info_priv->tx));
 			tx_info_priv->n_frames = bf->bf_nframes;
 			tx_info_priv->n_bad_frames = nbad;
+			tx_info_priv->update_rc = 1;
 		}
 	}
 }
-- 
1.5.5.1

Re: [PATCH] ath9k: Dont update rate control for every AMPDU

[Johannes Berg]

[-- Attachment #1: Type: text/plain, Size: 322 bytes --]

On Thu, 2008-11-20 at 11:21 +0530, Vasanthakumar Thiagarajan wrote:

> +	u8 update_rc;

> +	tx_info_priv->update_rc = 0;

> +			tx_info_priv->update_rc = 1;

You could use a bool and use false/true, that'd generate exactly the
same code but might be easier to read. Not that it matters much I guess.

johannes

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH] ath9k: Dont update rate control for every AMPDU

[Vasanthakumar Thiagarajan]

Johannes Berg wrote:
> On Thu, 2008-11-20 at 11:21 +0530, Vasanthakumar Thiagarajan wrote:
> 
>> +	u8 update_rc;
> 
>> +	tx_info_priv->update_rc = 0;
> 
>> +			tx_info_priv->update_rc = 1;
> 
> You could use a bool and use false/true, that'd generate exactly the
> same code but might be easier to read. Not that it matters much I guess.
> 
> johannes


Sure, if it improves the readability.

Vasanth

[PATCH] ath9k: Dont update rate control for every AMPDU

[Vasanthakumar Thiagarajan]

Update the rate control only with the tx status of first
AMPDU of an aggregation. This patch fixes frequent drops
in throughput.

Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
---
 drivers/net/wireless/ath9k/rc.c   |    3 ++-
 drivers/net/wireless/ath9k/rc.h   |    1 +
 drivers/net/wireless/ath9k/xmit.c |    2 ++
 3 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/drivers/net/wireless/ath9k/rc.c b/drivers/net/wireless/ath9k/rc.c
index e118824..7d1913d 100644
--- a/drivers/net/wireless/ath9k/rc.c
+++ b/drivers/net/wireless/ath9k/rc.c
@@ -1413,7 +1413,8 @@ static void ath_tx_status(void *priv, struct ieee80211_supported_band *sband,
 	an = (struct ath_node *)sta->drv_priv;
 	final_ts_idx = tx_info_priv->tx.ts_rateindex;
 
-	if (!an || !priv_sta || !ieee80211_is_data(fc))
+	if (!an || !priv_sta || !ieee80211_is_data(fc) ||
+	    !tx_info_priv->update_rc)
 		goto exit;
 
 	if (tx_info_priv->tx.ts_status & ATH9K_TXERR_FILT)
diff --git a/drivers/net/wireless/ath9k/rc.h b/drivers/net/wireless/ath9k/rc.h
index 297dff9..97c60d1 100644
--- a/drivers/net/wireless/ath9k/rc.h
+++ b/drivers/net/wireless/ath9k/rc.h
@@ -188,6 +188,7 @@ struct ath_tx_info_priv {
 	struct ath_tx_status tx;
 	int n_frames;
 	int n_bad_frames;
+	bool update_rc;
 };
 
 #define ATH_TX_INFO_PRIV(tx_info) \
diff --git a/drivers/net/wireless/ath9k/xmit.c b/drivers/net/wireless/ath9k/xmit.c
index 50d4105..dad81a9 100644
--- a/drivers/net/wireless/ath9k/xmit.c
+++ b/drivers/net/wireless/ath9k/xmit.c
@@ -950,6 +950,7 @@ static void ath_tx_rc_status(struct ath_buf *bf, struct ath_desc *ds, int nbad)
 	struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
 	struct ath_tx_info_priv *tx_info_priv = ATH_TX_INFO_PRIV(tx_info);
 
+	tx_info_priv->update_rc = false;
 	if (ds->ds_txstat.ts_status & ATH9K_TXERR_FILT)
 		tx_info->flags |= IEEE80211_TX_STAT_TX_FILTERED;
 
@@ -960,6 +961,7 @@ static void ath_tx_rc_status(struct ath_buf *bf, struct ath_desc *ds, int nbad)
 			       sizeof(tx_info_priv->tx));
 			tx_info_priv->n_frames = bf->bf_nframes;
 			tx_info_priv->n_bad_frames = nbad;
+			tx_info_priv->update_rc = true;
 		}
 	}
 }
-- 
1.5.5.1