diff --git a/init/Kconfig.gki b/init/Kconfig.gki
index 996132481ad1..53bfd9fcc311 100644
--- a/init/Kconfig.gki
+++ b/init/Kconfig.gki
@@ -103,6 +103,23 @@ config GKI_HIDDEN_VIRTUAL_CONFIGS
 	  These are normally selected implicitly when a module
 	  that relies on it is configured.
 
+# LEGACY_WEXT_ALLCONFIG Discussed upstream, soundly rejected as a unique
+# problem for GKI to solve.  It should be noted that these extensions are
+# in-effect deprecated and generally unsupported and we should pressure
+# the SOC vendors to drop any modules that require these extensions.
+config GKI_LEGACY_WEXT_ALLCONFIG
+	bool "Hidden wireless extension configs needed for GKI"
+	select WIRELESS_EXT
+	select WEXT_CORE
+	select WEXT_PROC
+	select WEXT_SPY
+	select WEXT_PRIV
+	help
+	  Placeholder config option used to enable all the hidden legacy
+	  wireless extensions to the core wireless network functionality used
+	  by add-in modules.  If you are not building a kernel to be used for
+	  a variety of out-of-kernel built wireless modules, say N here.
+
 config GKI_HIDDEN_USB_CONFIGS
 	bool "Hiddel USB configurations needed for GKI"
 	select USB_PHY
@@ -176,6 +193,7 @@ config GKI_HACKS_TO_FIX
 	select GKI_HIDDEN_MMC_CONFIGS
 	select GKI_HIDDEN_GPIO_CONFIGS
 	select GKI_HIDDEN_QCOM_CONFIGS
+	select GKI_LEGACY_WEXT_ALLCONFIG
 	select GKI_HIDDEN_MEDIA_CONFIGS
 	select GKI_HIDDEN_VIRTUAL_CONFIGS
 	select GKI_HIDDEN_USB_CONFIGS