aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/net/ah.h1
-rw-r--r--include/net/esp.h1
-rw-r--r--include/net/ipcomp.h4
-rw-r--r--include/net/xfrm.h2
4 files changed, 7 insertions, 1 deletions
diff --git a/include/net/ah.h b/include/net/ah.h
index ceff00afae09..8e27c9ba8b84 100644
--- a/include/net/ah.h
+++ b/include/net/ah.h
@@ -1,6 +1,7 @@
1#ifndef _NET_AH_H 1#ifndef _NET_AH_H
2#define _NET_AH_H 2#define _NET_AH_H
3 3
4#include <linux/crypto.h>
4#include <net/xfrm.h> 5#include <net/xfrm.h>
5 6
6/* This is the maximum truncated ICV length that we know of. */ 7/* This is the maximum truncated ICV length that we know of. */
diff --git a/include/net/esp.h b/include/net/esp.h
index 90cd94fad7d9..6eb837973c84 100644
--- a/include/net/esp.h
+++ b/include/net/esp.h
@@ -1,6 +1,7 @@
1#ifndef _NET_ESP_H 1#ifndef _NET_ESP_H
2#define _NET_ESP_H 2#define _NET_ESP_H
3 3
4#include <linux/crypto.h>
4#include <net/xfrm.h> 5#include <net/xfrm.h>
5#include <asm/scatterlist.h> 6#include <asm/scatterlist.h>
6 7
diff --git a/include/net/ipcomp.h b/include/net/ipcomp.h
index e651a57ecdd5..b94e3047b4d9 100644
--- a/include/net/ipcomp.h
+++ b/include/net/ipcomp.h
@@ -1,8 +1,12 @@
1#ifndef _NET_IPCOMP_H 1#ifndef _NET_IPCOMP_H
2#define _NET_IPCOMP_H 2#define _NET_IPCOMP_H
3 3
4#include <linux/types.h>
5
4#define IPCOMP_SCRATCH_SIZE 65400 6#define IPCOMP_SCRATCH_SIZE 65400
5 7
8struct crypto_tfm;
9
6struct ipcomp_data { 10struct ipcomp_data {
7 u16 threshold; 11 u16 threshold;
8 struct crypto_tfm **tfms; 12 struct crypto_tfm **tfms;
diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index 9c5ee9f20b65..10396b4bde14 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -8,7 +8,6 @@
8#include <linux/list.h> 8#include <linux/list.h>
9#include <linux/skbuff.h> 9#include <linux/skbuff.h>
10#include <linux/socket.h> 10#include <linux/socket.h>
11#include <linux/crypto.h>
12#include <linux/pfkeyv2.h> 11#include <linux/pfkeyv2.h>
13#include <linux/in6.h> 12#include <linux/in6.h>
14#include <linux/mutex.h> 13#include <linux/mutex.h>
@@ -985,6 +984,7 @@ extern struct xfrm_algo_desc *xfrm_ealg_get_byname(char *name, int probe);
985extern struct xfrm_algo_desc *xfrm_calg_get_byname(char *name, int probe); 984extern struct xfrm_algo_desc *xfrm_calg_get_byname(char *name, int probe);
986 985
987struct crypto_tfm; 986struct crypto_tfm;
987struct scatterlist;
988typedef void (icv_update_fn_t)(struct crypto_tfm *, struct scatterlist *, unsigned int); 988typedef void (icv_update_fn_t)(struct crypto_tfm *, struct scatterlist *, unsigned int);
989 989
990extern void skb_icv_walk(const struct sk_buff *skb, struct crypto_tfm *tfm, 990extern void skb_icv_walk(const struct sk_buff *skb, struct crypto_tfm *tfm,