Skip to content

Commit

Permalink
mac80211: revert faulty change that was breaking broadcast tx
Browse files Browse the repository at this point in the history
Fixes: 0f68879 ("mac80211: add missing change for encap offload on devices with sw rate control")
Signed-off-by: Felix Fietkau <nbd@nbd.name>
  • Loading branch information
nbd168 committed Sep 6, 2021
1 parent 96a7a47 commit 6f2044c
Showing 1 changed file with 2 additions and 13 deletions.
Expand Up @@ -26,26 +26,15 @@ 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;
- struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
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];

Expand Down

0 comments on commit 6f2044c

Please sign in to comment.