linux-kernel - [PATCH] linux-next: Tree for Dec 12 (staging/rtl8192e)

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20111214201844.60cf5fe5@opus.seanm.ca>
Date:	Wed, 14 Dec 2011 20:18:44 -0500
From:	Sean MacLennan <seanm@...nm.ca>
To:	Sean MacLennan <seanm@...nm.ca>
Cc:	Randy Dunlap <rdunlap@...otime.net>,
	Stephen Rothwell <sfr@...b.auug.org.au>,
	"devel@...verdev.osuosl.org" <devel@...verdev.osuosl.org>,
	linux-next@...r.kernel.org, LKML <linux-kernel@...r.kernel.org>
Subject: [PATCH] linux-next: Tree for Dec 12 (staging/rtl8192e)

The rtllib and rtllib_crypt drivers are both required for a fully
functional rtllib. Make sure both are always available by having
rtllib select rtllib_crypt.

Signed-off-by: Sean MacLennan <seanm@...nm.ca>
---
This patch is against linux-next.

 drivers/staging/rtl8192e/Kconfig |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/drivers/staging/rtl8192e/Kconfig b/drivers/staging/rtl8192e/Kconfig
index a24305d..878f384 100644
--- a/drivers/staging/rtl8192e/Kconfig
+++ b/drivers/staging/rtl8192e/Kconfig
@@ -2,6 +2,7 @@ config RTLLIB
 	tristate "Support for rtllib wireless devices"
 	depends on WLAN && m
 	default n
+	select RTLLIB_CRYPTO
 	---help---
 	  If you have a wireless card that uses rtllib, say
 	  Y. Currently the only card is the rtl8192e.
@@ -12,16 +13,12 @@ if RTLLIB
 
 config RTLLIB_CRYPTO
 	tristate "Support for rtllib crypto support"
-	depends on RTLLIB
-	default y
 	---help---
-	  CCMP crypto driver for rtllib.
-
-	  If you enabled RTLLIB, you want this.
+	  Base crypto driver for rtllib.
 
 config RTLLIB_CRYPTO_CCMP
 	tristate "Support for rtllib CCMP crypto"
-	depends on RTLLIB && RTLLIB_CRYPTO
+	depends on RTLLIB_CRYPTO
 	default y
 	---help---
 	  CCMP crypto driver for rtllib.
@@ -30,7 +27,7 @@ config RTLLIB_CRYPTO_CCMP
 
 config RTLLIB_CRYPTO_TKIP
 	tristate "Support for rtllib TKIP crypto"
-	depends on RTLLIB && RTLLIB_CRYPTO
+	depends on RTLLIB_CRYPTO
 	default y
 	---help---
 	  TKIP crypto driver for rtllib.
@@ -39,7 +36,7 @@ config RTLLIB_CRYPTO_TKIP
 
 config RTLLIB_CRYPTO_WEP
 	tristate "Support for rtllib WEP crypto"
-	depends on RTLLIB && RTLLIB_CRYPTO
+	depends on RTLLIB_CRYPTO
 	default y
 	---help---
 	  TKIP crypto driver for rtllib.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/