diff options
| author |   Felix Fietkau <nbd@nbd.name> | 2019-03-16 18:06:31 +0100 |
|---|---|---|
| committer |   Johannes Berg <johannes.berg@intel.com> | 2019-03-29 11:21:25 +0100 |
| commit | eb9b64e3a9f8483e6e54f4e03b2ae14ae5db2690 (patch) | |
| tree | 28ce36b3695447da0e8f247e90c287d3eb021af6 /net/mac80211 | |
| parent | cfg80211: Handle WMM rules in regulatory domain intersection (diff) | |
| download | linux-dev-eb9b64e3a9f8483e6e54f4e03b2ae14ae5db2690.tar.xz linux-dev-eb9b64e3a9f8483e6e54f4e03b2ae14ae5db2690.zip | |
mac80211: fix memory accounting with A-MSDU aggregation
skb->truesize can change due to memory reallocation or when adding extra
fragments. Adjust fq->memory_usage accordingly
Signed-off-by: Felix Fietkau <nbd@nbd.name>
Acked-by: Toke Høiland-Jørgensen <toke@redhat.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'net/mac80211')
| -rw-r--r-- | net/mac80211/tx.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/mac80211/tx.c b/net/mac80211/tx.c index 8a49a74c0a37..5f546de10d96 100644 --- a/net/mac80211/tx.c +++ b/net/mac80211/tx.c @@ -3221,6 +3221,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; @@ -3261,6 +3262,7 @@ static bool ieee80211_amsdu_aggregate(struct ieee80211_sub_if_data *sdata, if (!head || skb_is_gso(head)) goto out; + orig_truesize = head->truesize; orig_len = head->len; if (skb->len + head->len > max_amsdu_len) @@ -3318,6 +3320,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; |