2011-10-18 08:28:33

by Pontus Fuchs

Subject: [PATCH] Set IEEE80211_TX_RC_MCS on MCS rates on TX complete.

IEEE80211_TX_RC_MCS was not set correctly leading to incorrect link
speed calculation.

Reviewed-by: Luciano Coelho <[email protected]>
---
drivers/net/wireless/wl12xx/conf.h | 4 ++++
drivers/net/wireless/wl12xx/tx.c | 12 +++++++++++-
2 files changed, 15 insertions(+), 1 deletions(-)

diff --git a/drivers/net/wireless/wl12xx/conf.h b/drivers/net/wireless/wl12xx/conf.h
index 04bb8fb..b3f9592 100644
--- a/drivers/net/wireless/wl12xx/conf.h
+++ b/drivers/net/wireless/wl12xx/conf.h
@@ -91,6 +91,10 @@ enum {
CONF_HW_RXTX_RATE_UNSUPPORTED = 0xff
};

+/* Rates between and including these are MCS rates */
+#define CONF_HW_RXTX_RATE_MCS_MIN CONF_HW_RXTX_RATE_MCS7
+#define CONF_HW_RXTX_RATE_MCS_MAX CONF_HW_RXTX_RATE_MCS0
+
enum {
CONF_SG_DISABLE = 0,
CONF_SG_PROTECTIVE,
diff --git a/drivers/net/wireless/wl12xx/tx.c b/drivers/net/wireless/wl12xx/tx.c
index c7ad4f5..40c5669 100644
--- a/drivers/net/wireless/wl12xx/tx.c
+++ b/drivers/net/wireless/wl12xx/tx.c
@@ -798,6 +798,14 @@ out:
mutex_unlock(&wl->mutex);
}

+static u8 wl1271_tx_get_rate_flags(u8 rate_class_index)
+{
+ if (rate_class_index >= CONF_HW_RXTX_RATE_MCS_MIN &&
+ rate_class_index <= CONF_HW_RXTX_RATE_MCS_MAX)
+ return IEEE80211_TX_RC_MCS;
+ return 0;
+}
+
static void wl1271_tx_complete_packet(struct wl1271 *wl,
struct wl1271_tx_hw_res_descr *result)
{
@@ -807,6 +815,7 @@ static void wl1271_tx_complete_packet(struct wl1271 *wl,
struct sk_buff *skb;
int id = result->id;
int rate = -1;
+ u8 rate_flags = 0;
u8 retries = 0;

/* check for id legality */
@@ -833,6 +842,7 @@ static void wl1271_tx_complete_packet(struct wl1271 *wl,
info->flags |= IEEE80211_TX_STAT_ACK;
rate = wl1271_rate_to_idx(result->rate_class_index,
wlvif->band);
+ rate_flags = wl1271_tx_get_rate_flags(result->rate_class_index);
retries = result->ack_failures;
} else if (result->status == TX_RETRY_EXCEEDED) {
wl->stats.excessive_retries++;
@@ -841,7 +851,7 @@ static void wl1271_tx_complete_packet(struct wl1271 *wl,

info->status.rates[0].idx = rate;
info->status.rates[0].count = retries;
- info->status.rates[0].flags = 0;
+ info->status.rates[0].flags = rate_flags;
info->status.ack_signal = -1;

wl->stats.retry_count += result->ack_failures;
--
1.7.4.1

2011-10-18 13:30:55

by John W. Linville

Subject: Re: [PATCH] Set IEEE80211_TX_RC_MCS on MCS rates on TX complete.

On Tue, Oct 18, 2011 at 10:28:28AM +0200, Pontus Fuchs wrote:
> IEEE80211_TX_RC_MCS was not set correctly leading to incorrect link
> speed calculation.
>
> Reviewed-by: Luciano Coelho <[email protected]>

Missing the Signed-off-by...

You probably should be including Luca in the To or Cc as well.

John
--
John W. Linville Someday the world will need a hero, and you
[email protected] might be all we have. Be ready.

2011-10-18 13:51:22

by Pontus Fuchs

Subject: Re: [PATCH] Set IEEE80211_TX_RC_MCS on MCS rates on TX complete.

> Missing the Signed-off-by...
>
> You probably should be including Luca in the To or Cc as well.

Yeah. Thanks for spotting that. Luca already told me :) I'll resend with
signoff.

//Pontus