diff --git a/iwl3945.modprobe b/iwl3945.modprobe
new file mode 100644
index 0000000..e1426fb
--- /dev/null
+++ b/iwl3945.modprobe
@@ -0,0 +1 @@
+options iwl3945 disable_hw_scan=1
diff --git a/wireless-tools.changes b/wireless-tools.changes
index 7d6cb43..49d8e7e 100644
--- a/wireless-tools.changes
+++ b/wireless-tools.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Fri Feb  5 20:22:05 CET 2010 - vlado@suse.cz
+
+- iwl3945.modprobe added, bnc #556665
+
+-------------------------------------------------------------------
+Sun Jan 31 20:56:53 CET 2010 - meissner@suse.de
+
+- remove inline hacking from iwlib.h, it breaks C++ 
+  usage of iwlib.h
+
 -------------------------------------------------------------------
 Tue Jan  5 17:23:18 CET 2010 - jengelh@medozas.de
 
diff --git a/wireless-tools.spec b/wireless-tools.spec
index a3f4302..37c74d4 100644
--- a/wireless-tools.spec
+++ b/wireless-tools.spec
@@ -23,7 +23,7 @@ BuildRequires:  openssl-devel udev
 Summary:        Tools for a wireless LAN
 %define major_version 30
 Version:        %{major_version}.pre8
-Release:        6
+Release:        7
 Group:          Hardware/Wifi
 License:        GPLv2+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -38,6 +38,7 @@ Source5:        prism54.modprobe
 Source6:        lwepgen.tar.bz2
 Source8:        iwlwifi-led.sh
 Source9:        99-iwlwifi-led.rules
+Source10:       iwl3945.modprobe
 Requires:       libiw = %{version}
 
 %package -n libiw30
@@ -113,6 +114,7 @@ install -m755 install_acx100_firmware %{buildroot}/usr/sbin
 install -m755 ../lwepgen/lwepgen %{buildroot}/usr/sbin
 mkdir -p %{buildroot}/etc/modprobe.d
 install -m644 %{SOURCE4} %{buildroot}/etc/modprobe.d/50-ipw2200.conf
+install -m644 %{SOURCE10} %{buildroot}/etc/modprobe.d/50-iwl3945.conf
 %ifarch %ix86 x86_64
 install -m644 %{SOURCE5} %{buildroot}/etc/modprobe.d/50-prism54.conf
 %endif
diff --git a/wireless_tools.dif b/wireless_tools.dif
index 3cdb293..b65f00f 100644
--- a/wireless_tools.dif
+++ b/wireless_tools.dif
@@ -1,8 +1,8 @@
 Index: Makefile
 ===================================================================
---- Makefile.orig	2008-08-30 00:24:55.000000000 +0000
-+++ Makefile	2008-11-08 19:09:26.000000000 +0000
-@@ -19,7 +19,7 @@
+--- Makefile.orig
++++ Makefile
+@@ -19,7 +19,7 @@ RANLIB = ranlib
  ## a local version (non-root).
  ## Standard distros should comment that option to save space and to
  ## build libiw.so used by third parties...
@@ -11,7 +11,7 @@ Index: Makefile
  
  ## Uncomment this to build without using libm (less efficient).
  ## This is mostly useful for embedded platforms without maths.
-@@ -105,7 +105,7 @@
+@@ -105,7 +105,7 @@ endif
  
  # Other flags
  CFLAGS=-Os -W -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow \
@@ -20,7 +20,7 @@ Index: Makefile
  #CFLAGS=-O2 -W -Wall -Wstrict-prototypes -I.
  DEPFLAGS=-MMD
  XCFLAGS=$(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS) $(WELIB_FLAG) $(WEDEF_FLAG)
-@@ -121,6 +121,9 @@
+@@ -121,6 +121,9 @@ all:: $(IWLIB) $(PROGS)
  %.so: %.c wireless.h
  	$(CC) $(XCFLAGS) $(PICFLAG) -c -o $@ $<
  
@@ -30,3 +30,44 @@ Index: Makefile
  iwconfig: iwconfig.o $(IWLIB)
  
  iwlist: iwlist.o $(IWLIB)
+Index: iwlib.h
+===================================================================
+--- iwlib.h.orig
++++ iwlib.h
+@@ -60,36 +60,6 @@
+ /* Private copy of Wireless extensions (in this directoty) */
+ #include "wireless.h"
+ 
+-/* Make gcc understant that when we say inline, we mean it.
+- * I really hate when the compiler is trying to be more clever than me,
+- * because in this case gcc is not able to figure out functions with a
+- * single call site, so not only I have to tag those functions inline
+- * by hand, but then it refuse to inline them properly.
+- * Total saving for iwevent : 150B = 0.7%.
+- * Fortunately, in gcc 3.4, they now automatically inline static functions
+- * with a single call site. Hurrah !
+- * Jean II */
+-#undef IW_GCC_HAS_BROKEN_INLINE
+-#if __GNUC__ == 3
+-#if __GNUC_MINOR__ >= 1 && __GNUC_MINOR__ < 4
+-#define IW_GCC_HAS_BROKEN_INLINE	1
+-#endif	/* __GNUC_MINOR__ */
+-#endif	/* __GNUC__ */
+-/* However, gcc 4.0 has introduce a new "feature", when compiling with
+- * '-Os', it does not want to inline iw_ether_cmp() and friends.
+- * So, we need to fix inline again !
+- * Jean II */
+-#if __GNUC__ == 4
+-#define IW_GCC_HAS_BROKEN_INLINE	1
+-#endif	/* __GNUC__ */
+-/* Now, really fix the inline */
+-#ifdef IW_GCC_HAS_BROKEN_INLINE
+-#ifdef inline
+-#undef inline
+-#endif	/* inline */
+-#define inline		inline		__attribute__((always_inline))
+-#endif	/* IW_GCC_HAS_BROKEN_INLINE */
+-
+ #ifdef __cplusplus
+ extern "C" {
+ #endif