mac80211: include the kfifo backport in compat.ko if necessary (backport of r24978)

SVN-Revision: 24987

diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile
index 3aec1cd1a640b4992487780eb6bf4d18817141e6..56a56d8f78a65458dee5eabfd6387d46598e34c1 100644 (file)
--- a/package/mac80211/Makefile
+++ b/package/mac80211/Makefile
@@ -994,6 +994,10 @@ MAKE_OPTS:= \
        KLIB=$(TARGET_MODULES_DIR) \
        KERNEL_SUBLEVEL=$(lastword $(subst ., ,$(KERNEL_PATCHVER)))
 
+ifeq ($(CONFIG_PACKAGE_kmod-libertas-sd)$(CONFIG_PACKAGE_kmod-libertas-usb)$(CONFIG_PACKAGE_kmod-rt2x00-lib),)
+  MAKE_OPTS += CONFIG_COMPAT_KFIFO=
+endif
+
 define Build/Prepare
        rm -rf $(PKG_BUILD_DIR)
        mkdir -p $(PKG_BUILD_DIR)

diff --git a/package/mac80211/patches/040-include_kfifo.patch b/package/mac80211/patches/040-include_kfifo.patch
new file mode 100644 (file)
index 0000000..3ea64b5
--- /dev/null
+++ b/package/mac80211/patches/040-include_kfifo.patch
@@ -0,0 +1,24 @@
+--- a/compat/Makefile
++++ b/compat/Makefile
+@@ -2,9 +2,9 @@ obj-m += compat.o
+ #compat-objs :=
+ 
+ obj-$(CONFIG_COMPAT_FIRMWARE_CLASS) += compat_firmware_class.o
+-obj-$(CONFIG_COMPAT_KFIFO) += kfifo.o
+ 
+ compat-y += main.o
++compat-$(CONFIG_COMPAT_KFIFO) += kfifo.o
+ 
+ # Compat kernel compatibility code
+ compat-$(CONFIG_COMPAT_KERNEL_14) += compat-2.6.14.o
+--- a/config.mk
++++ b/config.mk
+@@ -90,7 +90,7 @@ endif #CONFIG_FW_LOADER
+ endif #CONFIG_COMPAT_KERNEL_33
+ 
+ ifdef CONFIG_COMPAT_KERNEL_36
+-CONFIG_COMPAT_KFIFO=m
++CONFIG_COMPAT_KFIFO=y
+ endif #CONFIG_COMPAT_KERNEL_36
+ 
+