conf/machine/dm8000.conf: fixes for broadcom kernel 2.6.18

diff --git a/conf/machine/dm8000.conf b/conf/machine/dm8000.conf
index 161fed0..ab018d1 100644 (file)
--- a/conf/machine/dm8000.conf
+++ b/conf/machine/dm8000.conf
@@ -7,6 +7,10 @@ PREFERRED_VERSION_linux-dm8000 = "2.6.18"
 PREFERRED_VERSION_linux-libc-headers = "2.6.18"
 
 PREFERRED_VERSION_madwifi-ng = "r3314-20080131"
+
+#needed for wpa-supplicant
+COMBINED_FEATURES_append = "${@base_contains('PREFERRED_VERSION_linux-dm8000', '2.6.18', 'madwifi', 'nl80211', d)}
+
 JAVA_mipsel = ",java"
 
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS_2.6.18 = "\

diff --git a/recipes/wpa-supplicant/files/opendreambox/defconfig-0.6.0-gnutls b/recipes/wpa-supplicant/files/opendreambox/defconfig-0.6.0-gnutls
index 49e19ba..4ad2ceb 100644 (file)
--- a/recipes/wpa-supplicant/files/opendreambox/defconfig-0.6.0-gnutls
+++ b/recipes/wpa-supplicant/files/opendreambox/defconfig-0.6.0-gnutls
@@ -83,7 +83,7 @@
 CONFIG_DRIVER_WEXT=y
 
 # Driver interface for Linux drivers using the nl80211 kernel interface
-CONFIG_DRIVER_NL80211=y
+#CONFIG_DRIVER_NL80211=y
 
 # Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
 #CONFIG_DRIVER_BSD=y