From: Hauke Mehrtens <hauke@hauke-m.de>
Date: Tue, 2 Mar 2010 21:26:36 +0000 (+0000)
Subject: kernel: add some missing config files and make compat-wireless build with kernel... 
X-Git-Tag: reboot~20852
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f88371a696184b163f5a7ddd48df16c1c81e7305;p=oweals%2Fopenwrt.git

kernel: add some missing config files and make compat-wireless build with kernel 2.6.33

Thanks tripolar for the missing config symbols

SVN-Revision: 19956
---

diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile
index b83fc1d743..02b355959f 100644
--- a/package/mac80211/Makefile
+++ b/package/mac80211/Makefile
@@ -42,12 +42,21 @@ define KernelPackage/mac80211
   $(call KernelPackage/mac80211/Default)
   TITLE:=Linux 802.11 Wireless Networking Stack
   DEPENDS+= +kmod-crypto-core +kmod-crypto-arc4 +kmod-crypto-aes +wireless-tools +iw @!LINUX_2_6_25
+ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,2.6.33)),1) 
+  FILES:= \
+	$(PKG_BUILD_DIR)/compat/compat.$(LINUX_KMOD_SUFFIX) \
+	$(PKG_BUILD_DIR)/net/mac80211/mac80211.$(LINUX_KMOD_SUFFIX) \
+	$(PKG_BUILD_DIR)/net/wireless/cfg80211.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,20,compat cfg80211 mac80211)
+else 
   FILES:= \
 	$(PKG_BUILD_DIR)/compat/compat.$(LINUX_KMOD_SUFFIX) \
 	$(PKG_BUILD_DIR)/compat/compat_firmware_class.$(LINUX_KMOD_SUFFIX) \
 	$(PKG_BUILD_DIR)/net/mac80211/mac80211.$(LINUX_KMOD_SUFFIX) \
 	$(PKG_BUILD_DIR)/net/wireless/cfg80211.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,20,compat compat_firmware_class cfg80211 mac80211)
+endif
+
 endef
 
 define KernelPackage/mac80211/config
diff --git a/target/linux/generic-2.6/config-2.6.33 b/target/linux/generic-2.6/config-2.6.33
index 6540e7a33c..283ad01434 100644
--- a/target/linux/generic-2.6/config-2.6.33
+++ b/target/linux/generic-2.6/config-2.6.33
@@ -20,6 +20,7 @@ CONFIG_AIO=y
 # CONFIG_AIRO is not set
 # CONFIG_ALIM7101_WDT is not set
 # CONFIG_ALTERA_PCIE_CHDMA is not set
+# CONFIG_R8187SE is not set
 # CONFIG_AMD8111_ETH is not set
 # CONFIG_AMIGA_PARTITION is not set
 # CONFIG_ANDROID is not set
@@ -842,6 +843,8 @@ CONFIG_IDE_PROC_FS=y
 # CONFIG_IGB is not set
 # CONFIG_IGBVF is not set
 # CONFIG_IIO is not set
+# CONFIG_RAMZSWAP is not set
+# CONFIG_BATMAN_ADV is not set
 # CONFIG_IKCONFIG is not set
 # CONFIG_IKCONFIG_PROC is not set
 # CONFIG_IMAGE_CMDLINE_HACK is not set
@@ -1102,6 +1105,7 @@ CONFIG_KERNEL_LZMA=y
 # CONFIG_KEYBOARD_OPENCORES is not set
 # CONFIG_KEYS is not set
 # CONFIG_KGDB is not set
+# CONFIG_CMDLINE_BOOL is not set
 # CONFIG_KMEMTRACE is not set
 CONFIG_KMOD=y
 # CONFIG_KPROBES is not set
@@ -1120,6 +1124,7 @@ CONFIG_LBDAF=y
 CONFIG_LEDS_CLASS=y
 # CONFIG_LEDS_DAC124S085 is not set
 CONFIG_LEDS_GPIO_PLATFORM=y
+# CONFIG_LEDS_LT3593 is not set
 # CONFIG_LEDS_LP3944 is not set
 # CONFIG_LEDS_LP5521 is not set
 # CONFIG_LEDS_PCA9532 is not set
@@ -1855,6 +1860,7 @@ CONFIG_RTC_LIB=y
 # CONFIG_RTL8187 is not set
 # CONFIG_RTL8187SE is not set
 # CONFIG_RTL8192E is not set
+# CONFIG_RTL8192U is not set
 # CONFIG_RTL8192SU is not set
 # CONFIG_RTL8306_PHY is not set
 # CONFIG_RTL8366_SMI is not set
@@ -2773,6 +2779,10 @@ CONFIG_WLAN_80211=y
 CONFIG_WLAN=y
 # CONFIG_WORKQUEUE_TRACER is not set
 # CONFIG_WR_PPMC is not set
+CONFIG_WEXT_CORE=y
+CONFIG_WEXT_PROC=y
+CONFIG_WEXT_PRIV=y
+CONFIG_WEXT_SPY=y
 # CONFIG_X25 is not set
 # CONFIG_XFRM_IPCOMP is not set
 # CONFIG_XFRM_MIGRATE is not set
@@ -2806,3 +2816,5 @@ CONFIG_ZLIB_DEFLATE=y
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZONE_DMA_FLAG=1
 CONFIG_ZONE_DMA=y
+CONFIG_DEFAULT_SECURITY_DAC=y
+CONFIG_DEFAULT_SECURITY=""
diff --git a/target/linux/generic-2.6/patches-2.6.33/981-wireless_ext_kconfig_hack.patch b/target/linux/generic-2.6/patches-2.6.33/981-wireless_ext_kconfig_hack.patch
new file mode 100644
index 0000000000..daac5898ae
--- /dev/null
+++ b/target/linux/generic-2.6/patches-2.6.33/981-wireless_ext_kconfig_hack.patch
@@ -0,0 +1,22 @@
+--- a/net/wireless/Kconfig
++++ b/net/wireless/Kconfig
+@@ -1,5 +1,5 @@
+ config WIRELESS_EXT
+-	bool
++	bool "Wireless extensions"
+ 
+ config WEXT_CORE
+ 	def_bool y
+@@ -11,10 +11,10 @@ config WEXT_PROC
+ 	depends on WEXT_CORE
+ 
+ config WEXT_SPY
+-	bool
++	bool "WEXT_SPY"
+ 
+ config WEXT_PRIV
+-	bool
++	bool "WEXT_PRIV"
+ 
+ config CFG80211
+ 	tristate "cfg80211 - wireless configuration API"