Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / net / mac80211 / rate.c

diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
index 33f76993da081fcd73c10cad2bf1328c46d83299..3d5a2cb835c4203bb8cc4e768df7f7705594ee21 100644 (file)
--- a/net/mac80211/rate.c
+++ b/net/mac80211/rate.c
@@ -211,7 +211,8 @@ static bool rc_no_data_or_no_ack(struct ieee80211_tx_rate_control *txrc)
        return (info->flags & IEEE80211_TX_CTL_NO_ACK) || !ieee80211_is_data(fc);
 }
 
-static void rc_send_low_broadcast(s8 *idx, u32 basic_rates, u8 max_rate_idx)
+static void rc_send_low_broadcast(s8 *idx, u32 basic_rates,
+                                 struct ieee80211_supported_band *sband)
 {
        u8 i;
 
@@ -222,7 +223,7 @@ static void rc_send_low_broadcast(s8 *idx, u32 basic_rates, u8 max_rate_idx)
        if (basic_rates & (1 << *idx))
                return; /* selected rate is a basic rate */
 
-       for (i = *idx + 1; i <= max_rate_idx; i++) {
+       for (i = *idx + 1; i <= sband->n_bitrates; i++) {
                if (basic_rates & (1 << i)) {
                        *idx = i;
                        return;
@@ -237,16 +238,25 @@ bool rate_control_send_low(struct ieee80211_sta *sta,
                           struct ieee80211_tx_rate_control *txrc)
 {
        struct ieee80211_tx_info *info = IEEE80211_SKB_CB(txrc->skb);
+       struct ieee80211_supported_band *sband = txrc->sband;
+       int mcast_rate;
 
        if (!sta || !priv_sta || rc_no_data_or_no_ack(txrc)) {
                info->control.rates[0].idx = rate_lowest_index(txrc->sband, sta);
                info->control.rates[0].count =
                        (info->flags & IEEE80211_TX_CTL_NO_ACK) ?
                        1 : txrc->hw->max_rate_tries;
-               if (!sta && txrc->ap)
+               if (!sta && txrc->bss) {
+                       mcast_rate = txrc->bss_conf->mcast_rate[sband->band];
+                       if (mcast_rate > 0) {
+                               info->control.rates[0].idx = mcast_rate - 1;
+                               return true;
+                       }
+
                        rc_send_low_broadcast(&info->control.rates[0].idx,
                                              txrc->bss_conf->basic_rates,
-                                             txrc->sband->n_bitrates);
+                                             sband);
+               }
                return true;
        }
        return false;