mac80211: revert faulty change that was breaking broadcast tx
authorFelix Fietkau <nbd@nbd.name>
Mon, 6 Sep 2021 10:00:56 +0000 (12:00 +0200)
committerFelix Fietkau <nbd@nbd.name>
Mon, 6 Sep 2021 10:01:42 +0000 (12:01 +0200)
Fixes: 0f6887972adc ("mac80211: add missing change for encap offload on devices with sw rate control")
Signed-off-by: Felix Fietkau <nbd@nbd.name>
package/kernel/mac80211/patches/subsys/376-mac80211-add-rate-control-support-for-encap-offload.patch

index 2a4551023f2f9d1167ce881e5bc20476eb81a7ec..f22b0d98492e1ef0ab95acc63f360c230bf18ff8 100644 (file)
@@ -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];