Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e8eeb5e7 authored by Felix Fietkau's avatar Felix Fietkau Committed by Greg Kroah-Hartman
Browse files

mac80211: fix memory accounting with A-MSDU aggregation 



[ Upstream commit eb9b64e3a9f8483e6e54f4e03b2ae14ae5db2690 ]

skb->truesize can change due to memory reallocation or when adding extra
fragments. Adjust fq->memory_usage accordingly

Signed-off-by: default avatarFelix Fietkau <nbd@nbd.name>
Acked-by: default avatarToke Høiland-Jørgensen <toke@redhat.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 4b4355aa

net/mac80211/tx.c

+3 −0
Original line number Diff line number Diff line
@@ -3125,6 +3125,7 @@ static bool ieee80211_amsdu_aggregate(struct ieee80211_sub_if_data *sdata, 
	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;

	int orig_truesize;

	__be16 len;

	void *data;

	bool ret = false;
@@ -3158,6 +3159,7 @@ static bool ieee80211_amsdu_aggregate(struct ieee80211_sub_if_data *sdata, 
	if (!head)

		goto out;



	orig_truesize = head->truesize;

	orig_len = head->len;



	if (skb->len + head->len > max_amsdu_len)
@@ -3212,6 +3214,7 @@ static bool ieee80211_amsdu_aggregate(struct ieee80211_sub_if_data *sdata, 
	*frag_tail = skb;



out_recalc:

	fq->memory_usage += head->truesize - orig_truesize;

	if (head->len != orig_len) {

		flow->backlog += head->len - orig_len;

		tin->backlog_bytes += head->len - orig_len;