summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/crypto.h2
-rw-r--r--include/linux/mroute.h2
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);