Merge tag 'powerpc-5.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[linux-2.6-microblaze.git] / net / mac80211 / cfg.c

diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c
index da70f17..7276e66 100644 (file)
--- a/net/mac80211/cfg.c
+++ b/net/mac80211/cfg.c
@@ -709,7 +709,8 @@ void sta_set_rate_info_tx(struct sta_info *sta,
                u16 brate;
 
                sband = ieee80211_get_sband(sta->sdata);
-               if (sband) {
+               WARN_ON_ONCE(sband && !sband->bitrates);
+               if (sband && sband->bitrates) {
                        brate = sband->bitrates[rate->idx].bitrate;
                        rinfo->legacy = DIV_ROUND_UP(brate, 1 << shift);
                }
@@ -1153,6 +1154,9 @@ static int ieee80211_start_ap(struct wiphy *wiphy, struct net_device *dev,
                }
        }
 
+       if (ieee80211_hw_check(&local->hw, HAS_RATE_CONTROL))
+               sdata->vif.bss_conf.beacon_tx_rate = params->beacon_rate;
+
        err = ieee80211_assign_beacon(sdata, &params->beacon, NULL);
        if (err < 0)
                goto error;