diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2009-03-18 22:22:57 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2009-03-18 22:22:57 +0000 |
| commit | c84390332f33f83d92dbcccf0a969cb2bf3a84e7 (patch) | |
| tree | 44a59c0226c1e7fa82b89940f72fc0f59b9ee366 /package/mac80211/patches/307-rt2x00-Fix-HW-crypto-offset-calculation-rt2800usb.patch | |
| parent | 227399122b7cf9c95acd0d375c5aef6df2e73b57 (diff) | |
| download | upstream-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/307-rt2x00-Fix-HW-crypto-offset-calculation-rt2800usb.patch')
| -rw-r--r-- | package/mac80211/patches/307-rt2x00-Fix-HW-crypto-offset-calculation-rt2800usb.patch | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/package/mac80211/patches/307-rt2x00-Fix-HW-crypto-offset-calculation-rt2800usb.patch b/package/mac80211/patches/307-rt2x00-Fix-HW-crypto-offset-calculation-rt2800usb.patch deleted file mode 100644 index 11a915e6b6..0000000000 --- a/package/mac80211/patches/307-rt2x00-Fix-HW-crypto-offset-calculation-rt2800usb.patch +++ /dev/null @@ -1,35 +0,0 @@ -From d6368d8b77bb8568aa0c92adf1e507fb4198ff41 Mon Sep 17 00:00:00 2001 -From: Ivo van Doorn <IvDoorn@gmail.com> -Date: Wed, 4 Mar 2009 20:26:27 +0100 -Subject: [PATCH] rt2x00: Fix HW crypto offset calculation (rt2800usb) - -Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com> ---- - drivers/net/wireless/rt2x00/rt2800usb.c | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) - ---- a/drivers/net/wireless/rt2x00/rt2800usb.c -+++ b/drivers/net/wireless/rt2x00/rt2800usb.c -@@ -363,7 +363,8 @@ static void rt2800usb_config_wcid_attr(s - rt2x00usb_register_read(rt2x00dev, offset, ®); - rt2x00_set_field32(®, MAC_WCID_ATTRIBUTE_KEYTAB, - !!(key->flags & IEEE80211_KEY_FLAG_PAIRWISE)); -- rt2x00_set_field32(®, MAC_WCID_ATTRIBUTE_CIPHER, crypto->cipher); -+ rt2x00_set_field32(®, MAC_WCID_ATTRIBUTE_CIPHER, -+ (crypto->cmd == SET_KEY) * crypto->cipher); - rt2x00_set_field32(®, MAC_WCID_ATTRIBUTE_BSS_IDX, - (crypto->cmd == SET_KEY) * crypto->bssidx); - rt2x00_set_field32(®, MAC_WCID_ATTRIBUTE_RX_WIUDF, crypto->cipher); -@@ -425,10 +426,10 @@ static int rt2800usb_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); - - rt2x00usb_register_read(rt2x00dev, offset, ®); - rt2x00_set_field32(®, field, |