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

   1 From 3bb9fb0141f276cd330e3eaee5c5e75b7f8bdb6a Mon Sep 17 00:00:00 2001
   2 From: Ivo van Doorn <IvDoorn@gmail.com>
   3 Date: Sat, 21 Feb 2009 20:41:06 +0100
   4 Subject: [PATCH] rt2x00: Correctly initialize TXINFO for crypto (rt2800usb)
   5
   6 Signed-off-by: Ivo van Doorn <IvDoorn@gmail.com>
   7 ---
   8  drivers/net/wireless/rt2x00/rt2800usb.c |   23 ++++++++++++-----------
   9  1 files changed, 12 insertions(+), 11 deletions(-)
  10
  11 diff --git a/drivers/net/wireless/rt2x00/rt2800usb.c b/drivers/net/wireless/rt2x00/rt2800usb.c
  12 index a95ef3c..b983744 100644
  13 --- a/drivers/net/wireless/rt2x00/rt2800usb.c
  14 +++ b/drivers/net/wireless/rt2x00/rt2800usb.c
  15 @@ -358,7 +358,7 @@ static void rt2800usb_config_wcid_attr(struct rt2x00_dev *rt2x00dev,
  16         u32 offset;
  17         u32 reg;
  18
  19 -       offset = MAC_WCID_ATTR_ENTRY(crypto->aid);
  20 +       offset = MAC_WCID_ATTR_ENTRY(key->hw_key_idx);
  21
  22         rt2x00usb_register_read(rt2x00dev, offset, &reg);
  23         rt2x00_set_field32(&reg, MAC_WCID_ATTRIBUTE_KEYTAB,
  24 @@ -369,7 +369,7 @@ static void rt2800usb_config_wcid_attr(struct rt2x00_dev *rt2x00dev,
  25         rt2x00_set_field32(&reg, MAC_WCID_ATTRIBUTE_RX_WIUDF, 0);
  26         rt2x00usb_register_write(rt2x00dev, offset, reg);
  27
  28 -       offset = MAC_IVEIV_ENTRY(crypto->aid);
  29 +       offset = MAC_IVEIV_ENTRY(key->hw_key_idx);
  30
  31         memset(&iveiv_entry, 0, sizeof(iveiv_entry));
  32         if ((crypto->cipher == CIPHER_TKIP) ||
  33 @@ -380,7 +380,7 @@ static void rt2800usb_config_wcid_attr(struct rt2x00_dev *rt2x00dev,
  34         rt2x00usb_register_multiwrite(rt2x00dev, offset,
  35                                       &iveiv_entry, sizeof(iveiv_entry));
  36
  37 -       offset = MAC_WCID_ENTRY(crypto->aid);
  38 +       offset = MAC_WCID_ENTRY(key->hw_key_idx);
  39
  40         memset(&wcid_entry, 0, sizeof(wcid_entry));
  41         if (crypto->cmd == SET_KEY)
  42 @@ -425,10 +425,10 @@ static int rt2800usb_config_shared_key(struct rt2x00_dev *rt2x00dev,
  43          * Using the correct defines correctly will cause overhead,
  44          * so just calculate the correct offset.
  45          */
  46 -       field.bit_offset = (4 * key->keyidx);
  47 +       field.bit_offset = (4 * key->keyidx) + (16 * (crypto->bssidx & 1));
  48         field.bit_mask = 0x7 << field.bit_offset;
  49
  50 -       offset = SHARED_KEY_MODE_ENTRY(key->hw_key_idx / 8);
  51 +       offset = SHARED_KEY_MODE_ENTRY(key->hw_key_idx / 2);
  52
  53         rt2x00usb_register_read(rt2x00dev, offset, &reg);
  54         rt2x00_set_field32(&reg, field,
  55 @@ -2001,16 +2001,16 @@ static void rt2800usb_write_tx_desc(struct rt2x00_dev *rt2x00dev,
  56         rt2x00_set_field32(&word, TXWI_W1_NSEQ,
  57                            test_bit(ENTRY_TXD_GENERATE_SEQ, &txdesc->flags));
  58         rt2x00_set_field32(&word, TXWI_W1_BW_WIN_SIZE, txdesc->ba_size);
  59 -       rt2x00_set_field32(&word, TXWI_W1_WIRELESS_CLI_ID, 0xff);
  60 +       rt2x00_set_field32(&word, TXWI_W1_WIRELESS_CLI_ID,
  61 +                          test_bit(ENTRY_TXD_ENCRYPT, &txdesc->flags) ?
  62 +                              txdesc->key_idx : 0xff);
  63         rt2x00_set_field32(&word, TXWI_W1_MPDU_TOTAL_BYTE_COUNT, skb->len);
  64         rt2x00_set_field32(&word, TXWI_W1_PACKETID,
  65                            skbdesc->entry->entry_idx);
  66         rt2x00_desc_write(txwi, 1, word);
  67
  68 -       if (test_bit(ENTRY_TXD_ENCRYPT, &txdesc->flags)) {
  69 -               _rt2x00_desc_write(txwi, 2, skbdesc->iv[0]);
  70 -               _rt2x00_desc_write(txwi, 3, skbdesc->iv[1]);
  71 -       }
  72 +       _rt2x00_desc_write(txwi, 2, 0 /* skbdesc->iv[0] */);
  73 +       _rt2x00_desc_write(txwi, 3, 0 /* skbdesc->iv[1] */);
  74
  75         /*
  76          * Initialize TX descriptor
  77 @@ -2018,7 +2018,8 @@ static void rt2800usb_write_tx_desc(struct rt2x00_dev *rt2x00dev,
  78         rt2x00_desc_read(txi, 0, &word);
  79         rt2x00_set_field32(&word, TXINFO_W0_USB_DMA_TX_PKT_LEN,
  80                            skb->len + TXWI_DESC_SIZE);
  81 -       rt2x00_set_field32(&word, TXINFO_W0_WIV, 1);
  82 +       rt2x00_set_field32(&word, TXINFO_W0_WIV,
  83 +                          !test_bit(ENTRY_TXD_ENCRYPT_IV, &txdesc->flags));
  84         rt2x00_set_field32(&word, TXINFO_W0_QSEL, 2);
  85         rt2x00_set_field32(&word, TXINFO_W0_SW_USE_LAST_ROUND, 0);
  86         rt2x00_set_field32(&word, TXINFO_W0_USB_DMA_NEXT_VALID, 0);
  87 --
  88 1.6.0
  89