You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
52 lines
1.8 KiB
Diff
52 lines
1.8 KiB
Diff
From 710e6cc1595e25378c4b9977f7a8b4ad4a72a109 Mon Sep 17 00:00:00 2001
|
|
From: Stanislaw Gruszka <sgruszka@redhat.com>
|
|
Date: Sat, 15 Jun 2019 12:00:58 +0200
|
|
Subject: [PATCH 05/15] rt2800: do not nullify initialization vector data
|
|
|
|
If we restart hw we should keep existing IV (initialization vector)
|
|
otherwise HW encryption will be broken after restart.
|
|
|
|
Also fix some coding style issues on the way.
|
|
|
|
Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
|
|
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
|
|
---
|
|
drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 9 ++++-----
|
|
1 file changed, 4 insertions(+), 5 deletions(-)
|
|
|
|
--- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
|
|
+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
|
|
@@ -1658,14 +1658,15 @@ static void rt2800_config_wcid_attr_ciph
|
|
|
|
offset = MAC_IVEIV_ENTRY(key->hw_key_idx);
|
|
|
|
- memset(&iveiv_entry, 0, sizeof(iveiv_entry));
|
|
+ rt2800_register_multiread(rt2x00dev, offset,
|
|
+ &iveiv_entry, 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;
|
|
rt2800_register_multiwrite(rt2x00dev, offset,
|
|
- &iveiv_entry, sizeof(iveiv_entry));
|
|
+ &iveiv_entry, sizeof(iveiv_entry));
|
|
}
|
|
|
|
int rt2800_config_shared_key(struct rt2x00_dev *rt2x00dev,
|
|
@@ -6090,13 +6091,11 @@ static int rt2800_init_registers(struct
|
|
* ASIC will keep garbage value after boot, clear encryption keys.
|
|
*/
|
|
for (i = 0; i < 4; i++)
|
|
- rt2800_register_write(rt2x00dev,
|
|
- SHARED_KEY_MODE_ENTRY(i), 0);
|
|
+ rt2800_register_write(rt2x00dev, SHARED_KEY_MODE_ENTRY(i), 0);
|
|
|
|
for (i = 0; i < 256; i++) {
|
|
rt2800_config_wcid(rt2x00dev, NULL, i);
|
|
rt2800_delete_wcid_attr(rt2x00dev, i);
|
|
- rt2800_register_write(rt2x00dev, MAC_IVEIV_ENTRY(i), 0);
|
|
}
|
|
|
|
/*
|