compat-wireless: update to 2.6.39-1-sn.

diff --git a/config/kernel/kernel.config.i586-ipfire b/config/kernel/kernel.config.i586-ipfire
index 3fd80c88648519f0e11f5dbd8e265585a2241127..43bba22376af8879593e8406945db33c9a0dce75 100644 (file)
--- a/config/kernel/kernel.config.i586-ipfire
+++ b/config/kernel/kernel.config.i586-ipfire
@@ -1729,15 +1729,7 @@ CONFIG_IPW2200=m
 # CONFIG_IPW2200_DEBUG is not set
 CONFIG_LIBIPW=m
 # CONFIG_LIBIPW_DEBUG is not set
-CONFIG_IWLWIFI=m
-# CONFIG_IWLWIFI_LEDS is not set
-# CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT is not set
-# CONFIG_IWLWIFI_DEBUG is not set
-CONFIG_IWLAGN=m
-CONFIG_IWL4965=y
-CONFIG_IWL5000=y
-CONFIG_IWL3945=m
-# CONFIG_IWL3945_SPECTRUM_MEASUREMENT is not set
+# CONFIG_IWLWIFI is not set
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y
 # CONFIG_HOSTAP_FIRMWARE_NVRAM is not set

diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae
index 6d82de48b3bc975f6d3d96d6a03ef5fdfc12f582..64bbaeca435619e56e45c3097bbdc0a36c0d895b 100644 (file)
--- a/config/kernel/kernel.config.i586-ipfire-pae
+++ b/config/kernel/kernel.config.i586-ipfire-pae
@@ -1735,15 +1735,7 @@ CONFIG_IPW2200=m
 # CONFIG_IPW2200_DEBUG is not set
 CONFIG_LIBIPW=m
 # CONFIG_LIBIPW_DEBUG is not set
-CONFIG_IWLWIFI=m
-# CONFIG_IWLWIFI_LEDS is not set
-# CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT is not set
-# CONFIG_IWLWIFI_DEBUG is not set
-CONFIG_IWLAGN=m
-CONFIG_IWL4965=y
-CONFIG_IWL5000=y
-CONFIG_IWL3945=m
-# CONFIG_IWL3945_SPECTRUM_MEASUREMENT is not set
+# CONFIG_IWLWIFI is not set
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y
 # CONFIG_HOSTAP_FIRMWARE_NVRAM is not set

diff --git a/config/kernel/kernel.config.i586-ipfire-xen b/config/kernel/kernel.config.i586-ipfire-xen
index e5122a97d2ba1cd6e53382014745ae2fbe7c0c64..fa50c954356dd202b07d7136592ac9eb8af1895e 100644 (file)
--- a/config/kernel/kernel.config.i586-ipfire-xen
+++ b/config/kernel/kernel.config.i586-ipfire-xen
@@ -1525,15 +1525,7 @@ CONFIG_IPW2200=m
 # CONFIG_IPW2200_DEBUG is not set
 CONFIG_LIBIPW=m
 # CONFIG_LIBIPW_DEBUG is not set
-CONFIG_IWLWIFI=m
-# CONFIG_IWLWIFI_LEDS is not set
-# CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT is not set
-# CONFIG_IWLWIFI_DEBUG is not set
-CONFIG_IWLAGN=m
-CONFIG_IWL4965=y
-CONFIG_IWL5000=y
-CONFIG_IWL3945=m
-# CONFIG_IWL3945_SPECTRUM_MEASUREMENT is not set
+# CONFIG_IWLWIFI is not set
 CONFIG_HOSTAP=m
 CONFIG_HOSTAP_FIRMWARE=y
 # CONFIG_HOSTAP_FIRMWARE_NVRAM is not set

diff --git a/config/rootfiles/common/compat-wireless b/config/rootfiles/common/compat-wireless
index adc4ab3339862f7112323d6f818a67f12752988a..80018c84d1a323a95040a7d3a4684fc9447a36fd 100644 (file)
--- a/config/rootfiles/common/compat-wireless
+++ b/config/rootfiles/common/compat-wireless
@@ -1,3 +1,2 @@
-etc/modprobe.d/ralink_wireless
 etc/udev/rules.d/50-compat_firmware.rules
 lib/udev/compat_firmware.sh

diff --git a/lfs/compat-wireless b/lfs/compat-wireless
index 22223d7d7a80e9b671c4f3b39ce910aafe958e40..71f3bc9f31d510b070e3e8fcd28d6f6c1ba0b4ac 100644 (file)
--- a/lfs/compat-wireless
+++ b/lfs/compat-wireless
@@ -34,7 +34,7 @@ else
 endif
 endif
 
-VER        = 2.6.38-3-ns
+VER        = 2.6.39-1-sn
 
 THISAPP    = compat-wireless-$(VER)
 DL_FILE    = compat-wireless-$(VER).tar.bz2
@@ -51,7 +51,7 @@ objects = $(DL_FILE) asix-3.5.0a.tar.bz2
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 asix-3.5.0a.tar.bz2 = $(DL_FROM)/asix-3.5.0a.tar.bz2
 
-$(DL_FILE)_MD5 = c4c78d1d41c28f0e9c48ab8098a0a9f2
+$(DL_FILE)_MD5 = ac2b20607d75de8ce2b30b74995383a6
 asix-3.5.0a.tar.bz2_MD5=cc57513505d3ad1a43b58add91d2bba7
 
 install : $(TARGET)
@@ -83,6 +83,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar xjf $(DIR_DL)/$(DL_FILE)
 
+       # kfifo has no license info and taints kernel
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/compat-wireless-2.6.39_kfifo_module_info.patch
+
        # Copy USB-Net drivers from Kernel...
        mkdir $(DIR_APP)/drivers/net/usb/new
        cp $(DIR_APP)/drivers/net/usb/*.c $(DIR_APP)/drivers/net/usb/new
@@ -101,8 +104,5 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP)/udev && install -m 644 50-compat_firmware.rules /etc/udev/rules.d/
        cd $(DIR_APP)/udev && install -m 755 compat_firmware.sh /lib/udev/
 
-       # Disable hwcrypt on rt73 ...
-       echo "options rt73usb nohwcrypt=1" > /etc/modprobe.d/ralink_wireless
-
        -rm -rf $(DIR_APP)
        @$(POSTBUILD)

diff --git a/src/patches/compat-wireless-2.6.39_kfifo_module_info.patch b/src/patches/compat-wireless-2.6.39_kfifo_module_info.patch
new file mode 100644 (file)
index 0000000..eb5d280
--- /dev/null
+++ b/src/patches/compat-wireless-2.6.39_kfifo_module_info.patch
@@ -0,0 +1,14 @@
+diff -Naur compat-wireless-2.6.39-1-sn.org/compat/kfifo.c compat-wireless-2.6.39-1-sn/compat/kfifo.c
+--- compat-wireless-2.6.39-1-sn.org/compat/kfifo.c     2011-05-24 01:43:48.000000000 +0200
++++ compat-wireless-2.6.39-1-sn/compat/kfifo.c 2011-05-24 17:20:06.956818313 +0200
+@@ -27,6 +27,10 @@
+ #include <linux/uaccess.h>
+ #include <linux/kfifo.h>
+ 
++MODULE_LICENSE("GPL");
++MODULE_AUTHOR("Stefani Seibold <stefani@seibold.net>");
++MODULE_DESCRIPTION("A generic kernel FIFO implementation");
++
+ /*
+  * internal helper to calculate the unused elements in a fifo
+  */