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

Commit 47ee3eb1 authored by Helmut Schaa's avatar Helmut Schaa Committed by John W. Linville
Browse files

rt2x00: Initialize AMPDU_BA_WINSIZE register 



Since we're not using the AMPDU_BA_WINSIZE register to force the BlockAck
window size (we specify it in every TXWI) we should initialize it to 0.

Signed-off-by: default avatarHelmut Schaa <helmut.schaa@googlemail.com>
Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 85f4d648

drivers/net/wireless/rt2x00/rt2800.h

+12 −0
Original line number Diff line number Diff line
@@ -638,6 +638,18 @@ 
#define LED_CFG_Y_LED_MODE		FIELD32(0x30000000)

#define LED_CFG_LED_POLAR		FIELD32(0x40000000)



/*

 * AMPDU_BA_WINSIZE: Force BlockAck window size

 * FORCE_WINSIZE_ENABLE:

 *   0: Disable forcing of BlockAck window size

 *   1: Enable forcing of BlockAck window size, overwrites values BlockAck

 *      window size values in the TXWI

 * FORCE_WINSIZE: BlockAck window size

 */

#define AMPDU_BA_WINSIZE		0x1040

#define AMPDU_BA_WINSIZE_FORCE_WINSIZE_ENABLE FIELD32(0x00000020)

#define AMPDU_BA_WINSIZE_FORCE_WINSIZE	FIELD32(0x0000001f)



/*

 * XIFS_TIME_CFG: MAC timing

 * CCKM_SIFS_TIME: unit 1us. Applied after CCK RX/TX

drivers/net/wireless/rt2x00/rt2800lib.c

+8 −0
Original line number Diff line number Diff line
@@ -2052,6 +2052,14 @@ static int rt2800_init_registers(struct rt2x00_dev *rt2x00dev) 
	rt2x00_set_field32(&reg, LG_FBK_CFG0_CCKMCS3FBK, 2);

	rt2800_register_write(rt2x00dev, LG_FBK_CFG1, reg);



	/*

	 * Do not force the BA window size, we use the TXWI to set it

	 */

	rt2800_register_read(rt2x00dev, AMPDU_BA_WINSIZE, &reg);

	rt2x00_set_field32(&reg, AMPDU_BA_WINSIZE_FORCE_WINSIZE_ENABLE, 0);

	rt2x00_set_field32(&reg, AMPDU_BA_WINSIZE_FORCE_WINSIZE, 0);

	rt2800_register_write(rt2x00dev, AMPDU_BA_WINSIZE, reg);



	/*

	 * We must clear the error counters.

	 * These registers are cleared on read,