mac80211: update compat-wireless to 2009-02-07

SVN-Revision: 14434

1 files changed, 155 insertions, 136 deletions

diff --git a/package/mac80211/patches/303-rt2x00-Implement-support-for-rt2800usb.patch b/package/mac80211/patches/303-rt2x00-Implement-support-for-rt2800usb.patch
index 1da4725e88..75b478d0f9 100644
--- a/package/mac80211/patches/303-rt2x00-Implement-support-for-rt2800usb.patch
+++ b/package/mac80211/patches/303-rt2x00-Implement-support-for-rt2800usb.patch
@@ -1,6 +1,6 @@
-From e380f1fa260d81cba1ebb1b6c333ef8c31f2a8c5 Mon Sep 17 00:00:00 2001
+From ec4f9f97afa3f792cf64035b8458bf2f8648a76f Mon Sep 17 00:00:00 2001
 From: Ivo van Doorn <IvDoorn@gmail.com>
-Date: Fri, 23 Jan 2009 17:16:11 +0100
+Date: Wed, 4 Feb 2009 20:45:56 +0100
 Subject: [PATCH] rt2x00: Implement support for rt2800usb
 
 Add support for the rt2800usb chipset.
@@ -13,10 +13,10 @@ Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
 ---
  drivers/net/wireless/rt2x00/Kconfig     |   14 +
  drivers/net/wireless/rt2x00/Makefile    |    1 +
- drivers/net/wireless/rt2x00/rt2800usb.c | 2905 +++++++++++++++++++++++++++++++
- drivers/net/wireless/rt2x00/rt2800usb.h | 1944 +++++++++++++++++++++
+ drivers/net/wireless/rt2x00/rt2800usb.c | 2928 +++++++++++++++++++++++++++++++
+ drivers/net/wireless/rt2x00/rt2800usb.h | 1940 ++++++++++++++++++++
  drivers/net/wireless/rt2x00/rt2x00.h    |    7 +
- 5 files changed, 4871 insertions(+), 0 deletions(-)
+ 5 files changed, 4890 insertions(+), 0 deletions(-)
  create mode 100644 drivers/net/wireless/rt2x00/rt2800usb.c
  create mode 100644 drivers/net/wireless/rt2x00/rt2800usb.h
 
@@ -29,7 +29,7 @@ Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
 +obj-$(CONFIG_RT2800USB)			+= rt2800usb.o
 --- /dev/null
 +++ b/drivers/net/wireless/rt2x00/rt2800usb.c
