From: Alexandros Couloumbis Date: Tue, 17 Oct 2017 04:27:23 +0000 (+0300) Subject: target/generic: sync ozonet works for kernel 4.9 to upstream X-Git-Url: http://git.ozo.com/?p=lede-git%2F.git;a=commitdiff_plain;h=0b6b41704dd9276709eef4a6e1febba6e0291879 target/generic: sync ozonet works for kernel 4.9 to upstream --- diff --git a/target/linux/generic/pending-4.9/999-nuke_crypto.patch b/target/linux/generic/pending-4.9/999-nuke_crypto.patch new file mode 100644 index 0000000000..f456fe63d8 --- /dev/null +++ b/target/linux/generic/pending-4.9/999-nuke_crypto.patch @@ -0,0 +1,99 @@ +diff --git a/net/mac80211/Kconfig b/net/mac80211/Kconfig +index 3891cbd..0243fd3 100644 +--- a/net/mac80211/Kconfig ++++ b/net/mac80211/Kconfig +@@ -1,11 +1,6 @@ + config MAC80211 + tristate "Generic IEEE 802.11 Networking Stack (mac80211)" + depends on CFG80211 +- select CRYPTO +- select CRYPTO_ARC4 +- select CRYPTO_AES +- select CRYPTO_CCM +- select CRYPTO_GCM + select CRC32 + ---help--- + This option enables the hardware independent IEEE 802.11 +@@ -84,6 +79,7 @@ config MAC80211_LEDS + bool "Enable LED triggers" + depends on MAC80211 + depends on LEDS_CLASS ++ default n + select LEDS_TRIGGERS + ---help--- + This option enables a few LED triggers for different +@@ -92,6 +88,7 @@ config MAC80211_LEDS + config MAC80211_DEBUGFS + bool "Export mac80211 internals in DebugFS" + depends on MAC80211 && DEBUG_FS ++ default n + ---help--- + Select this to see extensive information about + the internal state of mac80211 in debugfs. +@@ -101,6 +98,7 @@ config MAC80211_DEBUGFS + config MAC80211_MESSAGE_TRACING + bool "Trace all mac80211 debug messages" + depends on MAC80211 ++ default n + ---help--- + Select this option to have mac80211 register the + mac80211_msg trace subsystem with tracepoints to +diff --git a/net/wireless/Kconfig b/net/wireless/Kconfig +index 3c06fa9..1937b0e 100644 +--- a/net/wireless/Kconfig ++++ b/net/wireless/Kconfig +@@ -132,6 +132,7 @@ config CFG80211_DEFAULT_PS + + config CFG80211_DEBUGFS + bool "cfg80211 DebugFS entries" ++ default n + depends on CFG80211 + depends on DEBUG_FS + ---help--- +@@ -198,12 +199,15 @@ config LIB80211 + + config LIB80211_CRYPT_WEP + tristate ++ default n + + config LIB80211_CRYPT_CCMP + tristate ++ default n + + config LIB80211_CRYPT_TKIP + tristate ++ default n + + config LIB80211_DEBUG + bool "lib80211 debugging messages" +--- a/drivers/net/wireless/intersil/hostap/Kconfig 2017-05-25 15:50:50.000000000 +0300 ++++ b/drivers/net/wireless/hostap/Kconfig 2017-06-02 17:48:55.613761179 +0300 +@@ -3,17 +3,7 @@ config HOSTAP + select WIRELESS_EXT + select WEXT_SPY + select WEXT_PRIV +- select CRYPTO +- select CRYPTO_ARC4 +- select CRYPTO_ECB +- select CRYPTO_AES +- select CRYPTO_MICHAEL_MIC +- select CRYPTO_ECB +- select CRC32 + select LIB80211 +- select LIB80211_CRYPT_WEP +- select LIB80211_CRYPT_TKIP +- select LIB80211_CRYPT_CCMP + ---help--- + Shared driver code for IEEE 802.11b wireless cards based on + Intersil Prism2/2.5/3 chipset. This driver supports so called +--- a/net/wireless/Makefile ++++ b/net/wireless/Makefile +@@ -1,8 +1,5 @@ + obj-$(CONFIG_CFG80211) += cfg80211.o + obj-$(CONFIG_LIB80211) += lib80211.o +-obj-$(CONFIG_LIB80211_CRYPT_WEP) += lib80211_crypt_wep.o +-obj-$(CONFIG_LIB80211_CRYPT_CCMP) += lib80211_crypt_ccmp.o +-obj-$(CONFIG_LIB80211_CRYPT_TKIP) += lib80211_crypt_tkip.o + + obj-$(CONFIG_WEXT_CORE) += wext-core.o + obj-$(CONFIG_WEXT_PROC) += wext-proc.o