Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

rt2x00: Don't overwrite beacon buffers in pairwise key setup

Browse source 
rt2800 devices use parts of the pariwise key table to store the beacon
frames for beacon 6 and 7. To not overwrite the beacon frame buffers
limit the number of entries we store in the pairwise key table to 222.

Also add some descriptive comments about this shared memory usage.

Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>
Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Helmut Schaa 2010-10-02 11:26:17 +02:00 committed by John W. Linville
parent 1a92795dac
commit 2a0cfeb826
2 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
drivers/net/wireless/rt2x00/rt2800.h
View file

@ -1435,6 +1435,24 @@
/*
* Security key table memory.
*
* The pairwise key table shares some memory with the beacon frame
* buffers 6 and 7. That basically means that when beacon 6 & 7
* are used we should only use the reduced pairwise key table which
* has a maximum of 222 entries.
*
* ---------------------------------------------
* |0x4000 | Pairwise Key | Reduced Pairwise |
* | | Table | Key Table |
* | | Size: 256 * 32 | Size: 222 * 32 |
* |0x5BC0 | |-------------------
* | | | Beacon 6 |
* |0x5DC0 | |-------------------
* | | | Beacon 7 |
* |0x5FC0 | |-------------------
* |0x5FFF | |
* --------------------------
*
* MAC_WCID_BASE: 8-bytes (use only 6 bytes) * 256 entry
* PAIRWISE_KEY_TABLE_BASE: 32-byte * 256 entry
* MAC_IVEIV_TABLE_BASE: 8-byte * 256-entry
@ -1584,7 +1602,8 @@ struct mac_iveiv_entry {
* 2. Extract memory from FCE table for BCN 4~5
* 3. Extract memory from Pair-wise key table for BCN 6~7
* It occupied those memory of wcid 238~253 for BCN 6
* and wcid 222~237 for BCN 7
* and wcid 222~237 for BCN 7 (see Security key table memory
* for more info).
*
* IMPORTANT NOTE: Not sure why legacy driver does this,
* but HW_BEACON_BASE7 is 0x0200 bytes below HW_BEACON_BASE6.

6
drivers/net/wireless/rt2x00/rt2800lib.c
View file

@ -1031,8 +1031,12 @@ int rt2800_config_pairwise_key(struct rt2x00_dev *rt2x00dev,
* 1 pairwise key is possible per AID, this means that the AID
* equals our hw_key_idx. Make sure the WCID starts _after_ the
* last possible shared key entry.
*
* Since parts of the pairwise key table might be shared with
* the beacon frame buffers 6 & 7 we should only write into the
* first 222 entries.
*/
if (crypto->aid > (256 - 32))
if (crypto->aid > (222 - 32))
return -ENOSPC;
key->hw_key_idx = 32 + crypto->aid;