mac80211: inform driver of basic rateset

[linux-2.6-omap-h63xx.git] / net / mac80211 / tx.c

diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c
index 1bed3be01c261a7a8d1222d0fc6e13d681bbf402..a523189f10c403ee22e70427912ad7f394198e23 100644 (file)
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
@@ -153,7 +153,7 @@ static __le16 ieee80211_duration(struct ieee80211_tx_data *tx, int group_addr,
                if (r->bitrate > txrate->bitrate)
                        break;
 
-               if (tx->sdata->basic_rates & BIT(i))
+               if (tx->sdata->bss_conf.basic_rates & BIT(i))
                        rate = r->bitrate;
 
                switch (sband->band) {
@@ -594,7 +594,7 @@ ieee80211_tx_h_misc(struct ieee80211_tx_data *tx)
                for (idx = 0; idx < sband->n_bitrates; idx++) {
                        if (sband->bitrates[idx].bitrate > rate->bitrate)
                                continue;
-                       if (tx->sdata->basic_rates & BIT(idx) &&
+                       if (tx->sdata->bss_conf.basic_rates & BIT(idx) &&
                            (baserate < 0 ||
                             (sband->bitrates[baserate].bitrate
                              < sband->bitrates[idx].bitrate)))