From: Johannes Berg Date: Wed, 29 May 2019 12:25:36 +0000 (+0300) Subject: mac80211: fill low rate even for HAS_RATE_CONTROL X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=583a7a34c5d3bb76777b710c6f3fcd51981db256;p=linux.git mac80211: fill low rate even for HAS_RATE_CONTROL If HW advertises it has rate control, we skip all of the rate control assignments, but sometimes the data we have here is useful, especially so that we don't have to do the lookups again on which rates are configured and are supported. So do the low rate assignment anyway to help out drivers that might need it. Signed-off-by: Johannes Berg Signed-off-by: Luca Coelho Signed-off-by: Johannes Berg --- diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c index bc3cedc653f0f..b3ac330c3eb08 100644 --- a/net/mac80211/rate.c +++ b/net/mac80211/rate.c @@ -892,10 +892,10 @@ void rate_control_get_rate(struct ieee80211_sub_if_data *sdata, info->control.rates[i].count = 0; } - if (ieee80211_hw_check(&sdata->local->hw, HAS_RATE_CONTROL)) + if (rate_control_send_low(sta ? &sta->sta : NULL, txrc)) return; - if (rate_control_send_low(sta ? &sta->sta : NULL, txrc)) + if (ieee80211_hw_check(&sdata->local->hw, HAS_RATE_CONTROL)) return; if (sta && test_sta_flag(sta, WLAN_STA_RATE_CONTROL)) {