aboutsummaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/306-rt2x00-Fix-HW-crypto-offset-calculation-rt2800pci.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2009-03-18 22:22:57 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2009-03-18 22:22:57 +0000
commitc84390332f33f83d92dbcccf0a969cb2bf3a84e7 (patch)
tree44a59c0226c1e7fa82b89940f72fc0f59b9ee366 /package/mac80211/patches/306-rt2x00-Fix-HW-crypto-offset-calculation-rt2800pci.patch
parent227399122b7cf9c95acd0d375c5aef6df2e73b57 (diff)
downloadupstream-c84390332f33f83d92dbcccf0a969cb2bf3a84e7.tar.gz
upstream-c84390332f33f83d92dbcccf0a969cb2bf3a84e7.tar.bz2
upstream-c84390332f33f83d92dbcccf0a969cb2bf3a84e7.zip
Update compat-wireless to 2009-03-18
Removing of include/net/ieee80211_radiotap.h is not needed, because it is only used by this compat-wireless. There are changes in that file and compat-wireless needs the newest version. Some more symbols are deactivated in the default config file, this will make building faster. The rt2800pci patches are up to date now. SVN-Revision: 14946
Diffstat (limited to 'package/mac80211/patches/306-rt2x00-Fix-HW-crypto-offset-calculation-rt2800pci.patch')
-rw-r--r--package/mac80211/patches/306-rt2x00-Fix-HW-crypto-offset-calculation-rt2800pci.patch36
1 files changed, 0 insertions, 36 deletions
diff --git a/package/mac80211/patches/306-rt2x00-Fix-HW-crypto-offset-calculation-rt2800pci.patch b/package/mac80211/patches/306-rt2x00-Fix-HW-crypto-offset-calculation-rt2800pci.patch
deleted file mode 100644
index 1fbef6c434..0000000000
--- a/package/mac80211/patches/306-rt2x00-Fix-HW-crypto-offset-calculation-rt2800pci.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From e63585e28192e854707c549547645c669e6daa2a Mon Sep 17 00:00:00 2001
-From: Ivo van Doorn <IvDoorn@gmail.com>
-Date: Wed, 4 Mar 2009 20:25:43 +0100
-Subject: [PATCH] rt2x00: Fix HW crypto offset calculation (rt2800pci)
-
-Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
----
- drivers/net/wireless/rt2x00/rt2800pci.c | 8 +++++---
- 1 files changed, 5 insertions(+), 3 deletions(-)
-
---- a/drivers/net/wireless/rt2x00/rt2800pci.c
-+++ b/drivers/net/wireless/rt2x00/rt2800pci.c
-@@ -336,7 +336,8 @@ static void rt2800pci_config_wcid_attr(s
- rt2x00pci_register_read(rt2x00dev, offset, &reg);
- rt2x00_set_field32(&reg, MAC_WCID_ATTRIBUTE_KEYTAB,
- !!(key->flags & IEEE80211_KEY_FLAG_PAIRWISE));
-- rt2x00_set_field32(&reg, MAC_WCID_ATTRIBUTE_CIPHER, crypto->cipher);
-+ rt2x00_set_field32(&reg, MAC_WCID_ATTRIBUTE_CIPHER,
-+ (crypto->cmd == SET_KEY) * crypto->cipher);
- rt2x00_set_field32(&reg, MAC_WCID_ATTRIBUTE_BSS_IDX,
- (crypto->cmd == SET_KEY) * crypto->bssidx);
- rt2x00_set_field32(&reg, MAC_WCID_ATTRIBUTE_RX_WIUDF, crypto->cipher);
-@@ -393,10 +394,11 @@ static int rt2800pci_config_shared_key(s
- * Using the correct defines correctly will cause overhead,
- * so just calculate the correct offset.
- */
-- field.bit_offset = (4 * key->keyidx) + (16 * (crypto->bssidx & 1));
-+ field.bit_offset = 4 * (key->hw_key_idx % 8);
- field.bit_mask = 0x7 << field.bit_offset;
-
-- offset = SHARED_KEY_MODE_ENTRY(key->hw_key_idx / 2);
-+ offset = SHARED_KEY_MODE_ENTRY(key->hw_key_idx / 8);
-+
- rt2x00pci_register_read(rt2x00dev, offset, &reg);
- rt2x00_set_field32(&reg, field,
- (crypto->cmd == SET_KEY) * crypto->cipher);