From d48a8ed40d3d1b65eec9c848828c6c0e2928cf07 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Fri, 15 Feb 2019 18:43:55 +0100 Subject: mac80211: update to version 4.19.23-1 This updates mac80211 to backports version 4.19.23-1 which includes all the stable fixes from kernel 4.19.23. The removed patches are included in this version. Signed-off-by: Hauke Mehrtens --- .../378-mac80211-fix-memory-accounting-with-A-MSDU-aggregati.patch | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'package/kernel/mac80211/patches/subsys/378-mac80211-fix-memory-accounting-with-A-MSDU-aggregati.patch') diff --git a/package/kernel/mac80211/patches/subsys/378-mac80211-fix-memory-accounting-with-A-MSDU-aggregati.patch b/package/kernel/mac80211/patches/subsys/378-mac80211-fix-memory-accounting-with-A-MSDU-aggregati.patch index fe0b98c3ac..4e83ff1ea0 100644 --- a/package/kernel/mac80211/patches/subsys/378-mac80211-fix-memory-accounting-with-A-MSDU-aggregati.patch +++ b/package/kernel/mac80211/patches/subsys/378-mac80211-fix-memory-accounting-with-A-MSDU-aggregati.patch @@ -22,7 +22,7 @@ Signed-off-by: Felix Fietkau --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c -@@ -3188,6 +3188,7 @@ static bool ieee80211_amsdu_aggregate(st +@@ -3194,6 +3194,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 __be16 len; void *data; bool ret = false; -@@ -3219,12 +3220,13 @@ static bool ieee80211_amsdu_aggregate(st +@@ -3225,12 +3226,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) @@ -46,7 +46,7 @@ Signed-off-by: Felix Fietkau nfrags = 1 + skb_shinfo(skb)->nr_frags; nfrags += 1 + skb_shinfo(head)->nr_frags; -@@ -3282,6 +3284,9 @@ out_recalc: +@@ -3288,6 +3290,9 @@ out_recalc: fq_recalc_backlog(fq, tin, flow); } out: -- cgit v1.2.3