-@@ -0,0 +1,2905 @@
+@@ -0,0 +1,2928 @@
 +/*
 +	Copyright (C) 2004 - 2009 rt2x00 SourceForge Project
 +	<http://rt2x00.serialmonkey.com>
@@ -388,20 +388,40 @@ Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
 +				       struct rt2x00lib_crypto *crypto,
 +				       struct ieee80211_key_conf *key)
 +{
++	struct mac_wcid_entry wcid_entry;
++	struct mac_iveiv_entry iveiv_entry;
 +	u32 offset;
 +	u32 reg;
 +
 +	offset = MAC_WCID_ATTR_ENTRY(crypto->aid);
 +
-+	reg = 0;
++	rt2x00usb_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_PAIRKEY_MODE,
-+			   crypto->cipher);
++	rt2x00_set_field32(&reg, MAC_WCID_ATTRIBUTE_CIPHER, crypto->cipher);
 +	rt2x00_set_field32(&reg, MAC_WCID_ATTRIBUTE_BSS_IDX,
-+			   (crypto->cmd == SET_KEY) ? crypto->bssidx : 0);
++			   (crypto->cmd == SET_KEY) * crypto->bssidx);
 +	rt2x00_set_field32(&reg, MAC_WCID_ATTRIBUTE_RX_WIUDF, 0);
 +	rt2x00usb_register_write(rt2x00dev, offset, reg);
++
++	offset = MAC_IVEIV_ENTRY(crypto->aid);
++
++	memset(&iveiv_entry, 0, sizeof(iveiv_entry));
++	if ((crypto->cipher == CIPHER_TKIP) ||
++	    (crypto->cipher == CIPHER_TKIP_NO_MIC) ||
++	    (crypto->cipher == CIPHER_AES))
++		iveiv_entry.iv[3] |= 0x20;
++	iveiv_entry.iv[3] |= key->keyidx << 6;
++	rt2x00usb_register_multiwrite(rt2x00dev, offset,
++				      &iveiv_entry, sizeof(iveiv_entry));
++
++	offset = MAC_WCID_ENTRY(crypto->aid);
++
++	memset(&wcid_entry, 0, sizeof(wcid_entry));
++	if (crypto->cmd == SET_KEY)
++		memcpy(&wcid_entry, crypto->address, ETH_ALEN);
++	rt2x00usb_register_multiwrite(rt2x00dev, offset,
++				      &wcid_entry, sizeof(wcid_entry));
 +}
 +
 +static int rt2800usb_config_shared_key(struct rt2x00_dev *rt2x00dev,
@@ -412,10 +432,11 @@ Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
 +	struct rt2x00_field32 field;
 +	int timeout;
 +	u32 offset;
-+	u32 mask;
 +	u32 reg;
 +
 +	if (crypto->cmd == SET_KEY) {
++		key->hw_key_idx = (4 * crypto->bssidx) + key->keyidx;
++
 +		memcpy(key_entry.key, crypto->key,
 +		       sizeof(key_entry.key));
 +		memcpy(key_entry.tx_mic, crypto->tx_mic,
@@ -430,34 +451,23 @@ Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
 +						    offset, &key_entry,
 +						    sizeof(key_entry),
 +						    timeout);
-+
-+		/*
-+		 * The driver does not support the IV/EIV generation
-+		 * in hardware. However it doesn't support the IV/EIV
-+		 * inside the ieee80211 frame either, but requires it
-+		 * to be provided seperately for the descriptor.
-+		 * rt2x00lib will cut the IV/EIV data out of all frames
-+		 * given to us by mac80211, but we must tell mac80211
-+		 * to generate the IV/EIV data.
-+		 */
-+		key->flags |= IEEE80211_KEY_FLAG_GENERATE_IV;
 +	}
 +
 +	/*
 +	 * The cipher types are stored over multiple registers
 +	 * starting with SHARED_KEY_MODE_BASE each word will have
-+	 * 32 bits and contains the cipher types for 2 modes each.
++	 * 32 bits and contains the cipher types for 2 bssidx each.
 +	 * Using the correct defines correctly will cause overhead,
 +	 * so just calculate the correct offset.
 +	 */
-+	mask = key->hw_key_idx % 8;
-+	field.bit_offset = (3 * mask);
++	field.bit_offset = (4 * key->keyidx);
 +	field.bit_mask = 0x7 << field.bit_offset;
 +
 +	offset = SHARED_KEY_MODE_ENTRY(key->hw_key_idx / 8);
