rt2800: change default retry settings (01d97ef4) · Commits · 戴 / test

We do not have option to set per frame retry count. We have only global TX_RTY_CFG registers which specify the number or retries. Set setting of that register to value that correspond rate control algorithm number of frame post (number of retries + 1), which is 3 for aggregated frames. This should help with big amount of retries on bad conditions, hence mitigate buffer-bloat like problems. Signed-off-by:

Stanislaw Gruszka <sgruszka@redhat.com> Signed-off-by:

Kalle Valo <kvalo@codeaurora.org>

drivers/net/wireless/ralink/rt2x00/rt2800lib.c

+9 −2

Original line number	Diff line number	Diff line
		@@ -4769,8 +4769,8 @@ static int rt2800_init_registers(struct rt2x00_dev *rt2x00dev)
		rt2800_register_write(rt2x00dev, PBF_MAX_PCNT, 0x1f3fbf9f);

		rt2800_register_read(rt2x00dev, TX_RTY_CFG, &reg);
		rt2x00_set_field32(&reg, TX_RTY_CFG_SHORT_RTY_LIMIT, 15);
		rt2x00_set_field32(&reg, TX_RTY_CFG_LONG_RTY_LIMIT, 31);
		rt2x00_set_field32(&reg, TX_RTY_CFG_SHORT_RTY_LIMIT, 2);
		rt2x00_set_field32(&reg, TX_RTY_CFG_LONG_RTY_LIMIT, 2);
		rt2x00_set_field32(&reg, TX_RTY_CFG_LONG_RTY_THRE, 2000);
		rt2x00_set_field32(&reg, TX_RTY_CFG_NON_AGG_RTY_MODE, 0);
		rt2x00_set_field32(&reg, TX_RTY_CFG_AGG_RTY_MODE, 0);
		@@ -7513,6 +7513,13 @@ static int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
		*/
		rt2x00dev->hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;

		/*
		* Change default retry settings to values corresponding more closely
		* to rate[0].count setting of minstrel rate control algorithm.
		*/
		rt2x00dev->hw->wiphy->retry_short = 2;
		rt2x00dev->hw->wiphy->retry_long = 2;

		/*
		* Initialize all hw fields.
		*/

Admin message