summaryrefslogtreecommitdiffstats
path: root/package/mac80211/patches/324-rt2x00-Correctly-initialize-TXINFO-for-crypto-rt28.patch
diff options
context:
space:
mode:
authorjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-02-26 18:03:20 +0000
committerjuhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-02-26 18:03:20 +0000
commite93015c4d471dd96723008344b3008afa6ff4177 (patch)
treeb1ea20b400f6e6c50a88ab63c484251d5414419e /package/mac80211/patches/324-rt2x00-Correctly-initialize-TXINFO-for-crypto-rt28.patch
parentc1ae60e7df285725b5ba0b8050c58ec8bc664408 (diff)
[package] mac80211: update compat-wireless to 2009-02-25
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14675 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/mac80211/patches/324-rt2x00-Correctly-initialize-TXINFO-for-crypto-rt28.patch')
-rw-r--r--package/mac80211/patches/324-rt2x00-Correctly-initialize-TXINFO-for-crypto-rt28.patch17
1 files changed, 6 insertions, 11 deletions
diff --git a/package/mac80211/patches/324-rt2x00-Correctly-initialize-TXINFO-for-crypto-rt28.patch b/package/mac80211/patches/324-rt2x00-Correctly-initialize-TXINFO-for-crypto-rt28.patch
index 954df8de5..929cdbe42 100644
--- a/package/mac80211/patches/324-rt2x00-Correctly-initialize-TXINFO-for-crypto-rt28.patch
+++ b/package/mac80211/patches/324-rt2x00-Correctly-initialize-TXINFO-for-crypto-rt28.patch
@@ -8,11 +8,9 @@ Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
drivers/net/wireless/rt2x00/rt2800pci.c | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
-diff --git a/drivers/net/wireless/rt2x00/rt2800pci.c b/drivers/net/wireless/rt2x00/rt2800pci.c
-index 63d6499..9fd6fa2 100644
--- a/drivers/net/wireless/rt2x00/rt2800pci.c
+++ b/drivers/net/wireless/rt2x00/rt2800pci.c
-@@ -331,7 +331,7 @@ static void rt2800pci_config_wcid_attr(struct rt2x00_dev *rt2x00dev,
+@@ -331,7 +331,7 @@ static void rt2800pci_config_wcid_attr(s
u32 offset;
u32 reg;
@@ -21,7 +19,7 @@ index 63d6499..9fd6fa2 100644
rt2x00pci_register_read(rt2x00dev, offset, &reg);
rt2x00_set_field32(&reg, MAC_WCID_ATTRIBUTE_KEYTAB,
-@@ -342,7 +342,7 @@ static void rt2800pci_config_wcid_attr(struct rt2x00_dev *rt2x00dev,
+@@ -342,7 +342,7 @@ static void rt2800pci_config_wcid_attr(s
rt2x00_set_field32(&reg, MAC_WCID_ATTRIBUTE_RX_WIUDF, 0);
rt2x00pci_register_write(rt2x00dev, offset, reg);
@@ -30,7 +28,7 @@ index 63d6499..9fd6fa2 100644
memset(&iveiv_entry, 0, sizeof(iveiv_entry));
if ((crypto->cipher == CIPHER_TKIP) ||
-@@ -353,7 +353,7 @@ static void rt2800pci_config_wcid_attr(struct rt2x00_dev *rt2x00dev,
+@@ -353,7 +353,7 @@ static void rt2800pci_config_wcid_attr(s
rt2x00pci_register_multiwrite(rt2x00dev, offset,
&iveiv_entry, sizeof(iveiv_entry));
@@ -39,7 +37,7 @@ index 63d6499..9fd6fa2 100644
memset(&wcid_entry, 0, sizeof(wcid_entry));
if (crypto->cmd == SET_KEY)
-@@ -393,10 +393,10 @@ static int rt2800pci_config_shared_key(struct rt2x00_dev *rt2x00dev,
+@@ -393,10 +393,10 @@ static int rt2800pci_config_shared_key(s
* Using the correct defines correctly will cause overhead,
* so just calculate the correct offset.
*/
@@ -52,7 +50,7 @@ index 63d6499..9fd6fa2 100644
rt2x00pci_register_read(rt2x00dev, offset, &reg);
rt2x00_set_field32(&reg, field,
(crypto->cmd == SET_KEY) * crypto->cipher);
-@@ -1813,16 +1813,15 @@ static void rt2800pci_write_tx_desc(struct rt2x00_dev *rt2x00dev,
+@@ -1813,16 +1813,15 @@ static void rt2800pci_write_tx_desc(stru
test_bit(ENTRY_TXD_GENERATE_SEQ, &txdesc->flags));
rt2x00_set_field32(&word, TXWI_W1_BW_WIN_SIZE, txdesc->ba_size);
rt2x00_set_field32(&word, TXWI_W1_WIRELESS_CLI_ID,
@@ -73,7 +71,7 @@ index 63d6499..9fd6fa2 100644
/*
* Initialize TX descriptor
-@@ -1849,7 +1848,8 @@ static void rt2800pci_write_tx_desc(struct rt2x00_dev *rt2x00dev,
+@@ -1849,7 +1848,8 @@ static void rt2800pci_write_tx_desc(stru
rt2x00_desc_write(txd, 2, word);
rt2x00_desc_read(txd, 3, &word);
@@ -83,6 +81,3 @@ index 63d6499..9fd6fa2 100644
rt2x00_set_field32(&word, TXD_W3_QSEL, 2);
rt2x00_desc_write(txd, 3, word);
}
---
-1.6.0
-