netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Florian Westphal <fw@strlen.de>
To: netdev@vger.kernel.org
Cc: Florian Westphal <fw@strlen.de>
Subject: [PATCH -next] net: avoid inet dependency on aes crypto
Date: Mon, 22 Apr 2013 15:30:03 +0200	[thread overview]
Message-ID: <1366637403-11212-1-git-send-email-fw@strlen.de> (raw)

commit 798b2cbf9227b1bd7d37ae9af4d9c750e6f4de9c
(net: Add INET dependency on aes crypto for the sake of TCP fastopen.)
results in aes-asm module no longer being loaded when AES cipher is
requested, due to CRYPTO_AES=y.

However, there is no link-time dependency on aes. Drop dep and instead
set "default m" for aes crypto if inet is enabled.

Signed-off-by: Florian Westphal <fw@strlen.de>
---
 crypto/Kconfig |    1 +
 net/Kconfig    |    1 -
 2 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/crypto/Kconfig b/crypto/Kconfig
index 05c0ce5..151b3e0 100644
--- a/crypto/Kconfig
+++ b/crypto/Kconfig
@@ -584,6 +584,7 @@ comment "Ciphers"
 
 config CRYPTO_AES
 	tristate "AES cipher algorithms"
+	default m if INET
 	select CRYPTO_ALGAPI
 	help
 	  AES cipher algorithms (FIPS-197). AES uses the Rijndael
diff --git a/net/Kconfig b/net/Kconfig
index 1a22216..a1d2cab 100644
--- a/net/Kconfig
+++ b/net/Kconfig
@@ -62,7 +62,6 @@ source "net/iucv/Kconfig"
 config INET
 	bool "TCP/IP networking"
 	select CRYPTO
-	select CRYPTO_AES
 	---help---
 	  These are the protocols used on the Internet and on most local
 	  Ethernets. It is highly recommended to say Y here (this will enlarge
-- 
1.7.8.6

             reply	other threads:[~2013-04-22 13:28 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-22 13:30 Florian Westphal [this message]
2013-04-22 19:25 ` [PATCH -next] net: avoid inet dependency on aes crypto David Miller
2013-04-22 19:50   ` Ben Hutchings

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1366637403-11212-1-git-send-email-fw@strlen.de \
    --to=fw@strlen.de \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).