From 5fb60a7d7a0f2aa0415c27627274d00ba8bdcc4f Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Wed, 21 Nov 2018 19:03:51 +0100 Subject: [PATCH] mt7603: fix aggregation size handling Do not step over the 32 subframe limit. Fix staying under the limit Signed-off-by: Felix Fietkau --- mt7603/mac.c | 2 +- mt7603/mt7603.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mt7603/mac.c b/mt7603/mac.c index 4c06c086..81a2fbc1 100644 --- a/mt7603/mac.c +++ b/mt7603/mac.c @@ -389,7 +389,7 @@ void mt7603_mac_tx_ba_reset(struct mt7603_dev *dev, int wcid, int tid, int ssn, mt7603_mac_start(dev); for (i = 7; i > 0; i--) { - if (ba_size >= MT_AGG_SIZE_LIMIT(i)) + if (ba_size < MT_AGG_SIZE_LIMIT(i)) break; } diff --git a/mt7603/mt7603.h b/mt7603/mt7603.h index 27ac2f4a..51f5c49a 100644 --- a/mt7603/mt7603.h +++ b/mt7603/mt7603.h @@ -39,7 +39,7 @@ #define MT7603_EEPROM_SIZE 1024 -#define MT_AGG_SIZE_LIMIT(n) ((4 + 2 * ((n) & 1)) << ((n) / 2)) +#define MT_AGG_SIZE_LIMIT(_n) (((_n) + 1) * 4) #define MT7603_PRE_TBTT_TIME 5000 /* ms */