diff --git a/[refs] b/[refs] index 58c126e32561..ab0124f81319 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e157249d948bf0c5da10ce8610e2b4b36d0a3c4c +refs/heads/master: 76fe1b0e4c093f985c66a062c9c10370b4985796 diff --git a/trunk/net/ieee80211/Kconfig b/trunk/net/ieee80211/Kconfig index 23b23f72a9a4..961c711eda97 100644 --- a/trunk/net/ieee80211/Kconfig +++ b/trunk/net/ieee80211/Kconfig @@ -44,6 +44,7 @@ config IEEE80211_CRYPT_WEP config IEEE80211_CRYPT_CCMP tristate "IEEE 802.11i CCMP support" depends on IEEE80211 + select CRYPTO select CRYPTO_AES ---help--- Include software based cipher suites in support of IEEE 802.11i @@ -56,6 +57,7 @@ config IEEE80211_CRYPT_CCMP config IEEE80211_CRYPT_TKIP tristate "IEEE 802.11i TKIP encryption" depends on IEEE80211 + select CRYPTO select CRYPTO_MICHAEL_MIC ---help--- Include software based cipher suites in support of IEEE 802.11i