mac80211: Update to version 5.11.22-1

[openwrt/staging/mkresin.git] / package / kernel / mac80211 / patches / subsys / 376-mac80211-add-rate-control-support-for-encap-offload.patch

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 5d390990cd0892e1c88c7301d0a566f2f0a5d513..6acb814b28467083983e497537b2342ab3cc13a1 100644 (file)
--- 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
@@ -45,7 +45,7 @@ Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
        if (dest[0].idx < 0)
 --- a/net/mac80211/tx.c
 +++ b/net/mac80211/tx.c
-@@ -679,6 +679,7 @@ ieee80211_tx_h_rate_ctrl(struct ieee8021
+@@ -666,6 +666,7 @@ ieee80211_tx_h_rate_ctrl(struct ieee8021
        u32 len;
        struct ieee80211_tx_rate_control txrc;
        struct ieee80211_sta_rates *ratetbl = NULL;
@@ -53,7 +53,7 @@ Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
        bool assoc = false;
  
        memset(&txrc, 0, sizeof(txrc));
-@@ -720,7 +721,7 @@ ieee80211_tx_h_rate_ctrl(struct ieee8021
+@@ -707,7 +708,7 @@ ieee80211_tx_h_rate_ctrl(struct ieee8021
         * just wants a probe response.
         */
        if (tx->sdata->vif.bss_conf.use_short_preamble &&
@@ -62,7 +62,7 @@ Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
             (tx->sta && test_sta_flag(tx->sta, WLAN_STA_SHORT_PREAMBLE))))
                txrc.short_preamble = true;
  
-@@ -742,7 +743,8 @@ ieee80211_tx_h_rate_ctrl(struct ieee8021
+@@ -729,7 +730,8 @@ ieee80211_tx_h_rate_ctrl(struct ieee8021
                 "%s: Dropped data frame as no usable bitrate found while "
                 "scanning and associated. Target station: "
                 "%pM on %d GHz band\n",
@@ -72,7 +72,7 @@ Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
                 info->band ? 5 : 2))
                return TX_DROP;
  
-@@ -776,7 +778,7 @@ ieee80211_tx_h_rate_ctrl(struct ieee8021
+@@ -763,7 +765,7 @@ ieee80211_tx_h_rate_ctrl(struct ieee8021
  
        if (txrc.reported_rate.idx < 0) {
                txrc.reported_rate = tx->rate;
@@ -81,7 +81,7 @@ Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
                        tx->sta->tx_stats.last_rate = txrc.reported_rate;
        } else if (tx->sta)
                tx->sta->tx_stats.last_rate = txrc.reported_rate;
-@@ -3682,8 +3684,16 @@ begin:
+@@ -3631,8 +3633,16 @@ begin:
        else
                info->flags &= ~IEEE80211_TX_CTL_AMPDU;
  
@@ -101,7 +101,7 @@ Signed-off-by: Ryder Lee <ryder.lee@mediatek.com>
                struct sta_info *sta = container_of(txq->sta, struct sta_info,
 --- a/include/net/mac80211.h
 +++ b/include/net/mac80211.h
-@@ -6733,4 +6733,22 @@ struct sk_buff *ieee80211_get_fils_disco
+@@ -6754,4 +6754,22 @@ struct sk_buff *ieee80211_get_fils_disco
  struct sk_buff *
  ieee80211_get_unsol_bcast_probe_resp_tmpl(struct ieee80211_hw *hw,
                                          struct ieee80211_vif *vif);