aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuis R. Rodriguez <mcgrof@winlab.rutgers.edu>2008-06-10 21:34:41 -0700
committerLuis R. Rodriguez <mcgrof@winlab.rutgers.edu>2008-06-10 21:34:41 -0700
commit5e9e08524867f22c7bb4cf70303e1c7d3f839134 (patch)
treee9c7fa67a1b741cbbc8841492a41cdfc08197bc1
parent1e19d61176d5070edc6e0aa40685104d37a95b57 (diff)
downloadcompat-wireless-2.6-old-5e9e08524867f22c7bb4cf70303e1c7d3f839134.tar.gz
Lets not rely on your .config for CONFIG_MAC80211_QOS and simply
enable it if MQ is supported. Signed-off-by: Tomas Winkler <tomasw@gmail.com> Signed-off-by: Luis R. Rodriguez <mcgrof@winlab.rutgers.edu>
-rw-r--r--config.mk2
-rwxr-xr-xscripts/unload.sh3
2 files changed, 4 insertions, 1 deletions
diff --git a/config.mk b/config.mk
index e8dc469..66a1244 100644
--- a/config.mk
+++ b/config.mk
@@ -28,6 +28,8 @@ CONFIG_MAC80211_QOS=y
else
ifeq ($(CONFIG_NETDEVICES_MULTIQUEUE),)
$(warning "WARNING: You are running a kernel >= 2.6.23, you should enable CONFIG_NETDEVICES_MULTIQUEUE for 802.11n support")
+else
+CONFIG_MAC80211_QOS=y
endif
endif
endif
diff --git a/scripts/unload.sh b/scripts/unload.sh
index 0090fd1..0ea082f 100755
--- a/scripts/unload.sh
+++ b/scripts/unload.sh
@@ -2,7 +2,8 @@
# The old stack drivers and the mac80211 rc80211_simple modules
# which is no longer on recent kernels (its internal)
-OLD_MODULES="rc80211_simple zd1211rw zd1211rw-mac80211 bcm43xx rndis_wext"
+OLD_MODULES="iwlwifi_mac80211 rc80211_simple zd1211rw zd1211rw-mac80211"
+OLD_MODULES="$OLD_MODULES bcm43xx rndis_wext"
MODULES="$OLD_MODULES"
MODULES="$MODULES ipw2100 ipw2200"
MODULES="$MODULES libertas_cs usb8xxx libertas"