staging: brcm80211: fill in proper rx rate in mac80211 rx status
authorArend van Spriel <arend@broadcom.com>
Tue, 23 Aug 2011 12:14:00 +0000 (14:14 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 23 Aug 2011 20:10:15 +0000 (13:10 -0700)
The brcmsmac driver supports different rates on 5GHz but this is not
taken into account when providing the rate index in the receive
status information passed to mac80211.

Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: Henry Ptasinski <henryp@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/brcm80211/brcmsmac/mac80211_if.c
drivers/staging/brcm80211/brcmsmac/mac80211_if.h
drivers/staging/brcm80211/brcmsmac/main.c

index 7179edda94afa9b7ebce76781c65af9cfbac4b34..237017186131a46f29d916a853357a5195940e04 100644 (file)
@@ -971,6 +971,10 @@ static struct ieee80211_channel brcms_5ghz_nphy_chantable[] = {
        .hw_value = (rate100m / 5), \
 }
 
+/*
+ * The rate table is used for both 2.4G and 5G rates. The
+ * latter being a subset as it does not support CCK rates.
+ */
 static struct ieee80211_rate legacy_ratetable[] = {
        RATE(10, 0),
        RATE(20, IEEE80211_RATE_SHORT_PREAMBLE),
@@ -1012,8 +1016,9 @@ static struct ieee80211_supported_band brcms_band_5GHz_nphy = {
        .band = IEEE80211_BAND_5GHZ,
        .channels = brcms_5ghz_nphy_chantable,
        .n_channels = ARRAY_SIZE(brcms_5ghz_nphy_chantable),
-       .bitrates = legacy_ratetable + 4,
-       .n_bitrates = ARRAY_SIZE(legacy_ratetable) - 4,
+       .bitrates = legacy_ratetable + BRCMS_LEGACY_5G_RATE_OFFSET,
+       .n_bitrates = ARRAY_SIZE(legacy_ratetable) -
+                       BRCMS_LEGACY_5G_RATE_OFFSET,
        .ht_cap = {
                   .cap = IEEE80211_HT_CAP_GRN_FLD | IEEE80211_HT_CAP_SGI_20 |
                          IEEE80211_HT_CAP_SGI_40 |
index fcd711a7c38327c97d14d0188454649423033990..7f290d7c0c418d63963d6a76f52dcd08d7ab0bad 100644 (file)
 #include <linux/timer.h>
 #include <linux/interrupt.h>
 
+/*
+ * Starting index for 5G rates in the
+ * legacy rate table.
+ */
+#define BRCMS_LEGACY_5G_RATE_OFFSET    4
+
 /* softmac ioctl definitions */
 #define BRCMS_SET_SHORTSLOT_OVERRIDE           146
 
index 7e729d295d73554730f509b629303ba4619ab0fc..339ab28477a1c8ade4b4df6b4045b0b26116a41f 100644 (file)
@@ -8252,6 +8252,14 @@ prep_mac80211_status(struct brcms_c_info *wlc, struct d11rxhdr *rxh,
                        wiphy_err(wlc->wiphy, "%s: Unknown rate\n", __func__);
                }
 
+               /*
+                * For 5GHz, we should decrease the index as it is
+                * a subset of the 2.4G rates. See bitrates field
+                * of brcms_band_5GHz_nphy (in mac80211_if.c).
+                */
+               if (rx_status->band == IEEE80211_BAND_5GHZ)
+                       rx_status->rate_idx -= BRCMS_LEGACY_5G_RATE_OFFSET;
+
                /* Determine short preamble and rate_idx */
                preamble = 0;
                if (IS_CCK(rspec)) {