wl18xx: fix last tx rate calculation

The last tx rate calculation didn't take into account
the different indices of 11a and 11g rates tables.

Add the required alignment (count only from the first
11a rate in case of 11a)

Signed-off-by: Eliad Peller <eliad@wizery.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

diff --git a/drivers/net/wireless/ti/wl18xx/tx.c b/drivers/net/wireless/ti/wl18xx/tx.c
index be1ebd55ac88e8f7f04be16e6e7bb02436468cf6..3406ffb53325c16ed47271feb470da95f0f0965e 100644 (file)
--- a/drivers/net/wireless/ti/wl18xx/tx.c
+++ b/drivers/net/wireless/ti/wl18xx/tx.c
@@ -30,7 +30,7 @@
 
 static
 void wl18xx_get_last_tx_rate(struct wl1271 *wl, struct ieee80211_vif *vif,
-                            struct ieee80211_tx_rate *rate)
+                            u8 band, struct ieee80211_tx_rate *rate)
 {
        u8 fw_rate = wl->fw_status->counters.tx_last_rate;
 
@@ -43,6 +43,8 @@ void wl18xx_get_last_tx_rate(struct wl1271 *wl, struct ieee80211_vif *vif,
 
        if (fw_rate <= CONF_HW_RATE_INDEX_54MBPS) {
                rate->idx = fw_rate;
+               if (band == IEEE80211_BAND_5GHZ)
+                       rate->idx -= CONF_HW_RATE_INDEX_6MBPS;
                rate->flags = 0;
        } else {
                rate->flags = IEEE80211_TX_RC_MCS;
@@ -102,7 +104,8 @@ static void wl18xx_tx_complete_packet(struct wl1271 *wl, u8 tx_stat_byte)
         * first pass info->control.vif while it's valid, and then fill out
         * the info->status structures
         */
-       wl18xx_get_last_tx_rate(wl, info->control.vif, &info->status.rates[0]);
+       wl18xx_get_last_tx_rate(wl, info->control.vif,
+                               info->band, &info->status.rates[0]);
 
        info->status.rates[0].count = 1; /* no data about retries */
        info->status.ack_signal = -1;