++
 +	rt2x00usb_register_read(rt2x00dev, offset, &reg);
 +	rt2x00_set_field32(&reg, field,
-+			   (crypto->cmd == SET_KEY) ? crypto->cipher : 0);
++			   (crypto->cmd == SET_KEY) * crypto->cipher);
 +	rt2x00usb_register_write(rt2x00dev, offset, reg);
 +
 +	/*
@@ -476,13 +486,13 @@ Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
 +	int timeout;
 +	u32 offset;
 +
-+	/*
-+	 * 1 pairwise key is possible per AID, this means that the AID
-+	 * equals our hw_key_idx.
-+	 */
-+	key->hw_key_idx = crypto->aid;
-+
 +	if (crypto->cmd == SET_KEY) {
++		/*
++		 * 1 pairwise key is possible per AID, this means that the AID
++		 * equals our hw_key_idx.
++		 */
++		key->hw_key_idx = crypto->aid;
++
 +		memcpy(key_entry.key, crypto->key,
 +		       sizeof(key_entry.key));
 +		memcpy(key_entry.tx_mic, crypto->tx_mic,
@@ -497,17 +507,6 @@ Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
 +						    offset, &key_entry,
 +						    sizeof(key_entry),
 +						    timeout);
-+
-+		/*
-+		 * The driver does not support the IV/EIV generation
-+		 * in hardware. However it doesn't support the IV/EIV
-+		 * inside the ieee80211 frame either, but requires it
-+		 * to be provided seperately for the descriptor.
-+		 * rt2x00lib will cut the IV/EIV data out of all frames
-+		 * given to us by mac80211, but we must tell mac80211
-+		 * to generate the IV/EIV data.
-+		 */
-+		key->flags |= IEEE80211_KEY_FLAG_GENERATE_IV;
 +	}
 +
 +	/*
@@ -555,7 +554,7 @@ Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
 +	rt2x00_set_field32(&reg, RX_FILTER_CFG_DROP_PSPOLL,
 +			   !(filter_flags & FIF_CONTROL));
 +	rt2x00_set_field32(&reg, RX_FILTER_CFG_DROP_BA, 1);
-+	rt2x00_set_field32(&reg, RX_FILTER_CFG_DROP_BAR, 1);
++	rt2x00_set_field32(&reg, RX_FILTER_CFG_DROP_BAR, 0);
 +	rt2x00_set_field32(&reg, RX_FILTER_CFG_DROP_CNTL,
 +			   !(filter_flags & FIF_CONTROL));
 +	rt2x00usb_register_write(rt2x00dev, RX_FILTER_CFG, reg);
@@ -616,7 +615,7 @@ Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
 +
 +	rt2x00usb_register_read(rt2x00dev, TX_TIMEOUT_CFG, &reg);
 +	rt2x00_set_field32(&reg, TX_TIMEOUT_CFG_RX_ACK_TIMEOUT,
-+			   erp->ack_timeout);
++			   DIV_ROUND_UP(erp->ack_timeout, erp->slot_time));
 +	rt2x00usb_register_write(rt2x00dev, TX_TIMEOUT_CFG, reg);
 +
 +	rt2x00usb_register_read(rt2x00dev, AUTO_RSP_CFG, &reg);
@@ -633,8 +632,7 @@ Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
 +
 +	rt2x00usb_register_write(rt2x00dev, LEGACY_BASIC_RATE,
 +				 erp->basic_rates);
-+	rt2x00usb_register_write(rt2x00dev, HT_BASIC_RATE,
-+				 erp->basic_rates >> 32);
++	rt2x00usb_register_write(rt2x00dev, HT_BASIC_RATE, 0x00008003);
 +
 +	rt2x00usb_register_read(rt2x00dev, BKOFF_SLOT_CFG, &reg);
 +	rt2x00_set_field32(&reg, BKOFF_SLOT_CFG_SLOT_TIME, erp->slot_time);
@@ -1067,12 +1065,6 @@ Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
 +	 */
 +	rt2x00usb_register_read(rt2x00dev, RX_STA_CNT0, &reg);
 +	qual->rx_failed = rt2x00_get_field32(reg, RX_STA_CNT0_CRC_ERR);
-+
-+	/*
-+	 * Update False CCA count from register.
-+	 */
-+	rt2x00usb_register_read(rt2x00dev, RX_STA_CNT1, &reg);
-+	qual->false_cca = rt2x00_get_field32(reg, RX_STA_CNT1_FALSE_CCA);
 +}
 +
 +static u8 rt2800usb_get_default_vgc(struct rt2x00_dev *rt2x00dev)
@@ -1129,19 +1121,24 @@ Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
 +	return FIRMWARE_RT2870;
 +}
 +
-+static u16 rt2800usb_get_firmware_crc(const void *data, const size_t len)
++static bool rt2800usb_check_crc(const u8 *data, const size_t len)
 +{
++	u16 fw_crc;
 +	u16 crc;
 +
 +	/*
++	 * The last 2 bytes in the firmware array are the crc checksum itself,
++	 * this means that we should never pass those 2 bytes to the crc
++	 * algorithm.
++	 */
++	fw_crc = (data[len - 2] << 8 | data[len - 1]);
++
++	/*
 +	 * Use the crc ccitt algorithm.
 +	 * This will return the same value as the legacy driver which
 +	 * used bit ordering reversion on the both the firmware bytes
 +	 * before input input as well as on the final output.
 +	 * Obviously using crc ccitt directly is much more efficient.
-+	 * The last 2 bytes in the firmware array are the crc checksum itself,
-+	 * this means that we should never pass those 2 bytes to the crc
-+	 * algorithm.
 +	 */
 +	crc = crc_ccitt(~0, data, len - 2);
 +
@@ -1151,18 +1148,16 @@ Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
 +	 * will be swapped, use swab16 to convert the crc to the correct
 +	 * value.
 +	 */
-+	return swab16(crc);
++	crc = swab16(crc);
++
++	return fw_crc == crc;
 +}
 +
