diff options
author | Felix Fietkau <nbd@nbd.name> | 2021-09-06 12:00:56 +0200 |
---|---|---|
committer | Felix Fietkau <nbd@nbd.name> | 2021-09-06 12:01:42 +0200 |
commit | 6f2044c2d74dd0ae2cee3b25b2ac084513c0536a (patch) | |
tree | 7c0e888f767295e31f4b330c44d864c73b31edeb /package/kernel/mac80211 | |
parent | 96a7a4738cbda4d2abfd9a4061bbfdf5c0ac2ec0 (diff) | |
download | upstream-6f2044c2d74dd0ae2cee3b25b2ac084513c0536a.tar.gz upstream-6f2044c2d74dd0ae2cee3b25b2ac084513c0536a.tar.bz2 upstream-6f2044c2d74dd0ae2cee3b25b2ac084513c0536a.zip |
mac80211: revert faulty change that was breaking broadcast tx
Fixes: 0f6887972adc ("mac80211: add missing change for encap offload on devices with sw rate control")
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Diffstat (limited to 'package/kernel/mac80211')
-rw-r--r-- | package/kernel/mac80211/patches/subsys/376-mac80211-add-rate-control-support-for-encap-offload.patch | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/package/kernel/mac80211/patches/subsys/376-mac80211-add-rate-control-support-for-encap-offload.patch b/package/kernel/mac80211/patches/subsys/376-mac80211-add-rate-control-support-for-encap-offload.patch index 2a4551023f..f22b0d9849 100644 --- a/package/kernel/mac80211/patches/subsys/376-mac80211-add-rate-control-support-for-encap-offload.patch +++ b/package/kernel/mac80211/patches/subsys/376-mac80211-add-rate-control-support-for-encap-offload.patch @@ -26,18 +26,7 @@ Signed-off-by: Ryder Lee <ryder.lee@mediatek.com> } static void rc_send_low_basicrate(struct ieee80211_tx_rate *rate, -@@ -396,6 +392,10 @@ static bool rate_control_send_low(struct - 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); -@@ -870,7 +870,6 @@ void ieee80211_get_tx_rates(struct ieee8 +@@ -870,7 +866,6 @@ void ieee80211_get_tx_rates(struct ieee8 int max_rates) { struct ieee80211_sub_if_data *sdata; @@ -45,7 +34,7 @@ Signed-off-by: Ryder Lee <ryder.lee@mediatek.com> struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb); struct ieee80211_supported_band *sband; -@@ -882,7 +881,7 @@ void ieee80211_get_tx_rates(struct ieee8 +@@ -882,7 +877,7 @@ void ieee80211_get_tx_rates(struct ieee8 sdata = vif_to_sdata(vif); sband = sdata->local->hw.wiphy->bands[info->band]; |