diff options
| author | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-10-14 15:41:16 +0000 |
|---|---|---|
| committer | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-10-14 15:41:16 +0000 |
| commit | 7fc94810d3cbe8770b2edbcb8a3c59a9dcf9ad83 (patch) | |
| tree | 0b8837896cc1662e7873ce0cee2413140ddd38a3 /package/acx-mac80211 | |
| parent | 8110efa0d3f3a5f1794fe19457de34b1084849d1 (diff) | |
| download | openwrt-7fc94810d3cbe8770b2edbcb8a3c59a9dcf9ad83.tar.gz openwrt-7fc94810d3cbe8770b2edbcb8a3c59a9dcf9ad83.zip | |
attitude_adjustment: backport ar7 changes r33744 to r33756 changes
git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@33764 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/acx-mac80211')
4 files changed, 41 insertions, 32 deletions
diff --git a/package/acx-mac80211/Makefile b/package/acx-mac80211/Makefile index 40b3ce5ed..80e52820e 100644 --- a/package/acx-mac80211/Makefile +++ b/package/acx-mac80211/Makefile @@ -9,8 +9,8 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=acx-mac80211 -PKG_REV:=v20120607 -PKG_VERSION:=20120607 +PKG_REV:=v2012-09-23-WIP +PKG_VERSION:=20121004 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 @@ -28,6 +28,7 @@ define KernelPackage/acx-mac80211 DEPENDS:=@(PCI_SUPPORT||TARGET_ar7) @mipsel +kmod-mac80211 FILES:=$(PKG_BUILD_DIR)/acx-mac80211.ko AUTOLOAD:=$(call AutoLoad,50,acx-mac80211) + MAINTAINER:=Florian Fainelli <florian@openwrt.org> MENU:=1 endef diff --git a/package/acx-mac80211/patches/001-make-compatible-with-recent-mac80211.patch b/package/acx-mac80211/patches/001-make-compatible-with-recent-mac80211.patch index 34ecf6d4a..3b1afee41 100644 --- a/package/acx-mac80211/patches/001-make-compatible-with-recent-mac80211.patch +++ b/package/acx-mac80211/patches/001-make-compatible-with-recent-mac80211.patch @@ -1,22 +1,7 @@ ---- a/acx_func.h -+++ b/acx_func.h -@@ -335,8 +335,11 @@ void acx_process_rxbuf(acx_device_t *ade - */ - #if CONFIG_ACX_MAC80211_VERSION < KERNEL_VERSION(2, 6, 39) - int acx_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb); --#else -+#elif CONFIG_ACX_MAC80211_VERSION < KERNEL_VERSION(3, 7, 0) - void acx_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb); -+#else -+void acx_op_tx(struct ieee80211_hw *hw, struct ieee80211_tx_control *control, -+ struct sk_buff *skb); - #endif +--- a/main.h ++++ b/main.h +@@ -44,8 +44,11 @@ void acx_process_rxbuf(acx_device_t *ade - void acx_tx_work(struct work_struct *work); ---- a/common.c -+++ b/common.c -@@ -232,8 +232,11 @@ static void acx_rx(acx_device_t *adev, r - /* Tx Path */ #if CONFIG_ACX_MAC80211_VERSION < KERNEL_VERSION(2, 6, 39) int acx_op_tx(struct ieee80211_hw *hw, struct sk_buff *skb); -#else @@ -27,8 +12,10 @@ + struct sk_buff *skb); #endif - //-void acx_tx_work(struct work_struct *work); -@@ -5183,7 +5186,12 @@ out: + +--- a/main.c ++++ b/main.c +@@ -1024,7 +1024,12 @@ out: * acx_compat, and hiding this #if/else. OTOH, inclusion doesnt care * about old kernels */ diff --git a/package/acx-mac80211/patches/004-ratelimit_compile_fix.patch b/package/acx-mac80211/patches/004-ratelimit_compile_fix.patch deleted file mode 100644 index 56110eab0..000000000 --- a/package/acx-mac80211/patches/004-ratelimit_compile_fix.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/common.c -+++ b/common.c -@@ -34,6 +34,7 @@ - #include <linux/pci.h> - #include <linux/nl80211.h> - #include <linux/ieee80211.h> -+#include <linux/ratelimit.h> - - #include <net/mac80211.h> - diff --git a/package/acx-mac80211/patches/200-initial-macaddr.patch b/package/acx-mac80211/patches/200-initial-macaddr.patch new file mode 100644 index 000000000..498c72dd8 --- /dev/null +++ b/package/acx-mac80211/patches/200-initial-macaddr.patch @@ -0,0 +1,31 @@ +--- a/cardsetting.c 2012-07-03 16:21:25.934102662 -0700 ++++ b/cardsetting.c 2012-07-03 16:49:26.910438174 -0700 +@@ -710,12 +710,27 @@ + u8 stationID[4 + acx_ie_descs[ACX1xx_IE_DOT11_STATION_ID].len]; + const u8 *paddr; + int i, res; ++ const char *prom_addr; ++ char *prom_getenv(const char *name); + + + + res = acx_interrogate(adev, &stationID, ACX1xx_IE_DOT11_STATION_ID); + paddr = &stationID[4]; +- for (i = 0; i < ETH_ALEN; i++) { ++ prom_addr = NULL; ++#ifdef CONFIG_VLYNQ ++ prom_addr = prom_getenv("macwlan"); ++ if (prom_addr == NULL) ++ prom_addr = prom_getenv("mac_ap"); ++#endif ++ if (prom_addr) ++ sscanf(prom_addr, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx", adev->dev_addr, ++ adev->dev_addr + 1, ++ adev->dev_addr + 2, ++ adev->dev_addr + 3, ++ adev->dev_addr + 4, ++ adev->dev_addr + 5); ++ else for (i = 0; i < ETH_ALEN; i++) { + /* we copy the MAC address (reversed in the card) to + * the netdevice's MAC address, and on ifup it will be + * copied into iwadev->dev_addr */ |