diff options
| author | David S. Miller <davem@nuts.ninka.net> | 2002-12-03 19:34:32 -0800 |
|---|---|---|
| committer | David S. Miller <davem@nuts.ninka.net> | 2002-12-03 19:34:32 -0800 |
| commit | 5ee9d502889017114882ca746023afdbb9eaedb6 (patch) | |
| tree | ef8e85e69ba506cc30e206a42e27af833f4d017e /include | |
| parent | 664bd62eb0c6ac494d9bde0be9c8c54195d46980 (diff) | |
| parent | 49be834dc00dceabc1ee83d28ba7cae7a2eb140c (diff) | |
Merge nuts.ninka.net:/home/davem/src/BK/network-2.5
into nuts.ninka.net:/home/davem/src/BK/net-2.5
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/crypto.h | 2 | ||||
| -rw-r--r-- | include/linux/mroute.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/crypto.h b/include/linux/crypto.h index 960e54133e29..f82c74decefe 100644 --- a/include/linux/crypto.h +++ b/include/linux/crypto.h @@ -58,7 +58,6 @@ */ #define CRYPTO_UNSPEC 0 #define CRYPTO_MAX_ALG_NAME 64 -#define CRYPTO_MAX_CIPHER_BLOCK_SIZE 16 struct scatterlist; @@ -135,6 +134,7 @@ struct cipher_tfm { struct scatterlist *sg, unsigned int nsg); int (*cit_decrypt)(struct crypto_tfm *tfm, struct scatterlist *sg, unsigned int nsg); + void (*cit_xor_block)(u8 *dst, const u8 *src); }; struct digest_tfm { diff --git a/include/linux/mroute.h b/include/linux/mroute.h index e5b21ce0a07b..f568f979bbdf 100644 --- a/include/linux/mroute.h +++ b/include/linux/mroute.h @@ -126,6 +126,8 @@ struct igmpmsg */ #ifdef __KERNEL__ +#include <net/sock.h> + extern int ip_mroute_setsockopt(struct sock *, int, char *, int); extern int ip_mroute_getsockopt(struct sock *, int, char *, int *); extern int ipmr_ioctl(struct sock *sk, int cmd, unsigned long arg); |