From d9de77731226c5815159b615bef0b36acbd45a70 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sun, 8 Aug 2010 12:17:13 +0200 Subject: [PATCH] Updated compat-wireless to current stable (2.6.35-1). Add ath9k to madwifi blacklist comment. --- .../core/40/filelists/compat-wireless | 18 ++++++++++++++++++ lfs/compat-wireless | 4 ++-- lfs/madwifi | 1 + 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/config/rootfiles/core/40/filelists/compat-wireless b/config/rootfiles/core/40/filelists/compat-wireless index ab7affd172..521e7f24fc 100644 --- a/config/rootfiles/core/40/filelists/compat-wireless +++ b/config/rootfiles/core/40/filelists/compat-wireless @@ -47,6 +47,7 @@ lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/ath/ath.ko lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/ath/ath5k/ath5k.ko lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/ath/ath9k/ath9k.ko lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/ath/ath9k/ath9k_common.ko +lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/ath/ath9k/ath9k_htc.ko lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/ath/ath9k/ath9k_hw.ko lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/b43/b43.ko lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/b43legacy/b43legacy.ko @@ -65,6 +66,14 @@ lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/libertas_tf/libertas_tf lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/libertas_tf/libertas_tf_usb.ko lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/mac80211_hwsim.ko lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/mwl8k.ko +lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/orinoco/orinoco.ko +lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_cs.ko +lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_nortel.ko +lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_pci.ko +lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_plx.ko +lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_tmd.ko +lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/orinoco/orinoco_usb.ko +lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/orinoco/spectrum_cs.ko lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/p54/p54common.ko lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/p54/p54pci.ko lib/modules/2.6.32.15-ipfire/kernel/drivers/net/wireless/p54/p54usb.ko @@ -149,6 +158,7 @@ lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/ath/ath.ko lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/ath/ath5k/ath5k.ko lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/ath/ath9k/ath9k.ko lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/ath/ath9k/ath9k_common.ko +lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/ath/ath9k/ath9k_htc.ko lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/ath/ath9k/ath9k_hw.ko lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/b43/b43.ko lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/b43legacy/b43legacy.ko @@ -167,6 +177,14 @@ lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/libertas_tf/liberta lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/libertas_tf/libertas_tf_usb.ko lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/mac80211_hwsim.ko lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/mwl8k.ko +lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco.ko +lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_cs.ko +lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_nortel.ko +lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_pci.ko +lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_plx.ko +lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_tmd.ko +lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/orinoco/orinoco_usb.ko +lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/orinoco/spectrum_cs.ko lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/p54/p54common.ko lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/p54/p54pci.ko lib/modules/2.6.32.15-ipfire-xen/kernel/drivers/net/wireless/p54/p54usb.ko diff --git a/lfs/compat-wireless b/lfs/compat-wireless index 44f0fe9a1e..f79309888e 100644 --- a/lfs/compat-wireless +++ b/lfs/compat-wireless @@ -30,7 +30,7 @@ else VERSUFIX=ipfire endif -VER = 2.6.34.1 +VER = 2.6.35-1 THISAPP = compat-wireless-$(VER) DL_FILE = compat-wireless-$(VER).tar.bz2 @@ -46,7 +46,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_MD5 = 80ceb675aeba45847258770441352af6 +$(DL_FILE)_MD5 = 41c51280e5aa140c62a2a9871e2ae505 install : $(TARGET) diff --git a/lfs/madwifi b/lfs/madwifi index 0777372f71..8b8a75b3c7 100644 --- a/lfs/madwifi +++ b/lfs/madwifi @@ -88,6 +88,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) # 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 -- 2.39.2