package/mac80211/patches/324-rt2x00-Correctly-initialize-TXINFO-for-crypto-rt28.patch

   1 From dde442877db96055110a9c7c55fa1cb95cc1d87e Mon Sep 17 00:00:00 2001
   2 From: Ivo van Doorn <IvDoorn@gmail.com>
   3 Date: Sat, 21 Feb 2009 20:40:23 +0100
   4 Subject: [PATCH] rt2x00: Correctly initialize TXINFO for crypto (rt2800pci)
   5
   6 Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
   7 ---
   8  drivers/net/wireless/rt2x00/rt2800pci.c |   22 +++++++++++-----------
   9  1 files changed, 11 insertions(+), 11 deletions(-)
  10
  11 --- a/drivers/net/wireless/rt2x00/rt2800pci.c
  12 +++ b/drivers/net/wireless/rt2x00/rt2800pci.c
  13 @@ -331,7 +331,7 @@ static void rt2800pci_config_wcid_attr(s
  14         u32 offset;
  15         u32 reg;
  16
  17 -       offset = MAC_WCID_ATTR_ENTRY(crypto->aid);
  18 +       offset = MAC_WCID_ATTR_ENTRY(key->hw_key_idx);
  19
  20         rt2x00pci_register_read(rt2x00dev, offset, &reg);
  21         rt2x00_set_field32(&reg, MAC_WCID_ATTRIBUTE_KEYTAB,
  22 @@ -342,7 +342,7 @@ static void rt2800pci_config_wcid_attr(s
  23         rt2x00_set_field32(&reg, MAC_WCID_ATTRIBUTE_RX_WIUDF, 0);
  24         rt2x00pci_register_write(rt2x00dev, offset, reg);
  25
  26 -       offset = MAC_IVEIV_ENTRY(crypto->aid);
  27 +       offset = MAC_IVEIV_ENTRY(key->hw_key_idx);
  28
  29         memset(&iveiv_entry, 0, sizeof(iveiv_entry));
  30         if ((crypto->cipher == CIPHER_TKIP) ||
  31 @@ -353,7 +353,7 @@ static void rt2800pci_config_wcid_attr(s
  32         rt2x00pci_register_multiwrite(rt2x00dev, offset,
  33                                       &iveiv_entry, sizeof(iveiv_entry));
  34
  35 -       offset = MAC_WCID_ENTRY(crypto->aid);
  36 +       offset = MAC_WCID_ENTRY(key->hw_key_idx);
  37
  38         memset(&wcid_entry, 0, sizeof(wcid_entry));
  39         if (crypto->cmd == SET_KEY)
  40 @@ -393,10 +393,10 @@ static int rt2800pci_config_shared_key(s
  41          * Using the correct defines correctly will cause overhead,
  42          * so just calculate the correct offset.
  43          */
  44 -       field.bit_offset = (4 * key->keyidx);
  45 +       field.bit_offset = (4 * key->keyidx) + (16 * (crypto->bssidx & 1));
  46         field.bit_mask = 0x7 << field.bit_offset;
  47
  48 -       offset = SHARED_KEY_MODE_ENTRY(key->hw_key_idx / 8);
  49 +       offset = SHARED_KEY_MODE_ENTRY(key->hw_key_idx / 2);
  50         rt2x00pci_register_read(rt2x00dev, offset, &reg);
  51         rt2x00_set_field32(&reg, field,
  52                            (crypto->cmd == SET_KEY) * crypto->cipher);
  53 @@ -1813,16 +1813,15 @@ static void rt2800pci_write_tx_desc(stru
  54                            test_bit(ENTRY_TXD_GENERATE_SEQ, &txdesc->flags));
  55         rt2x00_set_field32(&word, TXWI_W1_BW_WIN_SIZE, txdesc->ba_size);
  56         rt2x00_set_field32(&word, TXWI_W1_WIRELESS_CLI_ID,
  57 -                          skbdesc->entry->entry_idx);
  58 +                          test_bit(ENTRY_TXD_ENCRYPT, &txdesc->flags) ?
  59 +                              txdesc->key_idx : 0xff);
  60         rt2x00_set_field32(&word, TXWI_W1_MPDU_TOTAL_BYTE_COUNT, skb->len);
  61         rt2x00_set_field32(&word, TXWI_W1_PACKETID,
  62                            skbdesc->entry->queue->qid);
  63         rt2x00_desc_write(txwi, 1, word);
  64
  65 -       if (test_bit(ENTRY_TXD_ENCRYPT, &txdesc->flags)) {
  66 -               _rt2x00_desc_write(txwi, 2, skbdesc->iv[0]);
  67 -               _rt2x00_desc_write(txwi, 3, skbdesc->iv[1]);
  68 -       }
  69 +       _rt2x00_desc_write(txwi, 2, 0 /* skbdesc->iv[0] */);
  70 +       _rt2x00_desc_write(txwi, 3, 0 /* skbdesc->iv[1] */);
  71
  72         /*
  73          * Initialize TX descriptor
  74 @@ -1849,7 +1848,8 @@ static void rt2800pci_write_tx_desc(stru
  75         rt2x00_desc_write(txd, 2, word);
  76
  77         rt2x00_desc_read(txd, 3, &word);
  78 -       rt2x00_set_field32(&word, TXD_W3_WIV, 1);
  79 +       rt2x00_set_field32(&word, TXD_W3_WIV,
  80 +                          !test_bit(ENTRY_TXD_ENCRYPT_IV, &txdesc->flags));
  81         rt2x00_set_field32(&word, TXD_W3_QSEL, 2);
  82         rt2x00_desc_write(txd, 3, word);
  83  }