summaryrefslogtreecommitdiffstats
path: root/net/mac80211/rate.c
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2021-09-06 10:35:59 +0200
committerJohannes Berg <johannes.berg@intel.com>2021-09-23 12:59:29 +0200
commit98d46b021f6ee246c7a73f9d490d4cddb4511a3b (patch)
treea1f7b87f6d44ce3a0eb99ef7236a0006e67c405e /net/mac80211/rate.c
parentmptcp: ensure tx skbs always have the MPTCP ext (diff)
downloadlinux-98d46b021f6ee246c7a73f9d490d4cddb4511a3b.tar.xz
linux-98d46b021f6ee246c7a73f9d490d4cddb4511a3b.zip
Revert "mac80211: do not use low data rates for data frames with no ack flag"
This reverts commit d333322361e7 ("mac80211: do not use low data rates for data frames with no ack flag"). Returning false early in rate_control_send_low breaks sending broadcast packets, since rate control will not select a rate for it. Before re-introducing a fixed version of this patch, we should probably also make some changes to rate control to be more conservative in selecting rates for no-ack packets and also prevent using probing rates on them, since we won't get any feedback. Fixes: d333322361e7 ("mac80211: do not use low data rates for data frames with no ack flag") Signed-off-by: Felix Fietkau <nbd@nbd.name> Link: https://lore.kernel.org/r/20210906083559.9109-1-nbd@nbd.name Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211/rate.c')
-rw-r--r--net/mac80211/rate.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/net/mac80211/rate.c b/net/mac80211/rate.c
index e5935e3d7a07..8c6416129d5b 100644
--- a/net/mac80211/rate.c
+++ b/net/mac80211/rate.c
@@ -392,10 +392,6 @@ static bool rate_control_send_low(struct ieee80211_sta *pubsta,
int mcast_rate;
bool use_basicrate = false;
- if (ieee80211_is_tx_data(txrc->skb) &&
- info->flags & IEEE80211_TX_CTL_NO_ACK)
- return false;
-
if (!pubsta || rc_no_data_or_no_ack_use_min(txrc)) {
__rate_control_send_low(txrc->hw, sband, pubsta, info,
txrc->rate_idx_mask);