-+static int rt2800usb_load_firmware(struct rt2x00_dev *rt2x00dev,
-+				   const void *data, const size_t len)
++static int rt2800usb_check_firmware(struct rt2x00_dev *rt2x00dev,
++				    const u8 *data, const size_t len)
 +{
-+	unsigned int i;
-+	int status;
-+	u32 reg;
-+	u32 offset;
-+	u32 length;
 +	u16 chipset = (rt2x00_rev(&rt2x00dev->chip) >> 16) & 0xffff;
++	size_t offset = 0;
 +
 +	/*
 +	 * Firmware files:
@@ -1173,24 +1168,51 @@ Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
 +	 * within the file. The first blob is the same firmware as (a),
 +	 * but the second blob is for the additional chipsets.
 +	 */
-+	if (len != 4096 && len != 8192) {
-+		ERROR(rt2x00dev, "Invalid firmware file length (len=%zu)\n", len);
-+		return -ENOENT;
++	if (len != 4096 && len != 8192)
++		return FW_BAD_LENGTH;
++
++	/*
++	 * Check if we need the upper 4kb firmware data or not.
++	 */
++	if ((len == 4096) &&
++	    (chipset != 0x2860) &&
++	    (chipset != 0x2872) &&
++	    (chipset != 0x3070))
++		return FW_BAD_VERSION;
++
++	/*
++	 * 8kb firmware files must be checked as if it were
++	 * 2 seperate firmware files.
++	 */
++	while (offset < len) {
++		if (!rt2800usb_check_crc(data + offset, 4096))
++			return FW_BAD_CRC;
++
++		offset += 4096;
 +	}
 +
++	return FW_OK;
++}
++
++static int rt2800usb_load_firmware(struct rt2x00_dev *rt2x00dev,
++				   const u8 *data, const size_t len)
++{
++	unsigned int i;
++	int status;
++	u32 reg;
++	u32 offset;
++	u32 length;
++	u16 chipset = (rt2x00_rev(&rt2x00dev->chip) >> 16) & 0xffff;
++
++	/*
++	 * Check which section of the firmware we need.
++	 */
 +	if ((chipset == 0x2860) || (chipset == 0x2872) || (chipset == 0x3070)) {
 +		offset = 0;
 +		length = 4096;
-+	} else if (len == 8192) {
++	} else {
 +		offset = 4096;
 +		length = 4096;
-+	} else {
-+		ERROR(rt2x00dev,
-+		      "Current firmware does not support detected chipset %04x.\n",
-+		      chipset);
-+		ERROR(rt2x00dev,
-+		      "Please upgrade to a more recent firmware version.\n");
-+		return -ENOENT;
 +	}
 +
 +	/*
@@ -1328,7 +1350,7 @@ Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
 +		rt2x00usb_register_write(rt2x00dev, TX_SW_CFG1, 0x00000000);
 +		rt2x00usb_register_write(rt2x00dev, TX_SW_CFG2, 0x00000000);
 +	} else {
-+		rt2x00usb_register_write(rt2x00dev, TX_SW_CFG0, 0x00040a06);
++		rt2x00usb_register_write(rt2x00dev, TX_SW_CFG0, 0x00000000);
 +		rt2x00usb_register_write(rt2x00dev, TX_SW_CFG1, 0x00080606);
 +	}
 +
@@ -1370,25 +1392,25 @@ Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
 +	rt2x00usb_register_write(rt2x00dev, AUTO_RSP_CFG, reg);
 +
 +	rt2x00usb_register_read(rt2x00dev, CCK_PROT_CFG, &reg);
-+	rt2x00_set_field32(&reg, CCK_PROT_CFG_PROTECT_RATE, 3);
++	rt2x00_set_field32(&reg, CCK_PROT_CFG_PROTECT_RATE, 8);
 +	rt2x00_set_field32(&reg, CCK_PROT_CFG_PROTECT_CTRL, 0);
 +	rt2x00_set_field32(&reg, CCK_PROT_CFG_PROTECT_NAV, 1);
 +	rt2x00_set_field32(&reg, CCK_PROT_CFG_TX_OP_ALLOW_CCK, 1);
 +	rt2x00_set_field32(&reg, CCK_PROT_CFG_TX_OP_ALLOW_OFDM, 1);
 +	rt2x00_set_field32(&reg, CCK_PROT_CFG_TX_OP_ALLOW_MM20, 1);
-+	rt2x00_set_field32(&reg, CCK_PROT_CFG_TX_OP_ALLOW_MM40, 0);
++	rt2x00_set_field32(&reg, CCK_PROT_CFG_TX_OP_ALLOW_MM40, 1);
 +	rt2x00_set_field32(&reg, CCK_PROT_CFG_TX_OP_ALLOW_GF20, 1);
 +	rt2x00_set_field32(&reg, CCK_PROT_CFG_TX_OP_ALLOW_GF40, 1);
 +	rt2x00usb_register_write(rt2x00dev, CCK_PROT_CFG, reg);
 +
 +	rt2x00usb_register_read(rt2x00dev, OFDM_PROT_CFG, &reg);
-+	rt2x00_set_field32(&reg, OFDM_PROT_CFG_PROTECT_RATE, 3);
++	rt2x00_set_field32(&reg, OFDM_PROT_CFG_PROTECT_RATE, 8);
 +	rt2x00_set_field32(&reg, OFDM_PROT_CFG_PROTECT_CTRL, 0);
 +	rt2x00_set_field32(&reg, OFDM_PROT_CFG_PROTECT_NAV, 1);
 +	rt2x00_set_field32(&reg, OFDM_PROT_CFG_TX_OP_ALLOW_CCK, 1);
 +	rt2x00_set_field32(&reg, OFDM_PROT_CFG_TX_OP_ALLOW_OFDM, 1);
 +	rt2x00_set_field32(&reg, OFDM_PROT_CFG_TX_OP_ALLOW_MM20, 1);
-+	rt2x00_set_field32(&reg, OFDM_PROT_CFG_TX_OP_ALLOW_MM40, 0);
++	rt2x00_set_field32(&reg, OFDM_PROT_CFG_TX_OP_ALLOW_MM40, 1);
 +	rt2x00_set_field32(&reg, OFDM_PROT_CFG_TX_OP_ALLOW_GF20, 1);
 +	rt2x00_set_field32(&reg, OFDM_PROT_CFG_TX_OP_ALLOW_GF40, 1);
 +	rt2x00usb_register_write(rt2x00dev, OFDM_PROT_CFG, reg);
@@ -1526,12 +1548,12 @@ Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
 +	rt2x00usb_register_read(rt2x00dev, LG_FBK_CFG0, &reg);
 +	rt2x00_set_field32(&reg, LG_FBK_CFG0_OFDMMCS0FBK, 8);
 +	rt2x00_set_field32(&reg, LG_FBK_CFG0_OFDMMCS1FBK, 8);
-+	rt2x00_set_field32(&reg, LG_FBK_CFG0_OFDMMCS2FBK, 10);
-+	rt2x00_set_field32(&reg, LG_FBK_CFG0_OFDMMCS3FBK, 11);
-+	rt2x00_set_field32(&reg, LG_FBK_CFG0_OFDMMCS4FBK, 12);
-+	rt2x00_set_field32(&reg, LG_FBK_CFG0_OFDMMCS5FBK, 13);
-+	rt2x00_set_field32(&reg, LG_FBK_CFG0_OFDMMCS6FBK, 14);
-+	rt2x00_set_field32(&reg, LG_FBK_CFG0_OFDMMCS7FBK, 15);
++	rt2x00_set_field32(&reg, LG_FBK_CFG0_OFDMMCS2FBK, 3);
++	rt2x00_set_field32(&reg, LG_FBK_CFG0_OFDMMCS3FBK, 10);
++	rt2x00_set_field32(&reg, LG_FBK_CFG0_OFDMMCS4FBK, 11);
++	rt2x00_set_field32(&reg, LG_FBK_CFG0_OFDMMCS5FBK, 12);
++	rt2x00_set_field32(&reg, LG_FBK_CFG0_OFDMMCS6FBK, 13);
++	rt2x00_set_field32(&reg, LG_FBK_CFG0_OFDMMCS7FBK, 14);
 +	rt2x00usb_register_write(rt2x00dev, LG_FBK_CFG0, reg);
 +
 +	rt2x00usb_register_read(rt2x00dev, LG_FBK_CFG1, &reg);
@@ -1960,7 +1982,7 @@ Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
 +{
 +	struct skb_frame_desc *skbdesc = get_skb_frame_desc(skb);
 +	__le32 *txi = skbdesc->desc;
-+	__le32 *txwi = txi + TXINFO_DESC_SIZE;
++	__le32 *txwi = &txi[TXINFO_DESC_SIZE / sizeof(__le32)];
 +	u32 word;
 +
 +	/*
@@ -1968,7 +1990,6 @@ Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
 +	 */
 +	rt2x00_desc_read(txwi, 0, &word);
 +	rt2x00_set_field32(&word, TXWI_W0_FRAG,
-+			   test_bit(ENTRY_TXD_FIRST_FRAGMENT, &txdesc->flags) ||
 +			   test_bit(ENTRY_TXD_MORE_FRAG, &txdesc->flags));
 +	rt2x00_set_field32(&word, TXWI_W0_MIMO_PS, 0);
 +	rt2x00_set_field32(&word, TXWI_W0_CF_ACK, 0);
@@ -2009,7 +2030,7 @@ Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
 +	 */
 +	rt2x00_desc_read(txi, 0, &word);
 +	rt2x00_set_field32(&word, TXINFO_W0_USB_DMA_TX_PKT_LEN,
-+			   roundup(skb->len + TXWI_DESC_SIZE, 4));
++			   skb->len + TXWI_DESC_SIZE);
 +	rt2x00_set_field32(&word, TXINFO_W0_WIV, 1);
 +	rt2x00_set_field32(&word, TXINFO_W0_QSEL, 2);
 +	rt2x00_set_field32(&word, TXINFO_W0_SW_USE_LAST_ROUND, 0);
@@ -2067,10 +2088,11 @@ Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
 +	int length;
 +
 +	/*
-+	 * The length _must_ be a multiple of 4,
++	 * The length _must_ include 4 bytes padding,
++	 * it should always be multiple of 4,
 +	 * but it must _not_ be a multiple of the USB packet size.
 +	 */
-+	length = roundup(entry->skb->len, 4);
++	length = roundup(entry->skb->len + 4, 4);
 +	length += (4 * !(length % entry->queue->usb_maxpacket));
 +
 +	return length;
@@ -2104,7 +2126,7 @@ Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
 +	struct rt2x00_dev *rt2x00dev = entry->queue->rt2x00dev;
 +	struct skb_frame_desc *skbdesc = get_skb_frame_desc(entry->skb);
 +	__le32 *rxd = (__le32 *)entry->skb->data;
-+	__le32 *rxwi = (__le32 *)(entry->skb->data + skbdesc->desc_len);
++	__le32 *rxwi;
 +	u32 rxd0;
 +	u32 rxwi0;
 +	u32 rxwi1;
@@ -2117,6 +2139,7 @@ Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
 +	 */
 +	memcpy(skbdesc->desc, rxd, skbdesc->desc_len);
 +	rxd = (__le32 *)skbdesc->desc;
++	rxwi = &rxd[RXD_DESC_SIZE / sizeof(__le32)];
 +
 +	/*
 +	 * It is now safe to read the descriptor on all architectures.
@@ -2180,8 +2203,7 @@ Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
 +
 +	rxdesc->rssi =
 +	    (rt2x00_get_field32(rxwi2, RXWI_W2_RSSI0) +
-+	     rt2x00_get_field32(rxwi2, RXWI_W2_RSSI1) +
-+	     rt2x00_get_field32(rxwi2, RXWI_W2_RSSI2)) / 3;
++	     rt2x00_get_field32(rxwi2, RXWI_W2_RSSI1)) / 2;
 +
 +	rxdesc->noise =
 +	    (rt2x00_get_field32(rxwi3, RXWI_W3_SNR0) +
@@ -2192,7 +2214,7 @@ Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
 +	/*
 +	 * Remove RXWI descriptor from start of buffer.
 +	 */
-+	skb_pull(entry->skb, RXWI_DESC_SIZE + skbdesc->desc_len);
++	skb_pull(entry->skb, skbdesc->desc_len);
 +	skb_trim(entry->skb, rxdesc->size);
 +}
 +
