aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuis R. Rodriguez <mcgrof@winlab.rutgers.edu>2008-03-02 21:02:05 -0500
committerLuis R. Rodriguez <mcgrof@winlab.rutgers.edu>2008-03-02 21:02:05 -0500
commit4c9e9ab453c8dd4c085abf6bda5b93b1d360d54b (patch)
tree316118a74b4b221aa3c9f3f650826e66dc3f9759
parentdc63f8515af109cd557be49fb845bbedbd4c3a51 (diff)
downloadcompat-wireless-2.6-old-4c9e9ab453c8dd4c085abf6bda5b93b1d360d54b.tar.gz
Libertas uses the old ieee80211 stack for now
but this will be cleane dump soon (tm). Signed-off-by: Johannes Berg <johannes@sipsolutions.net> Signed-off-by: Luis R. Rodriguez <mcgrof@winlab.rutgers.edu>
-rw-r--r--config.mk28
1 files changed, 14 insertions, 14 deletions
diff --git a/config.mk b/config.mk
index da211bd..3186241 100644
--- a/config.mk
+++ b/config.mk
@@ -141,20 +141,6 @@ CONFIG_SSB_PCICORE_HOSTMODE=n
# CONFIG_SSB_DEBUG is not set
# CONFIG_SSB_DRIVER_EXTIF=y
-ifeq ($(NEED_IEEE80211),y)
-# Old ieee80211 "stack"
-# Note: old softmac is scheduled for removal so we
-# ignore that stuff
-CONFIG_IEEE80211=m
-CONFIG_IEEE80211_CRYPT_CCMP=m
-CONFIG_IEEE80211_CRYPT_TKIP=m
-CONFIG_IEEE80211_CRYPT_WEP=m
-CONFIG_IEEE80211_SOFTMAC=n
-# Old drivers which use the old stack
-endif
-
-# Libertas uses the old stack but not fully, it will soon
-# be cleaned.
ifneq ($(CONFIG_USB),)
CONFIG_LIBERTAS_USB=m
NEED_LIBERTAS=y
@@ -165,4 +151,18 @@ NEED_LIBERTAS=y
endif
ifeq ($(NEED_LIBERTAS),y)
CONFIG_LIBERTAS=m
+# Libertas uses the old stack but not fully, it will soon
+# be cleaned.
+NEED_IEEE80211=y
+endif
+
+ifeq ($(NEED_IEEE80211),y)
+# Old ieee80211 "stack"
+# Note: old softmac is scheduled for removal so we
+# ignore that stuff
+CONFIG_IEEE80211=m
+CONFIG_IEEE80211_CRYPT_CCMP=m
+CONFIG_IEEE80211_CRYPT_TKIP=m
+CONFIG_IEEE80211_CRYPT_WEP=m
+CONFIG_IEEE80211_SOFTMAC=n
endif