X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fmadwifi;h=90f1a1c67ed7a0d8233633db864ccaeb2d7a212a;hb=a408c745d77ed569da9066ca2c95cda587f327e7;hp=87d54b1f5c86fa7c8384665395659fd0a6b5ced3;hpb=7ea4817b4a8bd56722e9406bc999d869fb7dec2b;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/madwifi b/lfs/madwifi
index 87d54b1f5c..90f1a1c67e 100644
--- a/lfs/madwifi
+++ b/lfs/madwifi
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2008  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2010  IPFire Team <info@ipfire.org>                           #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,13 +24,18 @@
 
 include Config
 
+ifeq "$(PAE)" "1"
+	VERSUFIX=ipfire-pae
+else
+
 ifeq "$(XEN)" "1"
 	VERSUFIX=ipfire-xen
 else
 	VERSUFIX=ipfire
 endif
+endif
 
-VER        = hal-0.10.5.6-r4031-20090529
+VER        = hal-0.10.5.6-r4119-20100201
 
 THISAPP    = madwifi-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -46,7 +51,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
-$(DL_FILE)_MD5 = af13564a45bb6fbb1d8834ed528a0a59
+$(DL_FILE)_MD5 = 937cf8f185ddd39b95e7ce026f9fba63
 
 install : $(TARGET)
 
@@ -82,11 +87,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cp -f $(DIR_SRC)/config/madwifi/madwifi.conf /etc/
 	ln -sf $(DIR_APP) $(DIR_SRC)/madwifi 
 
-	# Set Countrycode to germany because some cards
-	# are not detected without cc
-	echo 'options ath_pci countrycode=276' > /etc/modprobe.d/madwifi
-	echo '#blacklist ath_pci' >> /etc/modprobe.d/madwifi
-	echo 'blacklist ath5k' >> /etc/modprobe.d/madwifi
+	# Add comment to set CountryCode to germany because some cards
+	# are not detected without cc but others doesn't like this
+	echo '#options ath_pci countrycode=276' > /etc/modprobe.d/madwifi
+	# Blacklist ath5k or madwifi for switching between the drivers
+	echo 'blacklist ath_pci' >> /etc/modprobe.d/madwifi
+	echo '#blacklist ath5k' >> /etc/modprobe.d/madwifi
+	echo '#blacklist ath9k' >> /etc/modprobe.d/madwifi
 
 	# create madwifi symlink for hostapd build
 	cd $(DIR_SRC) && ln -sf $(THISAPP) madwifi