Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

crypto: algapi - Remove skbuff.h inclusion

The header file algapi.h includes skbuff.h unnecessarily since
all we need is a forward declaration for struct sk_buff. This
patch removes that inclusion.

Unfortunately skbuff.h pulls in a lot of things and drivers over
the years have come to rely on it so this patch adds a lot of
missing inclusions that result from this.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

+35 -8
+1
arch/powerpc/crypto/crc-vpmsum_test.c
··· 9 9 #include <crypto/internal/hash.h> 10 10 #include <linux/init.h> 11 11 #include <linux/module.h> 12 + #include <linux/random.h> 12 13 #include <linux/string.h> 13 14 #include <linux/kernel.h> 14 15 #include <linux/cpufeature.h>
+1
arch/x86/crypto/blake2s-glue.c
··· 11 11 #include <linux/jump_label.h> 12 12 #include <linux/kernel.h> 13 13 #include <linux/module.h> 14 + #include <linux/sizes.h> 14 15 15 16 #include <asm/cpufeature.h> 16 17 #include <asm/fpu/api.h>
+1
arch/x86/crypto/chacha_glue.c
··· 12 12 #include <crypto/internal/skcipher.h> 13 13 #include <linux/kernel.h> 14 14 #include <linux/module.h> 15 + #include <linux/sizes.h> 15 16 #include <asm/simd.h> 16 17 17 18 asmlinkage void chacha_block_xor_ssse3(u32 *state, u8 *dst, const u8 *src,
+1
arch/x86/crypto/curve25519-x86_64.c
··· 11 11 #include <linux/jump_label.h> 12 12 #include <linux/kernel.h> 13 13 #include <linux/module.h> 14 + #include <linux/scatterlist.h> 14 15 15 16 #include <asm/cpufeature.h> 16 17 #include <asm/processor.h>
+1
arch/x86/crypto/nhpoly1305-avx2-glue.c
··· 10 10 #include <crypto/internal/simd.h> 11 11 #include <crypto/nhpoly1305.h> 12 12 #include <linux/module.h> 13 + #include <linux/sizes.h> 13 14 #include <asm/simd.h> 14 15 15 16 asmlinkage void nh_avx2(const u32 *key, const u8 *message, size_t message_len,
+1
arch/x86/crypto/nhpoly1305-sse2-glue.c
··· 10 10 #include <crypto/internal/simd.h> 11 11 #include <crypto/nhpoly1305.h> 12 12 #include <linux/module.h> 13 + #include <linux/sizes.h> 13 14 #include <asm/simd.h> 14 15 15 16 asmlinkage void nh_sse2(const u32 *key, const u8 *message, size_t message_len,
+1
arch/x86/crypto/poly1305_glue.c
··· 11 11 #include <linux/jump_label.h> 12 12 #include <linux/kernel.h> 13 13 #include <linux/module.h> 14 + #include <linux/sizes.h> 14 15 #include <asm/intel-family.h> 15 16 #include <asm/simd.h> 16 17
+1
crypto/crypto_engine.c
··· 9 9 10 10 #include <linux/err.h> 11 11 #include <linux/delay.h> 12 + #include <linux/device.h> 12 13 #include <crypto/engine.h> 13 14 #include <uapi/linux/sched/types.h> 14 15 #include "internal.h"
+1
crypto/ecrdsa.c
··· 22 22 #include <crypto/internal/akcipher.h> 23 23 #include <crypto/akcipher.h> 24 24 #include <linux/oid_registry.h> 25 + #include <linux/scatterlist.h> 25 26 #include "ecrdsa_params.asn1.h" 26 27 #include "ecrdsa_pub_key.asn1.h" 27 28 #include "ecc.h"
+1 -1
crypto/jitterentropy-kcapi.c
··· 37 37 * DAMAGE. 38 38 */ 39 39 40 + #include <linux/kernel.h> 40 41 #include <linux/module.h> 41 42 #include <linux/slab.h> 42 43 #include <linux/fips.h> 43 44 #include <linux/time.h> 44 - #include <linux/crypto.h> 45 45 #include <crypto/internal/rng.h> 46 46 47 47 #include "jitterentropy.h"
+1
crypto/rsa-pkcs1pad.c
··· 14 14 #include <linux/kernel.h> 15 15 #include <linux/module.h> 16 16 #include <linux/random.h> 17 + #include <linux/scatterlist.h> 17 18 18 19 /* 19 20 * Hash algorithm OIDs plus ASN.1 DER wrappings [RFC4880 sec 5.2.2].
+1
crypto/testmgr.c
··· 27 27 #include <linux/scatterlist.h> 28 28 #include <linux/slab.h> 29 29 #include <linux/string.h> 30 + #include <linux/uio.h> 30 31 #include <crypto/rng.h> 31 32 #include <crypto/drbg.h> 32 33 #include <crypto/akcipher.h>
+1
drivers/crypto/amcc/crypto4xx_core.h
··· 15 15 16 16 #include <linux/ratelimit.h> 17 17 #include <linux/mutex.h> 18 + #include <linux/scatterlist.h> 18 19 #include <crypto/internal/hash.h> 19 20 #include <crypto/internal/aead.h> 20 21 #include <crypto/internal/rng.h>
+1
drivers/crypto/ccp/ccp-ops.c
··· 8 8 * Author: Gary R Hook <gary.hook@amd.com> 9 9 */ 10 10 11 + #include <linux/dma-mapping.h> 11 12 #include <linux/module.h> 12 13 #include <linux/kernel.h> 13 14 #include <linux/interrupt.h>
+1
drivers/crypto/img-hash.c
··· 7 7 */ 8 8 9 9 #include <linux/clk.h> 10 + #include <linux/dma-mapping.h> 10 11 #include <linux/dmaengine.h> 11 12 #include <linux/interrupt.h> 12 13 #include <linux/io.h>
+1 -3
drivers/crypto/marvell/cesa/cesa.h
··· 2 2 #ifndef __MARVELL_CESA_H__ 3 3 #define __MARVELL_CESA_H__ 4 4 5 - #include <crypto/algapi.h> 6 - #include <crypto/hash.h> 7 5 #include <crypto/internal/hash.h> 8 6 #include <crypto/internal/skcipher.h> 9 7 10 - #include <linux/crypto.h> 8 + #include <linux/dma-direction.h> 11 9 #include <linux/dmapool.h> 12 10 13 11 #define CESA_ENGINE_OFF(i) (((i) * 0x2000))
+2
drivers/crypto/marvell/cesa/cipher.c
··· 11 11 12 12 #include <crypto/aes.h> 13 13 #include <crypto/internal/des.h> 14 + #include <linux/device.h> 15 + #include <linux/dma-mapping.h> 14 16 15 17 #include "cesa.h" 16 18
+2
drivers/crypto/marvell/cesa/hash.c
··· 12 12 #include <crypto/hmac.h> 13 13 #include <crypto/md5.h> 14 14 #include <crypto/sha.h> 15 + #include <linux/device.h> 16 + #include <linux/dma-mapping.h> 15 17 16 18 #include "cesa.h" 17 19
+1
drivers/crypto/padlock-aes.c
··· 18 18 #include <linux/errno.h> 19 19 #include <linux/interrupt.h> 20 20 #include <linux/kernel.h> 21 + #include <linux/mm.h> 21 22 #include <linux/percpu.h> 22 23 #include <linux/smp.h> 23 24 #include <linux/slab.h>
+1
drivers/crypto/qce/core.c
··· 4 4 */ 5 5 6 6 #include <linux/clk.h> 7 + #include <linux/dma-mapping.h> 7 8 #include <linux/interrupt.h> 8 9 #include <linux/module.h> 9 10 #include <linux/mod_devicetable.h>
+1
drivers/crypto/qce/sha.c
··· 4 4 */ 5 5 6 6 #include <linux/device.h> 7 + #include <linux/dma-mapping.h> 7 8 #include <linux/interrupt.h> 8 9 #include <crypto/internal/hash.h> 9 10
+1
drivers/crypto/qce/skcipher.c
··· 4 4 */ 5 5 6 6 #include <linux/device.h> 7 + #include <linux/dma-mapping.h> 7 8 #include <linux/interrupt.h> 8 9 #include <linux/moduleparam.h> 9 10 #include <linux/types.h>
+1
drivers/crypto/qcom-rng.c
··· 7 7 #include <linux/acpi.h> 8 8 #include <linux/clk.h> 9 9 #include <linux/crypto.h> 10 + #include <linux/io.h> 10 11 #include <linux/module.h> 11 12 #include <linux/of.h> 12 13 #include <linux/platform_device.h>
+1
drivers/crypto/rockchip/rk3288_crypto.c
··· 10 10 */ 11 11 12 12 #include "rk3288_crypto.h" 13 + #include <linux/dma-mapping.h> 13 14 #include <linux/module.h> 14 15 #include <linux/platform_device.h> 15 16 #include <linux/of.h>
+1
drivers/crypto/rockchip/rk3288_crypto.h
··· 7 7 #include <crypto/algapi.h> 8 8 #include <linux/interrupt.h> 9 9 #include <linux/delay.h> 10 + #include <linux/scatterlist.h> 10 11 #include <crypto/internal/hash.h> 11 12 #include <crypto/internal/skcipher.h> 12 13
+1
drivers/crypto/rockchip/rk3288_crypto_ahash.c
··· 8 8 * 9 9 * Some ideas are from marvell/cesa.c and s5p-sss.c driver. 10 10 */ 11 + #include <linux/device.h> 11 12 #include "rk3288_crypto.h" 12 13 13 14 /*
+1
drivers/crypto/rockchip/rk3288_crypto_skcipher.c
··· 8 8 * 9 9 * Some ideas are from marvell-cesa.c and s5p-sss.c driver. 10 10 */ 11 + #include <linux/device.h> 11 12 #include "rk3288_crypto.h" 12 13 13 14 #define RK_CRYPTO_DEC BIT(0)
+1 -1
drivers/crypto/sahara.c
··· 18 18 #include <crypto/sha.h> 19 19 20 20 #include <linux/clk.h> 21 - #include <linux/crypto.h> 21 + #include <linux/dma-mapping.h> 22 22 #include <linux/interrupt.h> 23 23 #include <linux/io.h> 24 24 #include <linux/irq.h>
+2 -2
drivers/crypto/ux500/cryp/cryp_core.c
··· 11 11 12 12 #include <linux/clk.h> 13 13 #include <linux/completion.h> 14 - #include <linux/crypto.h> 14 + #include <linux/device.h> 15 + #include <linux/dma-mapping.h> 15 16 #include <linux/dmaengine.h> 16 17 #include <linux/err.h> 17 18 #include <linux/errno.h> ··· 28 27 #include <linux/platform_data/dma-ste-dma40.h> 29 28 30 29 #include <crypto/aes.h> 31 - #include <crypto/algapi.h> 32 30 #include <crypto/ctr.h> 33 31 #include <crypto/internal/des.h> 34 32 #include <crypto/internal/skcipher.h>
+1
drivers/crypto/ux500/hash/hash_core.c
··· 15 15 16 16 #include <linux/clk.h> 17 17 #include <linux/device.h> 18 + #include <linux/dma-mapping.h> 18 19 #include <linux/err.h> 19 20 #include <linux/init.h> 20 21 #include <linux/io.h>
+1
drivers/crypto/xilinx/zynqmp-aes-gcm.c
··· 10 10 #include <crypto/internal/aead.h> 11 11 #include <crypto/scatterwalk.h> 12 12 13 + #include <linux/dma-mapping.h> 13 14 #include <linux/module.h> 14 15 #include <linux/of_device.h> 15 16 #include <linux/platform_device.h>
+1 -1
include/crypto/algapi.h
··· 10 10 #include <linux/crypto.h> 11 11 #include <linux/list.h> 12 12 #include <linux/kernel.h> 13 - #include <linux/skbuff.h> 14 13 15 14 /* 16 15 * Maximum values for blocksize and alignmask, used to allocate ··· 26 27 struct module; 27 28 struct rtattr; 28 29 struct seq_file; 30 + struct sk_buff; 29 31 30 32 struct crypto_type { 31 33 unsigned int (*ctxsize)(struct crypto_alg *alg, u32 type, u32 mask);