From 12855832e8bb58fea914542ada01014ba7c145daf3c871e538fd9737945b75cb Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Fri, 21 Dec 2007 09:24:28 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/wireless-tools?expand=0&rev=11

---
 iwlwifi.modprobe       |  2 --
 prism54.modprobe       |  1 +
 wireless-tools.changes |  6 ++++++
 wireless-tools.spec    | 13 ++++++++-----
 4 files changed, 15 insertions(+), 7 deletions(-)
 delete mode 100644 iwlwifi.modprobe
 create mode 100644 prism54.modprobe

diff --git a/iwlwifi.modprobe b/iwlwifi.modprobe
deleted file mode 100644
index 5cff53f..0000000
--- a/iwlwifi.modprobe
+++ /dev/null
@@ -1,2 +0,0 @@
-options iwl3945 disable_hw_scan=1
-options iwl4965 disable_hw_scan=1
diff --git a/prism54.modprobe b/prism54.modprobe
new file mode 100644
index 0000000..c1bc918
--- /dev/null
+++ b/prism54.modprobe
@@ -0,0 +1 @@
+blacklist prism54
diff --git a/wireless-tools.changes b/wireless-tools.changes
index 862dea3..476564a 100644
--- a/wireless-tools.changes
+++ b/wireless-tools.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Dec 20 16:41:39 CET 2007 - jg@suse.de
+
+- re-enable hwscan for iwlwifi devices
+- blacklist prism54 to prefer p54 driver (bug 300892)
+
 -------------------------------------------------------------------
 Tue Sep 11 02:07:29 CEST 2007 - ro@suse.de
 
diff --git a/wireless-tools.spec b/wireless-tools.spec
index 4578b8b..0933da0 100644
--- a/wireless-tools.spec
+++ b/wireless-tools.spec
@@ -14,18 +14,18 @@ Name:           wireless-tools
 BuildRequires:  openssl-devel
 Summary:        Tools for a wireless LAN
 Version:        29pre22
-Release:        12
+Release:        30
 %define wlanng_version 0.2.5
 Group:          Hardware/Wifi
 License:        GPL v2 or later
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-URL:            http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html
-Autoreqprov:    on
+Url:            http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html
+AutoReqProv:    on
 Source:         wireless_tools.29.pre22.tar.bz2
 Patch:          wireless_tools.dif
 Source2:        suse-files.tar.gz
 Source4:        ipw2200.modprobe
-Source5:        iwlwifi.modprobe
+Source5:        prism54.modprobe
 Source6:        lwepgen.tar.bz2
 
 %description
@@ -69,7 +69,7 @@ echo "# disable ipw2100 on x86_64 (module broken)"
 echo "install ipw2100 /bin/true" >> %{buildroot}/etc/modprobe.d/ipw2100
 %endif
 %ifarch %ix86 x86_64
-install -m644 %{SOURCE5} %{buildroot}/etc/modprobe.d/iwlwifi
+install -m644 %{SOURCE5} %{buildroot}/etc/modprobe.d/prism54
 %endif
 
 %clean
@@ -86,6 +86,9 @@ test -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" && rm -rf $RPM_BUILD_ROOT
 %doc CHANGELOG.h INSTALL PCMCIA.txt README*
 
 %changelog
+* Thu Dec 20 2007 - jg@suse.de
+- re-enable hwscan for iwlwifi devices
+- blacklist prism54 to prefer p54 driver (bug 300892)
 * Tue Sep 11 2007 - ro@suse.de
 - added missing endif to fix last change
 * Mon Sep 10 2007 - jg@suse.de