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

Commit 1738c9e4 authored by Ivo van Doorn's avatar Ivo van Doorn Committed by John W. Linville
Browse files

rt2x00: Fix for rt2800usb for SHARED_KEY_TABLE initializations 



Fixed comments about SHARED_KEY_TABLE_BASE and SHARED_KEY_MODE_BASE.
Fixed initialization loop for SHARED_KEY_MODE_ENTRY.

Based on a patch for rt2800pci from Benoit.

Signed-off-by: default avatarBenoit PAPILLAULT <benoit.papillault@free.fr>
Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 73077c85

drivers/net/wireless/rt2x00/rt2800usb.c

+4 −4
Original line number Diff line number Diff line
@@ -1463,6 +1463,10 @@ static int rt2800usb_init_registers(struct rt2x00_dev *rt2x00dev) 
	/*

	 * ASIC will keep garbage value after boot, clear encryption keys.

	 */

	for (i = 0; i < 4; i++)

		rt2x00usb_register_write(rt2x00dev,

					 SHARED_KEY_MODE_ENTRY(i), 0);



	for (i = 0; i < 256; i++) {

		u32 wcid[2] = { 0xffffffff, 0x00ffffff };

		rt2x00usb_register_multiwrite(rt2x00dev, MAC_WCID_ENTRY(i),
@@ -1472,10 +1476,6 @@ static int rt2800usb_init_registers(struct rt2x00_dev *rt2x00dev) 
		rt2x00usb_register_write(rt2x00dev, MAC_IVEIV_ENTRY(i), 0);

	}



	for (i = 0; i < 16; i++)

		rt2x00usb_register_write(rt2x00dev,

					 SHARED_KEY_MODE_ENTRY(i), 0);



	/*

	 * Clear all beacons

	 * For the Beacon base registers we only need to clear

drivers/net/wireless/rt2x00/rt2800usb.h

+2 −2
Original line number Diff line number Diff line
@@ -1300,8 +1300,8 @@ 
 * PAIRWISE_KEY_TABLE_BASE: 32-byte * 256 entry

 * MAC_IVEIV_TABLE_BASE: 8-byte * 256-entry

 * MAC_WCID_ATTRIBUTE_BASE: 4-byte * 256-entry

 * SHARED_KEY_TABLE_BASE: 32-byte * 16-entry

 * SHARED_KEY_MODE_BASE: 4-byte * 16-entry

 * SHARED_KEY_TABLE_BASE: 32 bytes * 32-entry

 * SHARED_KEY_MODE_BASE: 4 bits * 32-entry

 */

#define MAC_WCID_BASE			0x1800

#define PAIRWISE_KEY_TABLE_BASE		0x4000