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

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

rt2x00: Synchronize WCID initialization with legacy driver 



Legacy rt2870 driver handles WCID differently then we expected,
the BSSID and Cipher value are 3 bit values, while the 4th bit
should be set elsewhere in an extended field.

After this, rt2800usb reports frames have been decrypted
successfully, indicating that the Hardware decryption now is
working correctly.

Signed-off-by: default avatarIvo van Doorn <IvDoorn@gmail.com>
Acked-by: default avatarGertjan van Wingerde <gwingerde@gmail.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 04f1e34d

drivers/net/wireless/rt2x00/rt2800.h

+4 −0
Original line number Original line Diff line number Diff line
@@ -1436,6 +1436,10 @@ struct mac_iveiv_entry { 
#define MAC_WCID_ATTRIBUTE_CIPHER	FIELD32(0x0000000e)

#define MAC_WCID_ATTRIBUTE_CIPHER	FIELD32(0x0000000e)

#define MAC_WCID_ATTRIBUTE_BSS_IDX	FIELD32(0x00000070)

#define MAC_WCID_ATTRIBUTE_BSS_IDX	FIELD32(0x00000070)

#define MAC_WCID_ATTRIBUTE_RX_WIUDF	FIELD32(0x00000380)

#define MAC_WCID_ATTRIBUTE_RX_WIUDF	FIELD32(0x00000380)

#define MAC_WCID_ATTRIBUTE_CIPHER_EXT	FIELD32(0x00000400)

#define MAC_WCID_ATTRIBUTE_BSS_IDX_EXT	FIELD32(0x00000800)

#define MAC_WCID_ATTRIBUTE_WAPI_MCBC	FIELD32(0x00008000)

#define MAC_WCID_ATTRIBUTE_WAPI_KEY_IDX	FIELD32(0xff000000)





/*

/*

 * SHARED_KEY_MODE:

 * SHARED_KEY_MODE:

drivers/net/wireless/rt2x00/rt2800lib.c

+22 −9
Original line number Original line Diff line number Diff line
@@ -554,15 +554,28 @@ static void rt2800_config_wcid_attr(struct rt2x00_dev *rt2x00dev, 




	offset = MAC_WCID_ATTR_ENTRY(key->hw_key_idx);

	offset = MAC_WCID_ATTR_ENTRY(key->hw_key_idx);





	if (crypto->cmd == SET_KEY) {

		rt2800_register_read(rt2x00dev, offset, &reg);

		rt2800_register_read(rt2x00dev, offset, &reg);

		rt2x00_set_field32(&reg, MAC_WCID_ATTRIBUTE_KEYTAB,

		rt2x00_set_field32(&reg, MAC_WCID_ATTRIBUTE_KEYTAB,

				   !!(key->flags & IEEE80211_KEY_FLAG_PAIRWISE));

				   !!(key->flags & IEEE80211_KEY_FLAG_PAIRWISE));

		/*

		 * Both the cipher as the BSS Idx numbers are split in a main

		 * value of 3 bits, and a extended field for adding one additional

		 * bit to the value.

		 */

		rt2x00_set_field32(&reg, MAC_WCID_ATTRIBUTE_CIPHER,

		rt2x00_set_field32(&reg, MAC_WCID_ATTRIBUTE_CIPHER,

			   (crypto->cmd == SET_KEY) * crypto->cipher);

				   (crypto->cipher & 0x7));

		rt2x00_set_field32(&reg, MAC_WCID_ATTRIBUTE_CIPHER_EXT,

				   (crypto->cipher & 0x8) >> 3);

		rt2x00_set_field32(&reg, MAC_WCID_ATTRIBUTE_BSS_IDX,

		rt2x00_set_field32(&reg, MAC_WCID_ATTRIBUTE_BSS_IDX,

			   (crypto->cmd == SET_KEY) * crypto->bssidx);

				   (crypto->bssidx & 0x7));

		rt2x00_set_field32(&reg, MAC_WCID_ATTRIBUTE_BSS_IDX_EXT,

				   (crypto->bssidx & 0x8) >> 3);

		rt2x00_set_field32(&reg, MAC_WCID_ATTRIBUTE_RX_WIUDF, crypto->cipher);

		rt2x00_set_field32(&reg, MAC_WCID_ATTRIBUTE_RX_WIUDF, crypto->cipher);

		rt2800_register_write(rt2x00dev, offset, reg);

		rt2800_register_write(rt2x00dev, offset, reg);

	} else {

		rt2800_register_write(rt2x00dev, offset, 0);

	}





	offset = MAC_IVEIV_ENTRY(key->hw_key_idx);

	offset = MAC_IVEIV_ENTRY(key->hw_key_idx);