@@ -2751,7 +2773,7 @@ Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
 +static const struct rt2x00lib_ops rt2800usb_rt2x00_ops = {
 +	.probe_hw		= rt2800usb_probe_hw,
 +	.get_firmware_name	= rt2800usb_get_firmware_name,
-+	.get_firmware_crc	= rt2800usb_get_firmware_crc,
++	.check_firmware		= rt2800usb_check_firmware,
 +	.load_firmware		= rt2800usb_load_firmware,
 +	.initialize		= rt2x00usb_initialize,
 +	.uninitialize		= rt2x00usb_uninitialize,
@@ -2766,6 +2788,7 @@ Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
 +	.write_beacon		= rt2800usb_write_beacon,
 +	.get_tx_data_len	= rt2800usb_get_tx_data_len,
 +	.kick_tx_queue		= rt2800usb_kick_tx_queue,
++	.kill_tx_queue		= rt2x00usb_kill_tx_queue,
 +	.fill_rxdone		= rt2800usb_fill_rxdone,
 +	.config_shared_key	= rt2800usb_config_shared_key,
 +	.config_pairwise_key	= rt2800usb_config_pairwise_key,
@@ -2779,7 +2802,7 @@ Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
 +static const struct data_queue_desc rt2800usb_queue_rx = {
 +	.entry_num		= RX_ENTRIES,
 +	.data_size		= DATA_FRAME_SIZE,
-+	.desc_size		= RXD_DESC_SIZE,
++	.desc_size		= RXD_DESC_SIZE + RXWI_DESC_SIZE,
 +	.priv_size		= sizeof(struct queue_entry_priv_usb),
 +};
 +
@@ -2937,7 +2960,7 @@ Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
 +module_exit(rt2800usb_exit);
 --- /dev/null
 +++ b/drivers/net/wireless/rt2x00/rt2800usb.h
-@@ -0,0 +1,1944 @@
+@@ -0,0 +1,1940 @@
 +/*
 +	Copyright (C) 2004 - 2009 rt2x00 SourceForge Project
 +	<http://rt2x00.serialmonkey.com>
@@ -4239,64 +4262,60 @@ Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
 +#define MPDU_DENSITY_CNT_RX_ZERO_DEL	FIELD32(0xffff0000)
 +
 +/*
-+ * Security key table memory, base address = 0x1800
-+ */
-+struct hw_pairwise_ta_entry {
-+	u8 address[6];
-+	u8 reserved[2];
-+} __attribute__ ((packed));
-+
-+struct wcid_entry {
-+	u8 rx_ba_bitmat7;
-+	u8 rx_ba_bitmat0;
-+	u8 mac[6];
-+} __attribute__ ((packed));
-+
-+struct hw_key_entry {
-+	u8 key[16];
-+	u8 tx_mic[8];
-+	u8 rx_mic[8];
-+} __attribute__ ((packed));
-+
-+/*
 + * Security key table memory.
 + * MAC_WCID_BASE: 8-bytes (use only 6 bytes) * 256 entry
 + * PAIRWISE_KEY_TABLE_BASE: 32-byte * 256 entry
-+ * PAIRWISE_IVEIV_TABLE_BASE: 8-byte * 256-entry
 + * MAC_IVEIV_TABLE_BASE: 8-byte * 256-entry
 + * MAC_WCID_ATTRIBUTE_BASE: 4-byte * 256-entry
 + * SHARED_KEY_TABLE_BASE: 32-byte * 16-entry
-+ * SHARED_KEY_MODE_BASE: 32-byte * 16-entry
++ * SHARED_KEY_MODE_BASE: 4-byte * 16-entry
 + */
 +#define MAC_WCID_BASE			0x1800
 +#define PAIRWISE_KEY_TABLE_BASE		0x4000
-+#define PAIRWISE_IVEIV_TABLE_BASE	0x6000
 +#define MAC_IVEIV_TABLE_BASE		0x6000
 +#define MAC_WCID_ATTRIBUTE_BASE		0x6800
 +#define SHARED_KEY_TABLE_BASE		0x6c00
 +#define SHARED_KEY_MODE_BASE		0x7000
 +
++#define MAC_WCID_ENTRY(__idx) \
++	( MAC_WCID_BASE + ((__idx) * sizeof(struct mac_wcid_entry)) )
++#define PAIRWISE_KEY_ENTRY(__idx) \
++	( PAIRWISE_KEY_TABLE_BASE + ((__idx) * sizeof(struct hw_key_entry)) )
++#define MAC_IVEIV_ENTRY(__idx) \
++	( MAC_IVEIV_TABLE_BASE + ((__idx) & sizeof(struct mac_iveiv_entry)) )
++#define MAC_WCID_ATTR_ENTRY(__idx) \
++	( MAC_WCID_ATTRIBUTE_BASE + ((__idx) * sizeof(u32)) )
 +#define SHARED_KEY_ENTRY(__idx) \
-+	( SHARED_KEY_TABLE_BASE + \
-+		((__idx) * sizeof(struct hw_key_entry)) )
++	( SHARED_KEY_TABLE_BASE + ((__idx) * sizeof(struct hw_key_entry)) )
 +#define SHARED_KEY_MODE_ENTRY(__idx) \
 +	( SHARED_KEY_MODE_BASE + ((__idx) * sizeof(u32)) )
-+#define PAIRWISE_KEY_ENTRY(__idx) \
-+	( PAIRWISE_KEY_TABLE_BASE + \
-+		((__idx) * sizeof(struct hw_key_entry)) )
 +
-+#define MAC_WCID_ENTRY(__idx) \
-+	( MAC_WCID_BASE + (2 * sizeof(u32) * (__idx)) )
-+#define MAC_WCID_ATTR_ENTRY(__idx) \
-+	( MAC_WCID_ATTRIBUTE_BASE + ((__idx) * sizeof(u32)) )
++struct mac_wcid_entry {
++	u8 mac[6];
++	u8 reserved[2];
++} __attribute__ ((packed));
++
++struct hw_key_entry {
++	u8 key[16];
++	u8 tx_mic[8];
++	u8 rx_mic[8];
++} __attribute__ ((packed));
++
++struct mac_iveiv_entry {
++	u8 iv[8];
++} __attribute__ ((packed));
++
++/*
++ * MAC_IVEIV:
++ */
++#define MAC_IVEIV_EIV			FIELD32(0x20000000)
++#define MAC_IVEIV_KEYIDX		FIELD32(0xc0000000)
 +
 +/*
 + * MAC_WCID_ATTRIBUTE:
-+ * KEYTAB: 0: shared key table, 1: pairwise key table
-+ * BSS_IDX: multipleBSS index for the WCID
 + */
 +#define MAC_WCID_ATTRIBUTE_KEYTAB	FIELD32(0x00000001)
-+#define MAC_WCID_ATTRIBUTE_PAIRKEY_MODE	FIELD32(0x0000000e)
++#define MAC_WCID_ATTRIBUTE_CIPHER	FIELD32(0x0000000e)
 +#define MAC_WCID_ATTRIBUTE_BSS_IDX	FIELD32(0x00000070)
 +#define MAC_WCID_ATTRIBUTE_RX_WIUDF	FIELD32(0x00000380)
 +
@@ -4884,7 +4903,7 @@ Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
 +#endif /* RT2800USB_H */
 --- a/drivers/net/wireless/rt2x00/rt2x00.h
 +++ b/drivers/net/wireless/rt2x00/rt2x00.h
-@@ -143,6 +143,7 @@ struct rt2x00_chip {
+@@ -142,6 +142,7 @@ struct rt2x00_chip {
  #define RT2860D		0x0681	/* 2.4GHz, 5GHz PCI/CB */
  #define RT2890		0x0701	/* 2.4GHz PCIe */
  #define RT2890D		0x0781	/* 2.4GHz, 5GHz PCIe */
@@ -4892,7 +4911,7 @@ Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
  
  	u16 rf;
  	u32 rev;
-@@ -778,6 +779,12 @@ struct rt2x00_dev {
+@@ -780,6 +781,12 @@ struct rt2x00_dev {
  	u8 freq_offset;
  
  	/*