Commit 9409f38a authored by Herbert Xu's avatar Herbert Xu

[IPSEC]: Move linux/crypto.h inclusion out of net/xfrm.h

The header file linux/crypto.h is only needed by a few files so including
it in net/xfrm.h (which is included by half of the networking stack) is a
waste.  This patch moves it out of net/xfrm.h and into the specific header
files that actually need it.
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 6521f302
#ifndef _NET_AH_H #ifndef _NET_AH_H
#define _NET_AH_H #define _NET_AH_H
#include <linux/crypto.h>
#include <net/xfrm.h> #include <net/xfrm.h>
/* This is the maximum truncated ICV length that we know of. */ /* This is the maximum truncated ICV length that we know of. */
......
#ifndef _NET_ESP_H #ifndef _NET_ESP_H
#define _NET_ESP_H #define _NET_ESP_H
#include <linux/crypto.h>
#include <net/xfrm.h> #include <net/xfrm.h>
#include <asm/scatterlist.h> #include <asm/scatterlist.h>
......
#ifndef _NET_IPCOMP_H #ifndef _NET_IPCOMP_H
#define _NET_IPCOMP_H #define _NET_IPCOMP_H
#include <linux/types.h>
#define IPCOMP_SCRATCH_SIZE 65400 #define IPCOMP_SCRATCH_SIZE 65400
struct crypto_tfm;
struct ipcomp_data { struct ipcomp_data {
u16 threshold; u16 threshold;
struct crypto_tfm **tfms; struct crypto_tfm **tfms;
......
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
#include <linux/list.h> #include <linux/list.h>
#include <linux/skbuff.h> #include <linux/skbuff.h>
#include <linux/socket.h> #include <linux/socket.h>
#include <linux/crypto.h>
#include <linux/pfkeyv2.h> #include <linux/pfkeyv2.h>
#include <linux/in6.h> #include <linux/in6.h>
#include <linux/mutex.h> #include <linux/mutex.h>
...@@ -985,6 +984,7 @@ extern struct xfrm_algo_desc *xfrm_ealg_get_byname(char *name, int probe); ...@@ -985,6 +984,7 @@ extern struct xfrm_algo_desc *xfrm_ealg_get_byname(char *name, int probe);
extern struct xfrm_algo_desc *xfrm_calg_get_byname(char *name, int probe); extern struct xfrm_algo_desc *xfrm_calg_get_byname(char *name, int probe);
struct crypto_tfm; struct crypto_tfm;
struct scatterlist;
typedef void (icv_update_fn_t)(struct crypto_tfm *, struct scatterlist *, unsigned int); typedef void (icv_update_fn_t)(struct crypto_tfm *, struct scatterlist *, unsigned int);
extern void skb_icv_walk(const struct sk_buff *skb, struct crypto_tfm *tfm, extern void skb_icv_walk(const struct sk_buff *skb, struct crypto_tfm *tfm,
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
* *
*/ */
#include <linux/crypto.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/types.h> #include <linux/types.h>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment