diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2021-05-02 18:45:40 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-05-04 22:25:43 +0200 |
| commit | 17ac9849d3ff687c8c14d63e46f3e205adc22a3e (patch) | |
| tree | 3a1c6ec69cab51f7807f764245f43e70a494e8d8 /package/kernel/mac80211/patches/subsys/100-remove-cryptoapi-dependencies.patch | |
| parent | 13397b2b95b4800fb0a29c3d483fa280d10f0eb0 (diff) | |
| download | upstream-17ac9849d3ff687c8c14d63e46f3e205adc22a3e.tar.gz upstream-17ac9849d3ff687c8c14d63e46f3e205adc22a3e.tar.bz2 upstream-17ac9849d3ff687c8c14d63e46f3e205adc22a3e.zip | |
mac80211: Update to version 5.10.34-1
The removed patches were applied upstream and are not needed anymore.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'package/kernel/mac80211/patches/subsys/100-remove-cryptoapi-dependencies.patch')
| -rw-r--r-- | package/kernel/mac80211/patches/subsys/100-remove-cryptoapi-dependencies.patch | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/package/kernel/mac80211/patches/subsys/100-remove-cryptoapi-dependencies.patch b/package/kernel/mac80211/patches/subsys/100-remove-cryptoapi-dependencies.patch index 7b036e4e4c..ec6ecbcfce 100644 --- a/package/kernel/mac80211/patches/subsys/100-remove-cryptoapi-dependencies.patch +++ b/package/kernel/mac80211/patches/subsys/100-remove-cryptoapi-dependencies.patch @@ -20,7 +20,7 @@ ethtool.o \ --- a/net/mac80211/aead_api.c +++ /dev/null -@@ -1,112 +0,0 @@ +@@ -1,113 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0-only -/* - * Copyright 2003-2004, Instant802 Networks, Inc. @@ -46,6 +46,7 @@ - struct aead_request *aead_req; - int reqsize = sizeof(*aead_req) + crypto_aead_reqsize(tfm); - u8 *__aad; +- int ret; - - aead_req = kzalloc(reqsize + aad_len, GFP_ATOMIC); - if (!aead_req) @@ -63,10 +64,10 @@ - aead_request_set_crypt(aead_req, sg, sg, data_len, b_0); - aead_request_set_ad(aead_req, sg[0].length); - -- crypto_aead_encrypt(aead_req); +- ret = crypto_aead_encrypt(aead_req); - kfree_sensitive(aead_req); - -- return 0; +- return ret; -} - -int aead_decrypt(struct crypto_aead *tfm, u8 *b_0, u8 *aad, size_t aad_len, |