git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
include
/
net
/
ipcomp.h
diff --git
a/include/net/ipcomp.h
b/include/net/ipcomp.h
index
e651a57
..
87c1af3
100644
(file)
--- a/
include/net/ipcomp.h
+++ b/
include/net/ipcomp.h
@@
-1,11
+1,14
@@
#ifndef _NET_IPCOMP_H
#define _NET_IPCOMP_H
#ifndef _NET_IPCOMP_H
#define _NET_IPCOMP_H
+#include <linux/crypto.h>
+#include <linux/types.h>
+
#define IPCOMP_SCRATCH_SIZE 65400
struct ipcomp_data {
u16 threshold;
#define IPCOMP_SCRATCH_SIZE 65400
struct ipcomp_data {
u16 threshold;
- struct crypto_
tfm
**tfms;
+ struct crypto_
comp
**tfms;
};
#endif
};
#endif