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

Commit be82de9d authored by Stanislaw Gruszka's avatar Stanislaw Gruszka Committed by Kalle Valo
Browse files

rt2800: correct AUTO_RSP_CFG 



Initialize AUTO_RSP_CFG register to similar value as vendor driver does.

Do not set BAC_ACK_POLICY based on short preamble setting, those are
unrelated.

Signed-off-by: default avatarStanislaw Gruszka <sgruszka@redhat.com>
Signed-off-by: default avatarKalle Valo <kvalo@codeaurora.org>
parent b4c449b1

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

+2 −4
Original line number Diff line number Diff line
@@ -1691,8 +1691,6 @@ void rt2800_config_erp(struct rt2x00_dev *rt2x00dev, struct rt2x00lib_erp *erp, 


	if (changed & BSS_CHANGED_ERP_PREAMBLE) {

		rt2800_register_read(rt2x00dev, AUTO_RSP_CFG, &reg);

		rt2x00_set_field32(&reg, AUTO_RSP_CFG_BAC_ACK_POLICY,

				   !!erp->short_preamble);

		rt2x00_set_field32(&reg, AUTO_RSP_CFG_AR_PREAMBLE,

				   !!erp->short_preamble);

		rt2800_register_write(rt2x00dev, AUTO_RSP_CFG, reg);
@@ -4735,9 +4733,9 @@ static int rt2800_init_registers(struct rt2x00_dev *rt2x00dev) 
	rt2800_register_read(rt2x00dev, AUTO_RSP_CFG, &reg);

	rt2x00_set_field32(&reg, AUTO_RSP_CFG_AUTORESPONDER, 1);

	rt2x00_set_field32(&reg, AUTO_RSP_CFG_BAC_ACK_POLICY, 1);

	rt2x00_set_field32(&reg, AUTO_RSP_CFG_CTS_40_MMODE, 0);

	rt2x00_set_field32(&reg, AUTO_RSP_CFG_CTS_40_MMODE, 1);

	rt2x00_set_field32(&reg, AUTO_RSP_CFG_CTS_40_MREF, 0);

	rt2x00_set_field32(&reg, AUTO_RSP_CFG_AR_PREAMBLE, 1);

	rt2x00_set_field32(&reg, AUTO_RSP_CFG_AR_PREAMBLE, 0);

	rt2x00_set_field32(&reg, AUTO_RSP_CFG_DUAL_CTS_EN, 0);

	rt2x00_set_field32(&reg, AUTO_RSP_CFG_ACK_CTS_PSM_BIT, 0);

	rt2800_register_write(rt2x00dev, AUTO_RSP_CFG, reg);