mac80211: update compat-wireless to 2009-03-04, and refresh patches
[openwrt/openwrt.git] / package / mac80211 / patches / 304-rt2x00-Detect-cypher-type-during-RX-rt2800pci.patch
1 From f23c3d3175e55ebac81d6e29f1c1415491a78d60 Mon Sep 17 00:00:00 2001
2 From: Ivo van Doorn <IvDoorn@gmail.com>
3 Date: Tue, 3 Mar 2009 20:12:44 +0100
4 Subject: [PATCH] rt2x00: Detect cypher type during RX (rt2800pci)
5
6 Use UDF field in WCID entry to pass the cipher type
7 to the RXWI fields. This will allow keeping track of
8 the number of frames received with a particular cipher type
9 which is exported through debugfs.
10
11 Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
12 ---
13 drivers/net/wireless/rt2x00/rt2800pci.c | 4 ++--
14 1 files changed, 2 insertions(+), 2 deletions(-)
15
16 --- a/drivers/net/wireless/rt2x00/rt2800pci.c
17 +++ b/drivers/net/wireless/rt2x00/rt2800pci.c
18 @@ -339,7 +339,7 @@ static void rt2800pci_config_wcid_attr(s
19 rt2x00_set_field32(&reg, MAC_WCID_ATTRIBUTE_CIPHER, crypto->cipher);
20 rt2x00_set_field32(&reg, MAC_WCID_ATTRIBUTE_BSS_IDX,
21 (crypto->cmd == SET_KEY) * crypto->bssidx);
22 - rt2x00_set_field32(&reg, MAC_WCID_ATTRIBUTE_RX_WIUDF, 0);
23 + rt2x00_set_field32(&reg, MAC_WCID_ATTRIBUTE_RX_WIUDF, crypto->cipher);
24 rt2x00pci_register_write(rt2x00dev, offset, reg);
25
26 offset = MAC_IVEIV_ENTRY(key->hw_key_idx);
27 @@ -1980,7 +1980,7 @@ static void rt2800pci_fill_rxdone(struct
28 * decryption. This prevents us from correct providing
29 * correct statistics through debugfs.
30 */
31 - rxdesc->cipher = CIPHER_NONE;
32 + rxdesc->cipher = rt2x00_get_field32(rxwi0, RXWI_W0_UDF);
33 rxdesc->cipher_status =
34 rt2x00_get_field32(rxd3, RXD_W3_CIPHER_ERROR);
35 }