aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@nbd.name>2018-03-19 21:34:25 +0100
committerFelix Fietkau <nbd@nbd.name>2018-03-19 21:35:00 +0100
commite062bd85639d8e85ac8ae0fd90b36d3036c036c4 (patch)
tree23aab7e8fc27c145b095e09609f9ca8ee072b5fa
parent745d0e7f4b6e8659cc967291acd33889035127f0 (diff)
downloadupstream-e062bd85639d8e85ac8ae0fd90b36d3036c036c4.tar.gz
upstream-e062bd85639d8e85ac8ae0fd90b36d3036c036c4.tar.bz2
upstream-e062bd85639d8e85ac8ae0fd90b36d3036c036c4.zip
mac80211: avoid changing skb truesize in A-MSDU aggregation
Should fix recently reported data corruption issues Signed-off-by: Felix Fietkau <nbd@nbd.name>
-rw-r--r--package/kernel/mac80211/patches/378-mac80211-fix-memory-accounting-with-A-MSDU-aggregati.patch10
1 files changed, 1 insertions, 9 deletions
diff --git a/package/kernel/mac80211/patches/378-mac80211-fix-memory-accounting-with-A-MSDU-aggregati.patch b/package/kernel/mac80211/patches/378-mac80211-fix-memory-accounting-with-A-MSDU-aggregati.patch
index af98f6162a..c64457a17f 100644
--- a/package/kernel/mac80211/patches/378-mac80211-fix-memory-accounting-with-A-MSDU-aggregati.patch
+++ b/package/kernel/mac80211/patches/378-mac80211-fix-memory-accounting-with-A-MSDU-aggregati.patch
@@ -46,15 +46,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
if (!ieee80211_amsdu_prepare_head(sdata, fast_tx, head))
goto out;
-@@ -3241,6 +3243,7 @@ static bool ieee80211_amsdu_aggregate(st
-
- head->len += skb->len;
- head->data_len += skb->len;
-+ head->truesize += skb->truesize;
- *frag_tail = skb;
-
- flow->backlog += head->len - orig_len;
-@@ -3249,6 +3252,9 @@ static bool ieee80211_amsdu_aggregate(st
+@@ -3249,6 +3251,9 @@ static bool ieee80211_amsdu_aggregate(st
fq_recalc_backlog(fq, tin, flow);
out: