mac80211: Update to version 5.1-rc2-1

[openwrt/staging/hauke.git] / package / kernel / mac80211 / patches / subsys / 311-mac80211-fix-memory-accounting-with-A-MSDU-aggregati.patch

diff --git a/package/kernel/mac80211/patches/subsys/311-mac80211-fix-memory-accounting-with-A-MSDU-aggregati.patch b/package/kernel/mac80211/patches/subsys/311-mac80211-fix-memory-accounting-with-A-MSDU-aggregati.patch
index 025ea09b6f69df9d52f9885d0bbd5b58d2803857..be8142248a1eeb06ff98be89aa08ccefd8609479 100644 (file)
--- a/package/kernel/mac80211/patches/subsys/311-mac80211-fix-memory-accounting-with-A-MSDU-aggregati.patch
+++ b/package/kernel/mac80211/patches/subsys/311-mac80211-fix-memory-accounting-with-A-MSDU-aggregati.patch
@@ -22,7 +22,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 
 --- a/net/mac80211/tx.c
 +++ b/net/mac80211/tx.c
-@@ -3214,6 +3214,7 @@ static bool ieee80211_amsdu_aggregate(st
+@@ -3221,6 +3221,7 @@ static bool ieee80211_amsdu_aggregate(st
        u8 max_subframes = sta->sta.max_amsdu_subframes;
        int max_frags = local->hw.max_tx_fragments;
        int max_amsdu_len = sta->sta.max_amsdu_len;
@@ -30,7 +30,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        __be16 len;
        void *data;
        bool ret = false;
-@@ -3252,12 +3253,13 @@ static bool ieee80211_amsdu_aggregate(st
+@@ -3259,12 +3260,13 @@ static bool ieee80211_amsdu_aggregate(st
        flow = fq_flow_classify(fq, tin, skb, fq_flow_get_default_func);
        head = skb_peek_tail(&flow->queue);
        if (!head || skb_is_gso(head))
@@ -46,7 +46,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  
        nfrags = 1 + skb_shinfo(skb)->nr_frags;
        nfrags += 1 + skb_shinfo(head)->nr_frags;
-@@ -3318,6 +3320,9 @@ out_recalc:
+@@ -3325,6 +3327,9 @@ out_recalc:
                fq_recalc_backlog(fq, tin, flow);
        }
  out: