Merge tag 'mac80211-for-john-2014-11-10' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-drm-fsl-dcu.git] / lib / libcrc32c.c

diff --git a/lib/libcrc32c.c b/lib/libcrc32c.c
index b3131f5cf8a290d39b658129e6632b91bc7125b8..6a08ce7d6adc054966658d9b6de0dfb36e2297e3 100644 (file)
--- a/lib/libcrc32c.c
+++ b/lib/libcrc32c.c
@@ -41,20 +41,18 @@ static struct crypto_shash *tfm;
 
 u32 crc32c(u32 crc, const void *address, unsigned int length)
 {
-       struct {
-               struct shash_desc shash;
-               char ctx[crypto_shash_descsize(tfm)];
-       } desc;
+       SHASH_DESC_ON_STACK(shash, tfm);
+       u32 *ctx = (u32 *)shash_desc_ctx(shash);
        int err;
 
-       desc.shash.tfm = tfm;
-       desc.shash.flags = 0;
-       *(u32 *)desc.ctx = crc;
+       shash->tfm = tfm;
+       shash->flags = 0;
+       *ctx = crc;
 
-       err = crypto_shash_update(&desc.shash, address, length);
+       err = crypto_shash_update(shash, address, length);
        BUG_ON(err);
 
-       return *(u32 *)desc.ctx;
+       return *ctx;
 }
 
 EXPORT_SYMBOL(crc32c);