From 716ca530e1c4515d8683c9d5be3d56b301758b66 Mon Sep 17 00:00:00 2001
From: James <>
Date: Wed, 4 Nov 2015 11:49:21 +0000
Subject: trunk-47381

---
 package/kernel/acx-mac80211/Makefile               | 260 +++++++++++++++++++++
 .../acx-mac80211/patches/200-initial-macaddr.patch |  29 +++
 .../acx-mac80211/patches/300-kernel_4_2.patch      |  67 ++++++
 3 files changed, 356 insertions(+)
 create mode 100644 package/kernel/acx-mac80211/Makefile
 create mode 100644 package/kernel/acx-mac80211/patches/200-initial-macaddr.patch
 create mode 100644 package/kernel/acx-mac80211/patches/300-kernel_4_2.patch

(limited to 'package/kernel/acx-mac80211')

diff --git a/package/kernel/acx-mac80211/Makefile b/package/kernel/acx-mac80211/Makefile
new file mode 100644
index 0000000..c5c020d
--- /dev/null
+++ b/package/kernel/acx-mac80211/Makefile
@@ -0,0 +1,260 @@
+#
+# Copyright (C) 2007-2012 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=acx-mac80211
+PKG_REV:=b6fc31491020cb01d2cd1acc170cfa03ced7e726
+PKG_VERSION:=20140216
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=git://git.code.sf.net/p/acx100/acx-mac80211
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=$(PKG_REV)
+# PKG_MIRROR_MD5SUM:=
+PKG_BUILD_DEPENDS:=mac80211
+
+PKG_CONFIG_DEPENDS:= \
+	CONFIG_PACKAGE_MAC80211_DEBUGFS \
+	CONFIG_PACKAGE_MAC80211_MESH \
+
+include $(INCLUDE_DIR)/package.mk
+
+define KernelPackage/acx-mac80211
+  SUBMENU:=Wireless Drivers
+  TITLE:=ACX1xx mac80211 driver
+  DEPENDS:=@(PCI_SUPPORT||TARGET_ar7) @!TARGET_cobalt @mipsel +kmod-mac80211
+  FILES:=$(PKG_BUILD_DIR)/acx-mac80211.ko
+  AUTOLOAD:=$(call AutoLoad,50,mac80211 acx-mac80211)
+  MAINTAINER:=Florian Fainelli <florian@openwrt.org>
+  MENU:=1
+endef
+
+define KernelPackage/acx-mac80211/config
+	menu "Configuration"
+		depends on PACKAGE_kmod-acx-mac80211
+
+	config ACX_ID_0D
+		bool "ACX1xx Radio ID 0D firmware"
+		help
+		  Download and install firmware for:
+		    ACX1xx cards with Radio ID 0D into /lib/firmware.
+
+	config ACX_ID_11
+		bool "ACX1xx Radio ID 11 firmware"
+		help
+		  Download and install firmware for:
+		    ACX1xx cards with Radio ID 11 into /lib/firmware.
+
+	config ACX_ID_15
+		bool "ACX1xx Radio ID 15 firmware"
+		help
+		  Download and install firmware for:
+		    ACX1xx cards with Radio ID 15 into /lib/firmware.
+
+	config ACX_ID_16
+		bool "ACX1xx Radio ID 16 firmware"
+		default y
+		help
+		  Download and install firmware for:
+		    ACX1xx cards with Radio ID 16 into /lib/firmware.
+
+	choice
+		prompt "ACX111 firmware version"
+		depends on ACX_ID_16
+		default ACX_DEFAULT if !TARGET_adm5120
+		default ACX_1_2_1_34 if TARGET_adm5120
+		help
+		  This option allows you to select the version of the acx firmware.
+
+	config ACX_DEFAULT
+		bool "Default"
+		help
+		  Default firmware for ACX111 devices.
+
+		  If unsure, select this.
+
+	config ACX_1_2_1_34
+		bool "1.2.1_34"
+		help
+		  1.2.1_34 firmware for ACX111 devices. Works with Zyxel P-334WT.
+
+		  If unsure, select the "default" firmware.
+
+	endchoice
+
+	config ACX_ID_17
+		bool "ACX1xx Radio ID 17 firmware"
+		help
+		  Download and install firmware for:
+		    ACX1xx cards with Radio ID 17 into /lib/firmware.
+
+	config ACX_ID_19
+		bool "ACX1xx Radio ID 19 firmware"
+		default y
+		help
+		  Download and install firmware for:
+		    ACX1xx cards with Radio ID 19 into /lib/firmware.
+
+	config ACX_ID_1B
+		bool "ACX1xx Radio ID 1B firmware"
+		help
+		  Download and install firmware for:
+		    ACX1xx cards with Radio ID 1b into /lib/firmware.
+
+	endmenu
+endef
+
+define KernelPackage/acx-mac80211/description
+	Driver for acx111 cards (mac80211 version)
+endef
+
+define Download/tiacx100
+	FILE:=tiacx100
+	URL:=http://acx100.erley.org/fw/acx100_1.9.8.b/
+	MD5SUM:=24a54fd30f7658fcbffc825b0dd7aa5b
+endef
+
+define Download/tiacx100r0d
+	FILE:=tiacx100r0D
+	URL:=http://acx100.erley.org/fw/acx100_1.9.8.b/
+	MD5SUM:=1c7413e7b0be4ef7d1e424a132e17fab
+endef
+
+define Download/tiacx100r11
+	FILE:=tiacx100r11
+	URL:=http://acx100.erley.org/fw/acx100_1.9.8.b/
+	MD5SUM:=a150750ad33c512edc4afee5270b37cb
+endef
+
+define Download/tiacx100r15
+	FILE:=tiacx100r15
+	URL:=http://acx100.erley.org/fw/acx100_1.9.8.b/
+	MD5SUM:=c99d01d4fcf0d6cc00441aff60690be4
+endef
+
+define Download/tiacx111c16
+	FILE:=tiacx111c16
+	URL:=http://acx100.erley.org/fw/acx111_2.3.1.31/
+	MD5SUM:=7026826460376f6b174f9225bd7781b9
+endef
+
+define Download/tiacx111c16_1
+	FILE:=tiacx111c16_1.2.1_34
+	URL:=http://sites.google.com/site/atorkhov/files/
+	MD5SUM:=fcd07de4b25e1d2aaf3b78b27c5b7ee9
+endef
+
+define Download/tiacx111c17
+	FILE:=tiacx111c17
+	URL:=http://acx100.erley.org/fw/acx111_2.3.1.31/
+	MD5SUM:=95552544ca6d2b4e8c6aeb80b8ae7fdf
+endef
+
+define Download/tiacx111c19
+	FILE:=tiacx111c19
+	URL:=http://acx100.erley.org/fw/acx111_2.3.1.31/
+	MD5SUM:=a1fa9681e297b4e36e257090fc12265a
+endef
+
+define Download/tiacx111usbc1b
+	FILE:=tiacx111usbc1B
+	URL:=http://acx100.erley.org/fw/acx111_2.4.0.70-USB/
+	MD5SUM:=c4edecd912b2417779d0b65e3a7dc86d
+endef
+
+PKG_EXTRA_KCONFIG:= \
+	CONFIG_ACX_MAC80211=m \
+	CONFIG_ACX_MAC80211_PCI=m \
+
+PKG_EXTRA_CFLAGS:= \
+	$(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=m,%,$(filter %=m,$(PKG_EXTRA_KCONFIG)))) \
+	$(patsubst CONFIG_%, -DCONFIG_%=1, $(patsubst %=y,%,$(filter %=y,$(PKG_EXTRA_KCONFIG)))) \
+	$(if $(CONFIG_LEDS_TRIGGERS), -DCONFIG_MAC80211_LEDS -DCONFIG_LEDS_TRIGGERS) \
+	$(if $(CONFIG_PACKAGE_MAC80211_DEBUGFS), -DCONFIG_CFG80211_DEBUGFS -DCONFIG_MAC80211_DEBUGFS) \
+	$(if $(CONFIG_PACKAGE_MAC80211_MESH), -DCONFIG_MAC80211_MESH) \
+	-DBACKPORTED_KERNEL_NAME=\\\"$(PKG_SOURCE)\\\" \
+	-DBACKPORTED_KERNEL_VERSION=\\\"$(PKG_SOURCE_VERSION)\\\" \
+	-DBACKPORTS_VERSION=\\\"unknown\\\" \
+
+define Build/Compile
+	$(MAKE) -C "$(LINUX_DIR)" \
+		ARCH="$(LINUX_KARCH)" \
+		CROSS_COMPILE="$(TARGET_CROSS)" \
+		SUBDIRS="$(PKG_BUILD_DIR)" \
+		$(PKG_EXTRA_KCONFIG) \
+		EXTRA_CFLAGS="$(PKG_EXTRA_CFLAGS) -DCONFIG_ACX_MAC80211_VERSION=\"KERNEL_VERSION(4,2,0)\"" \
+		LINUXINCLUDE="-I$(STAGING_DIR)/usr/include/mac80211-backport/uapi -I$(STAGING_DIR)/usr/include/mac80211-backport \
+			-I$(STAGING_DIR)/usr/include/mac80211/uapi -I$(STAGING_DIR)/usr/include/mac80211 \
+			-I$(LINUX_DIR)/include -I$(LINUX_DIR)/include/$(LINUX_UAPI_DIR) \
+			-I$(LINUX_DIR)/include/generated/uapi/ -Iarch/$(LINUX_KARCH)/include \
+			-Iarch/$(LINUX_KARCH)/include/$(LINUX_UAPI_DIR) \
+			-Iarch/$(LINUX_KARCH)/include/generated \
+			-Iarch/$(LINUX_KARCH)/include/generated/$(LINUX_UAPI_DIR) \
+			-include generated/autoconf.h \
+			-include backport/backport.h " \
+		V="$(V)" \
+		modules
+endef
+
+define Build/Configure
+endef
+
+define KernelPackage/acx-mac80211/install
+	$(INSTALL_DIR) $(1)/lib/firmware
+
+ifneq ($(CONFIG_ACX_ID_0D)$(CONFIG_ACX_ID_11)$(CONFIG_ACX_ID_15),)
+	$(INSTALL_DATA) $(DL_DIR)/tiacx100 $(1)/lib/firmware/
+endif
+
+ifneq ($(CONFIG_ACX_ID_0D),)
+	$(INSTALL_DATA) $(DL_DIR)/tiacx100r0D $(1)/lib/firmware/
+endif
+
+ifneq ($(CONFIG_ACX_ID_11),)
+	$(INSTALL_DATA) $(DL_DIR)/tiacx100r11 $(1)/lib/firmware/
+endif
+
+ifneq ($(CONFIG_ACX_ID_15),)
+	$(INSTALL_DATA) $(DL_DIR)/tiacx100r15 $(1)/lib/firmware/
+endif
+
+ifneq ($(CONFIG_ACX_DEFAULT),)
+	$(INSTALL_DATA) $(DL_DIR)/tiacx111c16 $(1)/lib/firmware/
+endif
+
+ifneq ($(CONFIG_ACX_1_2_1_34),)
+	$(INSTALL_DATA)	$(DL_DIR)/tiacx111c16_1.2.1_34 $(1)/lib/firmware/tiacx111c16
+endif
+
+ifneq ($(CONFIG_ACX_ID_17),)
+	$(INSTALL_DATA) $(DL_DIR)/tiacx111c17 $(1)/lib/firmware/
+endif
+
+ifneq ($(CONFIG_ACX_ID_19),)
+	$(INSTALL_DATA) $(DL_DIR)/tiacx111c19 $(1)/lib/firmware/
+endif
+
+ifneq ($(CONFIG_ACX_ID_1B),)
+	$(INSTALL_DATA) $(DL_DIR)/tiacx111usbc1B $(1)/lib/firmware/
+endif
+
+endef
+
+$(eval $(call KernelPackage,acx-mac80211))
+$(eval $(call Download,tiacx100))
+$(eval $(call Download,tiacx100r0d))
+$(eval $(call Download,tiacx100r11))
+$(eval $(call Download,tiacx100r15))
+$(eval $(call Download,tiacx111c16))
+$(eval $(call Download,tiacx111c16_1))
+$(eval $(call Download,tiacx111c17))
+$(eval $(call Download,tiacx111c19))
+$(eval $(call Download,tiacx111usbc1b))
diff --git a/package/kernel/acx-mac80211/patches/200-initial-macaddr.patch b/package/kernel/acx-mac80211/patches/200-initial-macaddr.patch
new file mode 100644
index 0000000..c0fdd43
--- /dev/null
+++ b/package/kernel/acx-mac80211/patches/200-initial-macaddr.patch
@@ -0,0 +1,29 @@
+--- a/cardsetting.c
++++ b/cardsetting.c
+@@ -715,10 +715,25 @@ int acx1xx_get_station_id(acx_device_t *
+ 	u8 *stationID = adev->ie_cmd_buf;
+ 	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 */
diff --git a/package/kernel/acx-mac80211/patches/300-kernel_4_2.patch b/package/kernel/acx-mac80211/patches/300-kernel_4_2.patch
new file mode 100644
index 0000000..ee92b94
--- /dev/null
+++ b/package/kernel/acx-mac80211/patches/300-kernel_4_2.patch
@@ -0,0 +1,67 @@
+diff --git a/main.c b/main.c
+index bfec856..3c482d9 100644
+--- a/main.c
++++ b/main.c
+@@ -497,7 +497,7 @@ int acx_free_mechanics(acx_device_t *adev)
+ 
+ int acx_init_ieee80211(acx_device_t *adev, struct ieee80211_hw *hw)
+ {
+-	hw->flags &= ~IEEE80211_HW_RX_INCLUDES_FCS;
++	__clear_bit(IEEE80211_HW_RX_INCLUDES_FCS, hw->flags);
+ 	hw->queues = 1;
+ 	hw->wiphy->max_scan_ssids = 1;
+ 
+@@ -525,7 +525,7 @@ int acx_init_ieee80211(acx_device_t *adev, struct ieee80211_hw *hw)
+ 	/* We base signal quality on winlevel approach of previous driver
+ 	 * TODO OW 20100615 This should into a common init code
+ 	 */
+-	hw->flags |= IEEE80211_HW_SIGNAL_UNSPEC;
++	__set_bit(IEEE80211_HW_SIGNAL_UNSPEC, hw->flags);
+ 	hw->max_signal = 100;
+ 
+ 	if (IS_ACX100(adev)) {
+@@ -945,8 +945,8 @@ void acx_op_configure_filter(struct ieee80211_hw *hw,
+ 		changed_flags, *total_flags);
+ 
+ 	/* OWI TODO: Set also FIF_PROBE_REQ ? */
+-	*total_flags &= (FIF_PROMISC_IN_BSS | FIF_ALLMULTI | FIF_FCSFAIL
+-			| FIF_CONTROL | FIF_OTHER_BSS);
++	*total_flags &= (FIF_ALLMULTI | FIF_FCSFAIL | FIF_CONTROL
++			| FIF_OTHER_BSS);
+ 
+ 	logf1(L_DEBUG, "2: *total_flags=0x%08x\n", *total_flags);
+ 
+@@ -1045,9 +1045,10 @@ void acx_op_tx(struct ieee80211_hw *hw, struct ieee80211_tx_control *control,
+ }
+ 
+ int acx_op_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
+-                   struct cfg80211_scan_request *req)
++                   struct ieee80211_scan_request *hw_req)
+ {
+ 	acx_device_t *adev = hw2adev(hw);
++	struct cfg80211_scan_request *req = &hw_req->req;
+ 	struct sk_buff *skb;
+ 	size_t ssid_len = 0;
+ 	u8 *ssid = NULL;
+@@ -1082,7 +1083,7 @@ int acx_op_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
+ 		goto out;
+ 	}
+ #else
+-	skb = ieee80211_probereq_get(adev->hw, adev->vif, ssid, ssid_len,
++	skb = ieee80211_probereq_get(adev->hw, vif->addr, ssid, ssid_len,
+ 		req->ie_len);
+ 	if (!skb) {
+ 		ret = -ENOMEM;
+diff --git a/main.h b/main.h
+index 293f5c8..84ecb9a 100644
+--- a/main.h
++++ b/main.h
+@@ -62,7 +62,7 @@ void acx_op_tx(struct ieee80211_hw *hw, struct ieee80211_tx_control *control,
+ #endif
+ 
+ int acx_op_hw_scan(struct ieee80211_hw *hw, struct ieee80211_vif *vif,
+-                   struct cfg80211_scan_request *req);
++                   struct ieee80211_scan_request *req);
+ 
+ int acx_recover_hw(acx_device_t *adev);
+ 
-- 
cgit v1.2.3