diff options
author | Daniel Golle <daniel@makrotopia.org> | 2019-11-05 10:48:53 +0100 |
---|---|---|
committer | Daniel Golle <daniel@makrotopia.org> | 2019-11-05 10:54:05 +0100 |
commit | 439ac8104bf68b4843b94e9848a33f99ee5a3085 (patch) | |
tree | 106d297857bbe986d10f01a57799be2d77f71c0e /package/kernel/mac80211/patches/rt2x00/064-rt2800-do-not-nullify-initialization-vector-data.patch | |
parent | d6d9f582907630c77309a13a42781010adfff441 (diff) | |
download | upstream-439ac8104bf68b4843b94e9848a33f99ee5a3085.tar.gz upstream-439ac8104bf68b4843b94e9848a33f99ee5a3085.tar.bz2 upstream-439ac8104bf68b4843b94e9848a33f99ee5a3085.zip |
mac80211: rt2x00: backport upstream patches
Import patches from upstream to sync 19.07 with master:
9f3e3323e996 rt2x00: allow to specify watchdog interval
2034afe4db4a rt2800: add helpers for reading dma done index
759c5b599cf4 rt2800: initial watchdog implementation
09db3b000619 rt2800: add pre_reset_hw callback
710e6cc1595e rt2800: do not nullify initialization vector data
e403fa31ed71 rt2x00: add restart hw
0f47aeeada2a rt2800: do not enable watchdog by default
41a531ffa4c5 rt2x00usb: fix rx queue hang
3b902fa811cf rt2x00usb: remove unnecessary rx flag checks
1dc244064c47 rt2x00: no need to check return value of debugfs_create functions
706f0182b1ad rt2800usb: Add new rt2800usb device PLANEX GW-USMicroN
95844124385e rt2x00: clear IV's on start to fix AP mode regression
567a9b766b47 rt2x00: do not set IEEE80211_TX_STAT_AMPDU_NO_BACK on tx status
14d5e14c8a6c rt2x00: clear up IV's on key removal
13fa451568ab Revert "rt2800: enable TX_PIN_CFG_LNA_PE_ bits per band"
--pending-- rt2800: remove errornous duplicate condition
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Diffstat (limited to 'package/kernel/mac80211/patches/rt2x00/064-rt2800-do-not-nullify-initialization-vector-data.patch')
-rw-r--r-- | package/kernel/mac80211/patches/rt2x00/064-rt2800-do-not-nullify-initialization-vector-data.patch | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/package/kernel/mac80211/patches/rt2x00/064-rt2800-do-not-nullify-initialization-vector-data.patch b/package/kernel/mac80211/patches/rt2x00/064-rt2800-do-not-nullify-initialization-vector-data.patch new file mode 100644 index 0000000000..df34bfffae --- /dev/null +++ b/package/kernel/mac80211/patches/rt2x00/064-rt2800-do-not-nullify-initialization-vector-data.patch @@ -0,0 +1,51 @@ +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); + } + + /* |