Merge nuts.ninka.net:/home/davem/src/BK/network-2.5

into nuts.ninka.net:/home/davem/src/BK/net-2.5

Documentation/crypto/api-intro.txt

@@ -206,6 +206,8 @@ SHA256 algorithm contributors:
 
 AES algorithm contributors:
   Alexander Kjeldaas
+  Herbert Valerio Riedel
+  Kyle McMartin
   Adam J. Richter
 
 Please send any credits updates or corrections to:

crypto/Kconfig

@@ -6,12 +6,14 @@ menu "Cryptographic options"
 
 config CRYPTO
 	bool "Cryptographic API"
+	default y if INET_AH=y || INET_AH=m || INET_ESP=y || INET_ESP=m
 	help
 	  This option provides the core Cryptographic API.
 
 config CRYPTO_HMAC
 	bool "HMAC support"
 	depends on CRYPTO
+	default y if INET_AH=y || INET_AH=m || INET_ESP=y || INET_ESP=m
 	help
 	  HMAC: Keyed-Hashing for Message Authentication (RFC2104).
 	  This is required for IPSec.
@@ -31,12 +33,14 @@ config CRYPTO_MD4
 config CRYPTO_MD5
 	tristate "MD5 digest algorithm"
 	depends on CRYPTO
+	default y if INET_AH=y || INET_AH=m || INET_ESP=y || INET_ESP=m
 	help
 	  MD5 message digest algorithm (RFC1321).
 
 config CRYPTO_SHA1
 	tristate "SHA1 digest algorithm"
 	depends on CRYPTO
+	default y if INET_AH=y || INET_AH=m || INET_ESP=y || INET_ESP=m
 	help
 	  SHA-1 secure hash standard (FIPS 180-1/DFIPS 180-2).
 
@@ -52,6 +56,7 @@ config CRYPTO_SHA256
 config CRYPTO_DES
 	tristate "DES and Triple DES EDE cipher algorithms"
 	depends on CRYPTO
+	default y if INET_AH=y || INET_AH=m || INET_ESP=y || INET_ESP=m
 	help
 	  DES cipher algorithm (FIPS 46-2), and Triple DES EDE (FIPS 46-3).
 

crypto/aes.c

@@ -7,6 +7,8 @@
  *
  * Linux developers:
  *  Alexander Kjeldaas <astor@fast.no>
+ *  Herbert Valerio Riedel <hvr@hvrlab.org>
+ *  Kyle McMartin <kyle@debian.org>
  *  Adam J. Richter <adam@yggdrasil.com> (conversion to 2.5 API).
  *
  * This program is free software; you can redistribute it and/or modify

net/ipv4/xfrm_algo.c

@@ -310,6 +310,7 @@ struct xfrm_algo_desc *xfrm_ealg_get_byidx(unsigned int idx)
  */
 void xfrm_probe_algs(void)
 {
+#ifdef CONFIG_CRYPTO
 	int i, status;
 	
 	BUG_ON(in_softirq());
@@ -325,6 +326,7 @@ void xfrm_probe_algs(void)
 		if (ealg_list[i].available != status)
 			ealg_list[i].available = status;
 	}
+#endif
 }
 
 int xfrm_count_auth_supported(void)

net/ipv6/af_inet6.c

@@ -684,7 +684,7 @@ static int __init init_ipv6_mibs(void)
 	
 }
 
-static void __exit cleanup_ipv6_mibs(void)
+static void cleanup_ipv6_mibs(void)
 {
 	kfree_percpu(ipv6_statistics[0]);
 	kfree_percpu(ipv6_statistics[1]);