diff options
| author | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-04-24 08:05:46 +0000 |
|---|---|---|
| committer | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-04-24 08:05:46 +0000 |
| commit | ff9443f5d5dfca2e636f95116341ed111b917aec (patch) | |
| tree | 7d158c72899310e671b8400784200b36d170a0dc /package/acx-mac80211 | |
| parent | 5deef26972b3eba6633250bb89d2c93fe48efa42 (diff) | |
[package] acx-mac80211: update to 20122204
Upstream commit id: 15bbffea
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31455 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/acx-mac80211')
| -rw-r--r-- | package/acx-mac80211/Makefile | 6 | ||||
| -rw-r--r-- | package/acx-mac80211/patches/003-build_as_modules.patch | 14 | ||||
| -rw-r--r-- | package/acx-mac80211/patches/004-ratelimit_compile_fix.patch | 8 |
3 files changed, 16 insertions, 12 deletions
diff --git a/package/acx-mac80211/Makefile b/package/acx-mac80211/Makefile index 5b560c061..46fe7712c 100644 --- a/package/acx-mac80211/Makefile +++ b/package/acx-mac80211/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2011 OpenWrt.org +# Copyright (C) 2007-2012 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,8 +9,8 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=acx-mac80211 -PKG_REV:=09bebfda18d7000bfeaa4d5d49db90ef601f23a3 -PKG_VERSION:=20111030 +PKG_REV:=15bbffeadc1928a21a8a5f6519a5aea13b50678a +PKG_VERSION:=20120422 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 diff --git a/package/acx-mac80211/patches/003-build_as_modules.patch b/package/acx-mac80211/patches/003-build_as_modules.patch index 31a6aae6c..e0a3fd0e7 100644 --- a/package/acx-mac80211/patches/003-build_as_modules.patch +++ b/package/acx-mac80211/patches/003-build_as_modules.patch @@ -1,11 +1,13 @@ ---- a/Makefile -+++ b/Makefile -@@ -29,7 +29,7 @@ ifneq ($(KERNELRELEASE),) +Index: acx-mac80211-20120422/Makefile +=================================================================== +--- acx-mac80211-20120422.orig/Makefile 2012-04-23 17:35:13.000000000 +0200 ++++ acx-mac80211-20120422/Makefile 2012-04-23 17:36:55.386257951 +0200 +@@ -30,7 +30,7 @@ acx-mac80211-obj-$(CONFIG_ACX_MAC80211_PCI) += pci.o acx-mac80211-obj-$(CONFIG_ACX_MAC80211_USB) += usb.o acx-mac80211-obj-$(CONFIG_ACX_MAC80211_MEM) += mem.o -- acx-mac80211-objs := common.o $(acx-mac80211-obj-y) -+ acx-mac80211-objs := common.o $(acx-mac80211-obj-m) - +- acx-mac80211-objs := common.o $(acx-mac80211-obj-y) merge.o ++ acx-mac80211-objs := common.o $(acx-mac80211-obj-m) merge.o + else # Otherwise we were called directly from the command line: the kernel build diff --git a/package/acx-mac80211/patches/004-ratelimit_compile_fix.patch b/package/acx-mac80211/patches/004-ratelimit_compile_fix.patch index 34ba08d9b..a30e3dc7d 100644 --- a/package/acx-mac80211/patches/004-ratelimit_compile_fix.patch +++ b/package/acx-mac80211/patches/004-ratelimit_compile_fix.patch @@ -1,6 +1,8 @@ ---- a/common.c -+++ b/common.c -@@ -31,6 +31,7 @@ +Index: acx-mac80211-20120422/common.c +=================================================================== +--- acx-mac80211-20120422.orig/common.c 2012-04-23 17:35:13.000000000 +0200 ++++ acx-mac80211-20120422/common.c 2012-04-23 17:37:02.818257747 +0200 +@@ -33,6 +33,7 @@ #include <linux/ethtool.h> #include <linux/nl80211.h> #include <linux/ieee80211.h> |