Skip to content

Commit

Permalink
mac80211: fill low rate even for HAS_RATE_CONTROL
Browse files Browse the repository at this point in the history
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 <johannes.berg@intel.com>
Signed-off-by: Luca Coelho <luciano.coelho@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
  • Loading branch information
Johannes Berg committed Jun 14, 2019
1 parent bd718fc commit 583a7a3
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions net/mac80211/rate.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)) {
Expand Down

0 comments on commit 583a7a3

Please sign in to comment.