Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[cascardo/linux.git] / net / bluetooth / amp.c

diff --git a/net/bluetooth/amp.c b/net/bluetooth/amp.c
index 016cdb6..2640d78 100644 (file)
--- a/net/bluetooth/amp.c
+++ b/net/bluetooth/amp.c
@@ -149,15 +149,14 @@ static int hmac_sha256(u8 *key, u8 ksize, char *plaintext, u8 psize, u8 *output)
        if (ret) {
                BT_DBG("crypto_ahash_setkey failed: err %d", ret);
        } else {
-               struct {
-                       struct shash_desc shash;
-                       char ctx[crypto_shash_descsize(tfm)];
-               } desc;
+               char desc[sizeof(struct shash_desc) +
+                       crypto_shash_descsize(tfm)] CRYPTO_MINALIGN_ATTR;
+               struct shash_desc *shash = (struct shash_desc *)desc;
 
-               desc.shash.tfm = tfm;
-               desc.shash.flags = CRYPTO_TFM_REQ_MAY_SLEEP;
+               shash->tfm = tfm;
+               shash->flags = CRYPTO_TFM_REQ_MAY_SLEEP;
 
-               ret = crypto_shash_digest(&desc.shash, plaintext, psize,
+               ret = crypto_shash_digest(shash, plaintext, psize,
                                          output);
        }