When 'rtl8xxxu_dma_agg_pages <= page_thresh', 'timeout' should equal to
'page_thresh' rather than '4'. Change the code order to fix this problem.
Fixes: fd83f1227826 ("rtl8xxxu: gen1: Add module parameters to adjust DMA aggregation parameters")
Signed-off-by: Su Hui <suhui@xxxxxxxxxxxx>
---
v2:
- correct the problem about Fixes tag.
.../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
index 43ee7592bc6e..9cab8b1dc486 100644
--- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
+++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
@@ -4757,6 +4757,12 @@ void rtl8xxxu_gen1_init_aggregation(struct rtl8xxxu_priv *priv)
* RxAggPageTimeout = 4 or 6 (absolute time 34ms/(2^6))
*/
+ /* REG_RXDMA_AGG_PG_TH + 1 seems to be the timeout register on
+ * gen2 chips and rtl8188eu. The rtl8723au seems unhappy if we
+ * don't set it, so better set both.
+ */
+ timeout = 4;
+
page_thresh = (priv->fops->rx_agg_buf_size / 512);
if (rtl8xxxu_dma_agg_pages >= 0) {
if (rtl8xxxu_dma_agg_pages <= page_thresh)
@@ -4771,12 +4777,6 @@ void rtl8xxxu_gen1_init_aggregation(struct rtl8xxxu_priv *priv)
__func__, rtl8xxxu_dma_agg_pages, page_thresh);
}
rtl8xxxu_write8(priv, REG_RXDMA_AGG_PG_TH, page_thresh);
- /*
- * REG_RXDMA_AGG_PG_TH + 1 seems to be the timeout register on
- * gen2 chips and rtl8188eu. The rtl8723au seems unhappy if we
- * don't set it, so better set both.
- */
- timeout = 4;
if (rtl8xxxu_dma_agg_timeout >= 0) {
if (rtl8xxxu_dma_agg_timeout <= 127)
--
2.30.2
