[openwrt/openwrt] mac80211: avoid changing skb truesize in A-MSDU aggregation

LEDE Commits lede-commits at lists.infradead.org
Mon Mar 19 13:36:59 PDT 2018


nbd pushed a commit to openwrt/openwrt.git, branch master:
https://git.lede-project.org/e062bd85639d8e85ac8ae0fd90b36d3036c036c4

commit e062bd85639d8e85ac8ae0fd90b36d3036c036c4
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Mon Mar 19 21:34:25 2018 +0100

    mac80211: avoid changing skb truesize in A-MSDU aggregation
    
    Should fix recently reported data corruption issues
    
    Signed-off-by: Felix Fietkau <nbd at nbd.name>
---
 ...-mac80211-fix-memory-accounting-with-A-MSDU-aggregati.patch | 10 +---------
 1 file changed, 1 insertion(+), 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 af98f61..c64457a 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 at 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:



More information about the lede-commits mailing list