diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2011-01-13 23:28:22 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2011-01-13 23:28:22 +0000 |
| commit | f05691af9327a1e6ec281ef0ea4425a530d2f633 (patch) | |
| tree | 66e0737ec80f3acc26064c06d3c94de16bcf5eb1 | |
| parent | 2c0ac457ed55ba61b3391e25dd9ae58eff05b529 (diff) | |
| download | upstream-f05691af9327a1e6ec281ef0ea4425a530d2f633.tar.gz upstream-f05691af9327a1e6ec281ef0ea4425a530d2f633.tar.bz2 upstream-f05691af9327a1e6ec281ef0ea4425a530d2f633.zip | |
mac80211: include the kfifo backport in compat.ko if necessary (fixes libertas, rt2x00)
SVN-Revision: 24978
| -rw-r--r-- | package/mac80211/Makefile | 4 | ||||
| -rw-r--r-- | package/mac80211/patches/040-include_kfifo.patch | 24 |
2 files changed, 28 insertions, 0 deletions
diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile index 5317a098eb..11564c5b05 100644 --- 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 index 0000000000..3ea64b56a7 --- /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 + + |