diff --git a/.gitignore b/.gitignore
index 2b6cabec9023cf2201e9fecbb2dc450a5ea7746b..ab2b03cf5559b1e31258efd80cdb2e4c9227d43c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,6 @@
*~
-/build
+/lede
/output
/site
-/openwrt
+/tmp
/packages
-/modules.local
diff --git a/LICENSE b/LICENSE
index 81ed5a231b4a376ba9aab445a28299d8ceba6ea8..a9adc369cfb775ecc1e344c35a99b9314ddc901e 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,7 +1,7 @@
The code of Project Gluon may be distributed under the following terms, unless
noted otherwise in individual files or subtrees.
-Copyright (c) 2013, Project Gluon
+Copyright (c) 2013-2017, Project Gluon
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -25,10 +25,10 @@ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-OpenWrt is licensed under the terms of the GNU General Public License Version 2,
-which can be found under openwrt/LICENSE after the openwrt submodule has been
-obtained. This applies to the following submodules:
- * openwrt
+LEDE and OpenWrt are licensed under the terms of the GNU General Public License
+Version 2, which can be found at lede/LICENSE after the lede repository has been
+obtained. This applies to the following repositories:
+ * lede
* packages/openwrt
* packages/routing
* packages/luci
diff --git a/Makefile b/Makefile
index 268296925449f3d7d4e746974d2f2483422f8264..aa426f30150d9ef5a59269ca98e5b21299561a43 100644
--- a/Makefile
+++ b/Makefile
@@ -4,503 +4,153 @@ LC_ALL:=C
LANG:=C
export LC_ALL LANG
-export SHELL:=/usr/bin/env bash
-GLUONPATH ?= $(PATH)
-export GLUONPATH := $(GLUONPATH)
+GLUON_SITEDIR ?= $(CURDIR)/site
+GLUON_TMPDIR ?= $(CURDIR)/tmp
-empty:=
-space:= $(empty) $(empty)
+GLUON_OUTPUTDIR ?= $(CURDIR)/output
+GLUON_IMAGEDIR ?= $(GLUON_OUTPUTDIR)/images
+GLUON_PACKAGEDIR ?= $(GLUON_OUTPUTDIR)/packages
-GLUONMAKE_EARLY = PATH=$(GLUONPATH) $(SUBMAKE) -C $(GLUON_ORIGOPENWRTDIR) -f $(GLUONDIR)/Makefile GLUON_TOOLS=0 QUILT=
-GLUONMAKE = PATH=$(GLUONPATH) $(SUBMAKE) -C $(GLUON_OPENWRTDIR) -f $(GLUONDIR)/Makefile
+export GLUON_TMPDIR GLUON_IMAGEDIR GLUON_PACKAGEDIR DEVICES
-ifneq ($(OPENWRT_BUILD),1)
-GLUONDIR:=${CURDIR}
+$(GLUON_SITEDIR)/site.mk:
+ $(error No site configuration was found. Please check out a site configuration to $(GLUON_SITEDIR))
-include $(GLUONDIR)/include/gluon.mk
+-include $(GLUON_SITEDIR)/site.mk
-TOPDIR:=$(GLUON_ORIGOPENWRTDIR)
-export TOPDIR
-
-
-update: FORCE
- $(GLUONDIR)/scripts/update.sh
- $(GLUONDIR)/scripts/patch.sh
-
-update-patches: FORCE
- $(GLUONDIR)/scripts/update.sh
- $(GLUONDIR)/scripts/update-patches.sh
- $(GLUONDIR)/scripts/patch.sh
-
--include $(TOPDIR)/include/host.mk
-
-_SINGLE=export MAKEFLAGS=$(space);
-
-override OPENWRT_BUILD=1
-override GLUON_TOOLS=1
-GREP_OPTIONS=
-export OPENWRT_BUILD GLUON_TOOLS GREP_OPTIONS
-
--include $(TOPDIR)/include/debug.mk
--include $(TOPDIR)/include/depends.mk
-include $(GLUONDIR)/include/toplevel.mk
-
-
-include $(GLUONDIR)/targets/targets.mk
-
-
-CheckTarget := [ -n '$(GLUON_TARGET)' -a -n '$(GLUON_TARGET_$(GLUON_TARGET)_BOARD)' ] \
- || (echo -e 'Please set GLUON_TARGET to a valid target. Gluon supports the following targets:$(subst $(space),\n * ,$(GLUON_TARGETS))'; false)
-
-
-CheckExternal := test -d $(GLUON_ORIGOPENWRTDIR) || (echo 'You don'"'"'t seem to have obtained the external repositories needed by Gluon; please call `make update` first!'; false)
-
-
-create-key: FORCE
- @$(CheckExternal)
- +@$(GLUONMAKE_EARLY) create-key
-
-prepare-target: FORCE
- @$(CheckExternal)
- @$(CheckTarget)
- +@$(GLUONMAKE_EARLY) prepare-target
-
-all: prepare-target
- +@$(GLUONMAKE) build-key
- +@$(GLUONMAKE) prepare
- +@$(GLUONMAKE) images
- +@$(GLUONMAKE) modules
-
-prepare: prepare-target
- +@$(GLUONMAKE) build-key
- +@$(GLUONMAKE) $@
-
-clean download images modules: FORCE
- @$(CheckExternal)
- @$(CheckTarget)
- +@$(GLUONMAKE_EARLY) maybe-prepare-target
- +@$(GLUONMAKE) build-key
- +@$(GLUONMAKE) $@
-
-toolchain/% package/% target/% image/%: FORCE
- @$(CheckExternal)
- @$(CheckTarget)
- +@$(GLUONMAKE_EARLY) maybe-prepare-target
- +@$(GLUONMAKE) build-key
- +@$(GLUONMAKE) $@
-
-manifest: FORCE
- @[ -n '$(GLUON_BRANCH)' ] || (echo 'Please set GLUON_BRANCH to create a manifest.'; false)
- @echo '$(GLUON_PRIORITY)' | grep -qE '^([0-9]*\.)?[0-9]+$$' || (echo 'Please specify a numeric value for GLUON_PRIORITY to create a manifest.'; false)
- @$(CheckExternal)
-
- ( \
- echo 'BRANCH=$(GLUON_BRANCH)' && \
- echo 'DATE=$(shell $(GLUON_ORIGOPENWRTDIR)/staging_dir/host/bin/lua $(GLUONDIR)/scripts/rfc3339date.lua)' && \
- echo 'PRIORITY=$(GLUON_PRIORITY)' && \
- echo \
- ) > $(GLUON_BUILDDIR)/$(GLUON_BRANCH).manifest.tmp
-
- +($(foreach GLUON_TARGET,$(GLUON_TARGETS), \
- ( [ ! -e $(BOARD_BUILDDIR)/prepared ] || ( $(GLUONMAKE) manifest GLUON_TARGET='$(GLUON_TARGET)' V=s$(OPENWRT_VERBOSE) ) ) && \
- ) :)
-
- mkdir -p $(GLUON_IMAGEDIR)/sysupgrade
- mv $(GLUON_BUILDDIR)/$(GLUON_BRANCH).manifest.tmp $(GLUON_IMAGEDIR)/sysupgrade/$(GLUON_BRANCH).manifest
-
-dirclean : FORCE
- for dir in build_dir dl staging_dir tmp; do \
- rm -rf $(GLUON_ORIGOPENWRTDIR)/$$dir; \
- done
- rm -rf $(GLUON_BUILDDIR) $(GLUON_OUTPUTDIR)
-
-else
-
-TOPDIR=${CURDIR}
-export TOPDIR
-
-include rules.mk
+ifeq ($(GLUON_RELEASE),)
+$(error GLUON_RELEASE not set. GLUON_RELEASE can be set in site.mk or on the command line.)
+endif
-include $(GLUONDIR)/include/gluon.mk
+GLUON_LANGS ?= en
-include $(INCLUDE_DIR)/host.mk
-include $(INCLUDE_DIR)/depends.mk
-include $(INCLUDE_DIR)/subdir.mk
+export GLUON_RELEASE GLUON_ATH10K_MESH GLUON_REGION
-include package/Makefile
-include tools/Makefile
-include toolchain/Makefile
-include target/Makefile
+update: FORCE
+ @scripts/update.sh
+ @scripts/patch.sh
+ @scripts/feeds.sh
-PROFILES :=
-PROFILE_PACKAGES :=
+update-patches: FORCE
+ @scripts/update.sh
+ @scripts/update-patches.sh
+ @scripts/patch.sh
-define Profile
- $(eval $(call Profile/Default))
- $(eval $(call Profile/$(1)))
-endef
+update-feeds: FORCE
+ @scripts/feeds.sh
-define GluonProfile
-PROFILES += $(1)
-PROFILE_PACKAGES += $(filter-out -%,$(2) $(GLUON_$(1)_SITE_PACKAGES))
-GLUON_$(1)_PROFILE := $(if $(3),$(3),$(1))
-GLUON_$(1)_DEFAULT_PACKAGES := $(2)
-GLUON_$(1)_FACTORY_SUFFIX := -squashfs-factory
-GLUON_$(1)_SYSUPGRADE_SUFFIX := -squashfs-sysupgrade
-GLUON_$(1)_FACTORY_EXT := .bin
-GLUON_$(1)_SYSUPGRADE_EXT := .bin
-GLUON_$(1)_FACTORY_EXTRA :=
-GLUON_$(1)_SYSUPGRADE_EXTRA :=
-GLUON_$(1)_MODELS :=
-endef
-define GluonProfileFactorySuffix
-GLUON_$(1)_FACTORY_SUFFIX := $(2)
-GLUON_$(1)_FACTORY_EXT := $(3)
-GLUON_$(1)_FACTORY_EXTRA := $(4)
-endef
+GLUON_TARGETS :=
-define GluonProfileSysupgradeSuffix
-GLUON_$(1)_SYSUPGRADE_SUFFIX := $(2)
-GLUON_$(1)_SYSUPGRADE_EXT := $(3)
-GLUON_$(1)_SYSUPGRADE_EXTRA := $(4)
+define GluonTarget
+gluon_target := $(1)$$(if $(2),-$(2))
+GLUON_TARGETS += $$(gluon_target)
+GLUON_TARGET_$$(gluon_target)_BOARD := $(1)
+GLUON_TARGET_$$(gluon_target)_SUBTARGET := $(if $(3),$(3),$(2))
endef
-define GluonModel
-GLUON_$(1)_MODELS += $(3)
-GLUON_$(1)_MODEL_$(3) := $(2)
-GLUON_$(1)_MODEL_$(3)_ALIASES :=
-endef
+include targets/targets.mk
-define GluonModelAlias
-GLUON_$(1)_MODEL_$(2)_ALIASES += $(3)
-endef
-
-export SHA512SUM := $(GLUONDIR)/scripts/sha512sum.sh
-
-
-prereq: FORCE
- +$(NO_TRACE_MAKE) prereq
-
-prepare-tmpinfo: FORCE
- @+$(MAKE) -r -s staging_dir/host/.prereq-build OPENWRT_BUILD= QUIET=0
- mkdir -p tmp/info
- $(_SINGLE)$(NO_TRACE_MAKE) -j1 -r -s -f include/scan.mk SCAN_TARGET="packageinfo" SCAN_DIR="package" SCAN_NAME="package" SCAN_DEPS="$(TOPDIR)/include/package*.mk $(TOPDIR)/overlay/*/*.mk" SCAN_EXTRA=""
- $(_SINGLE)$(NO_TRACE_MAKE) -j1 -r -s -f include/scan.mk SCAN_TARGET="targetinfo" SCAN_DIR="target/linux" SCAN_NAME="target" SCAN_DEPS="profiles/*.mk $(TOPDIR)/include/kernel*.mk $(TOPDIR)/include/target.mk" SCAN_DEPTH=2 SCAN_EXTRA="" SCAN_MAKEOPTS="TARGET_BUILD=1"
- for type in package target; do \
- f=tmp/.$${type}info; t=tmp/.config-$${type}.in; \
- [ "$$t" -nt "$$f" ] || ./scripts/metadata.pl $${type}_config "$$f" > "$$t" || { rm -f "$$t"; echo "Failed to build $$t"; false; break; }; \
- done
- [ tmp/.config-feeds.in -nt tmp/.packagefeeds ] || ./scripts/feeds feed_config > tmp/.config-feeds.in
- ./scripts/metadata.pl package_mk tmp/.packageinfo > tmp/.packagedeps || { rm -f tmp/.packagedeps; false; }
- ./scripts/metadata.pl package_feeds tmp/.packageinfo > tmp/.packagefeeds || { rm -f tmp/.packagefeeds; false; }
- touch $(TOPDIR)/tmp/.build
-
-feeds: FORCE
- rm -rf $(TOPDIR)/package/feeds
- mkdir $(TOPDIR)/package/feeds
- [ ! -f $(GLUON_SITEDIR)/modules ] || . $(GLUON_SITEDIR)/modules && for feed in $$GLUON_SITE_FEEDS; do ln -s ../../../packages/$$feed $(TOPDIR)/package/feeds/$$feed; done
- ln -s ../../../package $(TOPDIR)/package/feeds/gluon
- . $(GLUONDIR)/modules && for feed in $$GLUON_FEEDS; do ln -s ../../../packages/$$feed $(TOPDIR)/package/feeds/module_$$feed; done
- +$(GLUONMAKE_EARLY) prepare-tmpinfo
-
-gluon-tools: FORCE
- +$(GLUONMAKE_EARLY) tools/patch/install
- +$(GLUONMAKE_EARLY) tools/sed/install
- +$(GLUONMAKE_EARLY) tools/cmake/install
- +$(GLUONMAKE_EARLY) package/lua/host/install package/usign/host/install
-
-
-
-early_prepared_stamp := $(GLUON_BUILDDIR)/prepared_$(shell \
- ( \
- $(SHA512SUM) $(GLUONDIR)/modules; \
- [ ! -r $(GLUON_SITEDIR)/modules ] || $(SHA512SUM) $(GLUON_SITEDIR)/modules \
- ) | $(SHA512SUM) )
-
-prepare-early: FORCE
- for dir in build_dir dl staging_dir; do \
- mkdir -p $(GLUON_ORIGOPENWRTDIR)/$$dir; \
- done
-
- +$(GLUONMAKE_EARLY) feeds
- +$(GLUONMAKE_EARLY) gluon-tools
-
- mkdir -p $$(dirname $(early_prepared_stamp))
- touch $(early_prepared_stamp)
-
-$(early_prepared_stamp):
- rm -f $(GLUON_BUILDDIR)/prepared_*
- +$(GLUONMAKE_EARLY) prepare-early
-
-$(GLUON_OPKG_KEY): $(early_prepared_stamp) FORCE
- [ -s $(GLUON_OPKG_KEY) -a -s $(GLUON_OPKG_KEY).pub ] || \
- ( mkdir -p $$(dirname $(GLUON_OPKG_KEY)) && $(STAGING_DIR_HOST)/bin/usign -G -s $(GLUON_OPKG_KEY) -p $(GLUON_OPKG_KEY).pub -c "Gluon opkg key" )
-
-$(GLUON_OPKG_KEY).pub: $(GLUON_OPKG_KEY)
-
-create-key: $(GLUON_OPKG_KEY).pub
-
-include $(GLUONDIR)/targets/targets.mk
-
-ifneq ($(GLUON_TARGET),)
-
-include $(GLUONDIR)/targets/$(GLUON_TARGET)/profiles.mk
+LEDEMAKE = $(MAKE) -C lede
BOARD := $(GLUON_TARGET_$(GLUON_TARGET)_BOARD)
-override SUBTARGET := $(GLUON_TARGET_$(GLUON_TARGET)_SUBTARGET)
+SUBTARGET := $(GLUON_TARGET_$(GLUON_TARGET)_SUBTARGET)
+LEDE_TARGET := $(BOARD)$(if $(SUBTARGET),-$(SUBTARGET))
-target_prepared_stamp := $(BOARD_BUILDDIR)/target-prepared
-gluon_prepared_stamp := $(BOARD_BUILDDIR)/prepared
-
-PREPARED_RELEASE = $$(cat $(gluon_prepared_stamp))
-IMAGE_PREFIX = gluon-$(GLUON_SITE_CODE)-$(PREPARED_RELEASE)
-MODULE_PREFIX = gluon-$(GLUON_SITE_CODE)-$(PREPARED_RELEASE)
-
-
-include $(INCLUDE_DIR)/target.mk
-
-build-key: FORCE
- rm -f $(BUILD_KEY) $(BUILD_KEY).pub
- cp $(GLUON_OPKG_KEY) $(BUILD_KEY)
- cp $(GLUON_OPKG_KEY).pub $(BUILD_KEY).pub
-
-config: FORCE
- +$(NO_TRACE_MAKE) scripts/config/conf OPENWRT_BUILD= QUIET=0
- +$(GLUONMAKE) prepare-tmpinfo
- ( \
- cat $(GLUONDIR)/include/config; \
- echo 'CONFIG_TARGET_$(GLUON_TARGET_$(GLUON_TARGET)_BOARD)=y'; \
- $(if $(GLUON_TARGET_$(GLUON_TARGET)_SUBTARGET), \
- echo 'CONFIG_TARGET_$(GLUON_TARGET_$(GLUON_TARGET)_BOARD)_$(GLUON_TARGET_$(GLUON_TARGET)_SUBTARGET)=y'; \
- ) \
- cat $(GLUONDIR)/targets/$(GLUON_TARGET)/config 2>/dev/null; \
- echo 'CONFIG_BUILD_SUFFIX="gluon-$(GLUON_TARGET)"'; \
- echo '$(patsubst %,CONFIG_PACKAGE_%=m,$(sort $(filter-out -%,$(DEFAULT_PACKAGES) $(GLUON_DEFAULT_PACKAGES) $(GLUON_SITE_PACKAGES) $(PROFILE_PACKAGES))))' \
- | sed -e 's/ /\n/g'; \
- echo '$(patsubst %,CONFIG_LUCI_LANG_%=y,$(GLUON_LANGS))' \
- | sed -e 's/ /\n/g'; \
- ) > $(BOARD_BUILDDIR)/config.tmp
- scripts/config/conf --defconfig=$(BOARD_BUILDDIR)/config.tmp Config.in
- +$(SUBMAKE) tools/install
+export LEDE_TARGET
-prepare-target: $(GLUON_OPKG_KEY).pub
- rm $(GLUON_OPENWRTDIR)/tmp || true
- mkdir -p $(GLUON_OPENWRTDIR)/tmp
- for link in build_dir config Config.in dl include Makefile package rules.mk scripts staging_dir target toolchain tools; do \
- ln -sf $(GLUON_ORIGOPENWRTDIR)/$$link $(GLUON_OPENWRTDIR); \
- done
+CheckTarget := [ '$(LEDE_TARGET)' ] \
+ || (echo 'Please set GLUON_TARGET to a valid target. Gluon supports the following targets:'; $(foreach target,$(GLUON_TARGETS),echo ' * $(target)';) false)
- +$(GLUONMAKE) config
- touch $(target_prepared_stamp)
+CheckExternal := test -d lede || (echo 'You don'"'"'t seem to have obtained the external repositories needed by Gluon; please call `make update` first!'; false)
-$(target_prepared_stamp):
- +$(GLUONMAKE_EARLY) prepare-target
-maybe-prepare-target: $(target_prepared_stamp)
- +$(GLUONMAKE_EARLY) $(GLUON_OPKG_KEY).pub
+GLUON_DEFAULT_PACKAGES := -odhcpd -ppp -ppp-mod-pppoe -wpad-mini gluon-core ip6tables hostapd-mini
-$(BUILD_DIR)/.prepared: Makefile
- @mkdir -p $$(dirname $@)
- @touch $@
-
-$(toolchain/stamp-install): $(tools/stamp-install)
-$(package/stamp-compile): $(package/stamp-cleanup)
-
-
-clean: FORCE
- +$(SUBMAKE) clean
- rm -f $(gluon_prepared_stamp)
-
-
-download: FORCE
- +$(SUBMAKE) tools/download
- +$(SUBMAKE) toolchain/download
- +$(SUBMAKE) package/download
- +$(SUBMAKE) target/download
-
-toolchain: $(toolchain/stamp-install) $(tools/stamp-install)
-
-include $(INCLUDE_DIR)/kernel.mk
-
-kernel: FORCE
- +$(NO_TRACE_MAKE) -C $(TOPDIR)/target/linux/$(BOARD) $(LINUX_DIR)/.image TARGET_BUILD=1
- +$(NO_TRACE_MAKE) -C $(TOPDIR)/target/linux/$(BOARD) $(LINUX_DIR)/.modules TARGET_BUILD=1
-
-packages: $(package/stamp-compile)
- $(_SINGLE)$(SUBMAKE) -r package/index
-
-prepare-image: FORCE
- rm -rf $(BOARD_KDIR)
- mkdir -p $(BOARD_KDIR)
- -cp $(KERNEL_BUILD_DIR)/* $(BOARD_KDIR)/
- +$(SUBMAKE) -C $(TOPDIR)/target/linux/$(BOARD)/image image_prepare KDIR="$(BOARD_KDIR)"
+GLUON_PACKAGES :=
+define merge_packages
+ $(foreach pkg,$(1),
+ GLUON_PACKAGES := $$(strip $$(filter-out -$$(patsubst -%,%,$(pkg)) $$(patsubst -%,%,$(pkg)),$$(GLUON_PACKAGES)) $(pkg))
+ )
+endef
+$(eval $(call merge_packages,$(GLUON_DEFAULT_PACKAGES) $(GLUON_SITE_PACKAGES)))
-prepare: FORCE
- @$(STAGING_DIR_HOST)/bin/lua $(GLUONDIR)/scripts/site_config.lua \
- || (echo 'Your site configuration did not pass validation.'; false)
+GLUON_PACKAGES_YES := $(filter-out -%,$(GLUON_PACKAGES))
+GLUON_PACKAGES_NO := $(patsubst -%,%,$(filter -%,$(GLUON_PACKAGES)))
- mkdir -p $(GLUON_IMAGEDIR) $(BOARD_BUILDDIR)
- echo 'src packages file:../openwrt/bin/$(BOARD)/packages' > $(BOARD_BUILDDIR)/opkg.conf
- +$(GLUONMAKE) toolchain
- +$(GLUONMAKE) kernel
- +$(GLUONMAKE) packages
- +$(GLUONMAKE) prepare-image
+config: FORCE
+ @$(CheckExternal)
+ @$(CheckTarget)
- echo "$(GLUON_RELEASE)" > $(gluon_prepared_stamp)
+ @( \
+ echo 'CONFIG_TARGET_$(BOARD)=y' \
+ $(if $(SUBTARGET),&& echo 'CONFIG_TARGET_$(BOARD)_$(SUBTARGET)=y') \
+ $(foreach pkg,$(GLUON_PACKAGES_NO),&& echo '# CONFIG_PACKAGE_$(pkg) is not set') \
+ && scripts/target_config.sh generic \
+ && GLUON_SITEDIR='$(GLUON_SITEDIR)' scripts/target_config.sh '$(GLUON_TARGET)' \
+ $(foreach pkg,$(GLUON_PACKAGES_YES),&& echo 'CONFIG_PACKAGE_$(pkg)=y') \
+ $(foreach lang,$(GLUON_LANGS),&& echo 'CONFIG_LUCI_LANG_$(lang)=y') \
+ && echo 'CONFIG_GLUON_RELEASE="$(GLUON_RELEASE)"' \
+ && echo 'CONFIG_GLUON_SITEDIR="$(GLUON_SITEDIR)"' \
+ && echo 'CONFIG_GLUON_BRANCH="$(GLUON_BRANCH)"' \
+ ) > lede/.config
+ +@$(LEDEMAKE) defconfig
-$(gluon_prepared_stamp):
- +$(GLUONMAKE) prepare
+ @GLUON_SITEDIR='$(GLUON_SITEDIR)' scripts/target_config_check.sh '$(GLUON_TARGET)' '$(GLUON_PACKAGES_YES)'
-modules: FORCE $(gluon_prepared_stamp)
- -rm -f $(GLUON_MODULEDIR)/*/$(BOARD)/$(if $(SUBTARGET),$(SUBTARGET),generic)/*
- -rmdir -p $(GLUON_MODULEDIR)/*/$(BOARD)/$(if $(SUBTARGET),$(SUBTARGET),generic)
- mkdir -p $(GLUON_MODULEDIR)/$(MODULE_PREFIX)/$(BOARD)/$(if $(SUBTARGET),$(SUBTARGET),generic)
- cp $(PACKAGE_DIR)/kmod-*.ipk $(GLUON_MODULEDIR)/$(MODULE_PREFIX)/$(BOARD)/$(if $(SUBTARGET),$(SUBTARGET),generic)
- $(_SINGLE)$(SUBMAKE) -r package/index PACKAGE_DIR=$(GLUON_MODULEDIR)/$(MODULE_PREFIX)/$(BOARD)/$(if $(SUBTARGET),$(SUBTARGET),generic)
+LUA := lede/staging_dir/hostpkg/bin/lua
+$(LUA):
+ @$(CheckExternal)
-include $(INCLUDE_DIR)/package-ipkg.mk
+ +@[ -e lede/.config ] || $(LEDEMAKE) defconfig
+ +@$(LEDEMAKE) tools/install
+ +@$(LEDEMAKE) package/lua/host/install
-# override variables from rules.mk
-PACKAGE_DIR = $(GLUON_OPENWRTDIR)/bin/$(BOARD)/packages
+prepare-target: config $(LUA) ;
-PROFILE_BUILDDIR = $(BOARD_BUILDDIR)/profiles/$(PROFILE)
-PROFILE_KDIR = $(PROFILE_BUILDDIR)/kernel
-BIN_DIR = $(PROFILE_BUILDDIR)/images
+all: prepare-target
+ @GLUON_SITEDIR='$(GLUON_SITEDIR)' $(LUA) scripts/site_config.lua \
+ || (echo 'Your site configuration did not pass validation.'; false)
-TARGET_DIR = $(PROFILE_BUILDDIR)/root
+ @scripts/clean_output.sh
+ +@$(LEDEMAKE)
+ @GLUON_SITEDIR='$(GLUON_SITEDIR)' scripts/copy_output.sh '$(GLUON_TARGET)'
-OPKG:= \
- TMPDIR="$(TMP_DIR)" \
- IPKG_INSTROOT="$(TARGET_DIR)" \
- IPKG_CONF_DIR="$(TMP_DIR)" \
- IPKG_OFFLINE_ROOT="$(TARGET_DIR)" \
- $(STAGING_DIR_HOST)/bin/opkg \
- -f $(BOARD_BUILDDIR)/opkg.conf \
- --cache $(TMP_DIR)/dl \
- --offline-root $(TARGET_DIR) \
- --force-postinstall \
- --add-dest root:/ \
- --add-arch all:100 \
- --add-arch $(ARCH_PACKAGES):200
+clean download: config
+ +@$(LEDEMAKE) $@
-EnableInitscript = ! grep -q '\#!/bin/sh /etc/rc.common' $(1) || bash ./etc/rc.common $(1) enable
+dirclean: FORCE
+ +@[ -e lede/.config ] || $(LEDEMAKE) defconfig
+ +@$(LEDEMAKE) dirclean
+ @rm -rf $(GLUON_TMPDIR) $(GLUON_OUTPUTDIR)
+manifest: $(LUA) FORCE
+ @[ '$(GLUON_BRANCH)' ] || (echo 'Please set GLUON_BRANCH to create a manifest.'; false)
+ @echo '$(GLUON_PRIORITY)' | grep -qE '^([0-9]*\.)?[0-9]+$$' || (echo 'Please specify a numeric value for GLUON_PRIORITY to create a manifest.'; false)
+ @$(CheckExternal)
-enable_initscripts: FORCE
- cd $(TARGET_DIR) && ( export IPKG_INSTROOT=$(TARGET_DIR); \
- $(foreach script,$(wildcard $(TARGET_DIR)/etc/init.d/*), \
- $(call EnableInitscript,$(script)); \
- ) : \
- )
-
-
-# Generate package list
-$(eval $(call merge-lists,INSTALL_PACKAGES,DEFAULT_PACKAGES GLUON_DEFAULT_PACKAGES GLUON_SITE_PACKAGES GLUON_$(PROFILE)_DEFAULT_PACKAGES GLUON_$(PROFILE)_SITE_PACKAGES))
-
-package_install: FORCE
- $(OPKG) update
- $(OPKG) install $(PACKAGE_DIR)/base-files_*.ipk $(PACKAGE_DIR)/libc_*.ipk
- $(OPKG) install $(PACKAGE_DIR)/kernel_*.ipk
-
- $(OPKG) install $(INSTALL_PACKAGES)
- +$(GLUONMAKE) enable_initscripts
-
- rm -f $(TARGET_DIR)/usr/lib/opkg/lists/* $(TARGET_DIR)/tmp/opkg.lock
- rm -f $(TARGET_DIR)/usr/lib/opkg/info/*.postinst*
-
-# Remove opkg database when opkg is not intalled
- if [ ! -x $(TARGET_DIR)/bin/opkg ]; then rm -rf $(TARGET_DIR)/usr/lib/opkg; fi
-
-
-include $(INCLUDE_DIR)/version.mk
-
-opkg_config: FORCE
- for d in base packages luci routing telephony management; do \
- echo "src/gz %n_$$d %U/$$d"; \
- done > $(TARGET_DIR)/etc/opkg/distfeeds.conf
- $(VERSION_SED) $(TARGET_DIR)/etc/opkg/distfeeds.conf
-
-
-image: FORCE
- rm -rf $(TARGET_DIR) $(BIN_DIR) $(PROFILE_KDIR)
- mkdir -p $(TARGET_DIR) $(BIN_DIR) $(TARGET_DIR)/tmp $(GLUON_IMAGEDIR)/factory $(GLUON_IMAGEDIR)/sysupgrade
- cp -r $(BOARD_KDIR) $(PROFILE_KDIR)
-
- +$(GLUONMAKE) package_install
- +$(GLUONMAKE) opkg_config
-
- $(call Image/mkfs/prepare)
- $(_SINGLE)$(NO_TRACE_MAKE) -C $(TOPDIR)/target/linux/$(BOARD)/image install TARGET_BUILD=1 IMG_PREFIX=gluon \
- PROFILE="$(GLUON_$(PROFILE)_PROFILE)" KDIR="$(PROFILE_KDIR)" TARGET_DIR="$(TARGET_DIR)" BIN_DIR="$(BIN_DIR)" TMP_DIR="$(TMP_DIR)"
-
- $(foreach model,$(GLUON_$(PROFILE)_MODELS), \
- $(if $(GLUON_$(PROFILE)_SYSUPGRADE_EXT), \
- rm -f $(GLUON_IMAGEDIR)/sysupgrade/gluon-*-$(model)-sysupgrade$(GLUON_$(PROFILE)_SYSUPGRADE_EXT) && \
- cp $(BIN_DIR)/gluon-$(GLUON_$(PROFILE)_MODEL_$(model))$(GLUON_$(PROFILE)_SYSUPGRADE_SUFFIX)$(GLUON_$(PROFILE)_SYSUPGRADE_EXT) $(GLUON_IMAGEDIR)/sysupgrade/$(IMAGE_PREFIX)-$(model)-sysupgrade$(GLUON_$(PROFILE)_SYSUPGRADE_EXT) && \
- ) \
- $(if $(GLUON_$(PROFILE)_FACTORY_EXT), \
- rm -f $(GLUON_IMAGEDIR)/factory/gluon-*-$(model)$(GLUON_$(PROFILE)_FACTORY_EXT) && \
- cp $(BIN_DIR)/gluon-$(GLUON_$(PROFILE)_MODEL_$(model))$(GLUON_$(PROFILE)_FACTORY_SUFFIX)$(GLUON_$(PROFILE)_FACTORY_EXT) $(GLUON_IMAGEDIR)/factory/$(IMAGE_PREFIX)-$(model)$(GLUON_$(PROFILE)_FACTORY_EXT) && \
- ) \
- \
- $(if $(GLUON_$(PROFILE)_SYSUPGRADE_EXTRA), \
- rm -f $(GLUON_IMAGEDIR)/sysupgrade/gluon-*-$(model)-sysupgrade$(GLUON_$(PROFILE)_SYSUPGRADE_EXTRA) && \
- cp $(BIN_DIR)/gluon$(GLUON_$(PROFILE)_SYSUPGRADE_EXTRA) $(GLUON_IMAGEDIR)/sysupgrade/$(IMAGE_PREFIX)-$(model)-sysupgrade$(GLUON_$(PROFILE)_SYSUPGRADE_EXTRA) && \
- ) \
- $(if $(GLUON_$(PROFILE)_FACTORY_EXTRA), \
- rm -f $(GLUON_IMAGEDIR)/factory/gluon-*-$(model)$(GLUON_$(PROFILE)_FACTORY_EXTRA) && \
- cp $(BIN_DIR)/gluon$(GLUON_$(PROFILE)_FACTORY_EXTRA) $(GLUON_IMAGEDIR)/factory/$(IMAGE_PREFIX)-$(model)$(GLUON_$(PROFILE)_FACTORY_EXTRA) && \
- ) \
- \
- $(foreach alias,$(GLUON_$(PROFILE)_MODEL_$(model)_ALIASES), \
- $(if $(GLUON_$(PROFILE)_SYSUPGRADE_EXT), \
- rm -f $(GLUON_IMAGEDIR)/sysupgrade/gluon-*-$(alias)-sysupgrade$(GLUON_$(PROFILE)_SYSUPGRADE_EXT) && \
- ln -s $(IMAGE_PREFIX)-$(model)-sysupgrade$(GLUON_$(PROFILE)_SYSUPGRADE_EXT) $(GLUON_IMAGEDIR)/sysupgrade/$(IMAGE_PREFIX)-$(alias)-sysupgrade$(GLUON_$(PROFILE)_SYSUPGRADE_EXT) && \
- ) \
- $(if $(GLUON_$(PROFILE)_FACTORY_EXT), \
- rm -f $(GLUON_IMAGEDIR)/factory/gluon-*-$(alias)$(GLUON_$(PROFILE)_FACTORY_EXT) && \
- ln -s $(IMAGE_PREFIX)-$(model)$(GLUON_$(PROFILE)_FACTORY_EXT) $(GLUON_IMAGEDIR)/factory/$(IMAGE_PREFIX)-$(alias)$(GLUON_$(PROFILE)_FACTORY_EXT) && \
- ) \
- ) \
- ) :
-
-
-image/%: $(gluon_prepared_stamp)
- +$(GLUONMAKE) image PROFILE="$(patsubst image/%,%,$@)" V=s$(OPENWRT_VERBOSE)
-
-call_image/%: FORCE
- +$(GLUONMAKE) $(patsubst call_image/%,image/%,$@)
-
-images: $(patsubst %,call_image/%,$(PROFILES)) ;
-
-manifest: FORCE
- ( \
- cd $(GLUON_IMAGEDIR)/sysupgrade; \
- $(foreach profile,$(PROFILES), \
- $(if $(GLUON_$(profile)_SYSUPGRADE_EXT), \
- $(foreach model,$(GLUON_$(profile)_MODELS), \
- file="$(IMAGE_PREFIX)-$(model)-sysupgrade$(GLUON_$(profile)_SYSUPGRADE_EXT)"; \
- [ -e "$$file" ] && echo '$(model)' "$(PREPARED_RELEASE)" "$$($(SHA512SUM) "$$file")" "$$file"; \
- \
- $(foreach alias,$(GLUON_$(profile)_MODEL_$(model)_ALIASES), \
- file="$(IMAGE_PREFIX)-$(alias)-sysupgrade$(GLUON_$(profile)_SYSUPGRADE_EXT)"; \
- [ -e "$$file" ] && echo '$(alias)' "$(PREPARED_RELEASE)" "$$($(SHA512SUM) "$$file")" "$$file"; \
- ) \
- ) \
- ) \
+ @( \
+ echo 'BRANCH=$(GLUON_BRANCH)' && \
+ echo "DATE=$$($(LUA) scripts/rfc3339date.lua)" && \
+ echo 'PRIORITY=$(GLUON_PRIORITY)' && \
+ echo && \
+ $(foreach GLUON_TARGET,$(GLUON_TARGETS), \
+ GLUON_SITEDIR='$(GLUON_SITEDIR)' scripts/generate_manifest.sh '$(GLUON_TARGET)' && \
) : \
- ) >> $(GLUON_BUILDDIR)/$(GLUON_BRANCH).manifest.tmp
+ ) > 'tmp/$(GLUON_BRANCH).manifest.tmp'
-.PHONY: all create-key prepare images modules clean gluon-tools manifest
+ @mkdir -p '$(GLUON_IMAGEDIR)/sysupgrade'
+ @mv 'tmp/$(GLUON_BRANCH).manifest.tmp' '$(GLUON_IMAGEDIR)/sysupgrade/$(GLUON_BRANCH).manifest'
-endif
-endif
+FORCE: ;
+
+.PHONY: FORCE
+.NOTPARALLEL:
diff --git a/docs/dev/hardware.rst b/docs/dev/hardware.rst
index b7f7c174290c318c88c832c60733816c9f8337b3..54ae75e0fe03efea6a94d9be05d394738d2762fa 100644
--- a/docs/dev/hardware.rst
+++ b/docs/dev/hardware.rst
@@ -11,57 +11,114 @@ is a requirement. At the moment, Gluon's scripts can't handle devices
without WLAN adapters (although such environments may also be interesting,
e.g. for automated testing in virtual machines).
+
.. _hardware-adding-profiles:
Adding profiles
---------------
-The vast majority of devices with ath9k WLAN uses the ar71xx target of OpenWrt.
+The vast majority of devices with ath9k WLAN uses the ar71xx target of LEDE.
If the hardware you want to add support for is also ar71xx, adding a new profile
is enough.
-Profiles are defined in ``targets/<target>-<subtarget>/profiles.mk``. There are two macros
-used to define which images are generated: ``GluonProfile`` and ``GluonModel``. The following examples
-are taken from ``profiles.mk`` of the ``ar71xx-generic`` target::
+Profiles are defined in ``targets/*`` in a shell-based DSL (so common shell
+commands syntax like ``if`` can be used.
- $(eval $(call GluonProfile,TLWR1043))
- $(eval $(call GluonModel,TLWR1043,tl-wr1043nd-v1-squashfs,tp-link-tl-wr1043n-nd-v1))
- $(eval $(call GluonModel,TLWR1043,tl-wr1043nd-v2-squashfs,tp-link-tl-wr1043n-nd-v2))
+The ``device`` command is used to define an image build for a device. It takes
+two or three parameters.
-The ``GluonProfile`` macro takes at least one parameter, the profile name as it is
-defined in the Makefiles of OpenWrt (``openwrt/target/linux/<target>/<subtarget>/profiles/*``
-and ``openwrt/target/linux/<target>/image/Makefile``). If the target you are on doesn't define
-profiles (e.g. on x86), just add a single profile called ``Generic`` or similar.
+The first parameter defines the Gluon profile name, which is used to refer to the
+device and is part of the generated image name. The profile name must be same as
+the output of the following command (on the target device), so the autoupdater
+can work::
-It may optionally take a second parameter which defines additional packages to include for the profile
-(e.g. ath10k). The additional packages defined in ``openwrt/target/linux/<target>/<subtarget>/profiles/*``
-aren't used.
+ lua -e 'print(require("platform_info").get_image_name())'
-The ``GluonModel`` macro takes three parameters: The profile name, the suffix of the image file
-generated by OpenWrt (without the file extension), and the final image name of the Gluon image.
-The final image name must be the same that is returned by the following command.
+The second parameter defines the name of the image files generated by LEDE. Usually,
+it is also the LEDE profile name; for devices that still use the old image build
+code, a third parameter with the LEDE profile name can be passed. The profile names
+can be found in the image Makefiles in ``lede/target/linux/<target>/image/Makefile``.
-::
+Examples::
- lua -e 'print(require("platform_info").get_image_name())'
+ device tp-link-tl-wr1043n-nd-v1 tl-wr1043nd-v1
+ device alfa-network-hornet-ub hornet-ub HORNETUB
+
+Suffixes and extensions
+'''''''''''''''''''''''
+
+By default, image files are expected to have the extension ``.bin``. In addition,
+the images generated by LEDE have a suffix before the extension that defaults to
+``-squashfs-factory`` and ``-squashfs-sysupgrade``.
+
+This can be changed using the ``factory`` and ``sysupgrade`` commands, either at
+the top of the file to set the defaults for all images, or for a single image. There
+are three forms with 0 to 2 arguments (all work with ``sysupgrade`` as well)::
+
+ factory SUFFIX .EXT
+ factory .EXT
+ factory
+
+When only an extension is given, the default suffix is retained. When no arguments
+are given, this signals that no factory (or sysupgrade) image exists.
+
+Aliases
+'''''''
+
+Sometimes multiple models use the same LEDE images. In this case, the ``alias``
+command can be used to create symlinks and additional entries in the autoupdater
+manifest for the alternative models.
+
+Standalone images
+'''''''''''''''''
+
+On targets without *per-device rootfs* support in LEDE, the commands described above
+can't be used. Instead, ``factory_image`` and ``sysupgrade_image`` are used::
+ factory_image PROFILE IMAGE .EXT
+ sysupgrade_image PROFILE IMAGE .EXT
-This is just so the autoupdater can work. The command has to be executed _on_ the target (eg. the hardware router with a flashed image). So you'll first have to build an image with a guessed name, and afterwards build a new, correctly named image. On targets which aren't supported by the autoupdater,
-``require("platform_info").get_image_name()`` will just return ``nil`` and the final image name
-may be defined arbitrarily.
+Again, the profile name must match the value printed by the aforementioned Lua
+command. The image name must match the part between the target name and the extension
+as generated by LEDE and is to be omitted when no such part exists.
+
+Packages
+''''''''
+
+The ``packages`` command takes an arbitrary number of arguments. Each argument
+defines an additional package to include in the images in addition to the default
+package sets defined by LEDE. When a package name is prefixed by a minus sign, the
+packages are excluded instead.
+
+The ``packages`` command may be used at the top of a target definition to modify
+the default package list for all images, or just for a single device (when the
+target supports *per-default rootfs*).
+
+
+Configuration
+'''''''''''''
+
+The ``config`` command allows to add arbitary target-specific LEDE configuration
+to be emitted to ``.config``.
+
+Notes
+'''''
On devices with multiple WLAN adapters, care must also be taken that the primary MAC address is
configured correctly. ``/lib/gluon/core/sysconfig/primary_mac`` should contain the MAC address which
can be found on a label on most hardware; if it does not, ``/lib/gluon/upgrade/010-primary-mac``
in ``gluon-core`` might need a fix. (There have also been cases in which the address was incorrect
-even on devices with only one WLAN adapter, in these cases an OpenWrt bug was the cause).
+even on devices with only one WLAN adapter, in these cases a LEDE bug was the cause).
+
Adding support for new hardware targets
---------------------------------------
+
Adding a new target is much more complex than adding a new profile. There are two basic steps
required for adding a new target:
-Adjust packages
-'''''''''''''''
+Package adjustments
+'''''''''''''''''''
+
One package that definitely needs adjustments for every new target added is ``libplatforminfo`` (to be found in
`packages/gluon/libs/libplatforminfo <https://github.com/freifunk-gluon/packages/tree/master/libs/libplatforminfo>`_).
Start with a copy of an existing platform info source file and adjust it for the new target (or just add a symlink if
@@ -71,15 +128,14 @@ On many targets, Gluon's network setup scripts (mainly in the packages ``gluon-c
won't run correctly without some adjustments, so better double check that everything is fine there (and the files
``primary_mac``, ``lan_ifname`` and ``wan_ifname`` in ``/lib/gluon/core/sysconfig/`` contain sensible values).
-Add support to the build system
-'''''''''''''''''''''''''''''''
-A directory for the new target must be created under ``targets``, and it must be added
-to ``targets/targets.mk``. In the new target directory, the following files must be created:
-
-* profiles.mk
-* config (optional)
+Build system support
+''''''''''''''''''''
-For ``profiles.mk``, see :ref:`hardware-adding-profiles`.
-The file ``config`` can be used to add additional, target-specific options to the OpenWrt config.
+A definition for the new target must be created under ``targets``, and it must be added
+to ``targets/targets.mk``. The ``GluonTarget`` macro takes one to three arguments:
+the target name, the Gluon subtarget name (if the target has subtargets), and the
+LEDE subtarget name (if it differs from the Gluon subtarget). The third argument
+can be used to define multiple Gluon targets with different configuration for the
+same LEDE target, like it is done for the ``ar71xx-tiny`` target.
After this, is should be sufficient to call ``make GLUON_TARGET=<target>`` to build the images for the new target.
diff --git a/docs/site-example/site.mk b/docs/site-example/site.mk
index f55db144eb021c5d2abda765f7cf6165d0d2cf62..79ecf37ae75af3309dcb38fcd5ac8643cb7b835c 100644
--- a/docs/site-example/site.mk
+++ b/docs/site-example/site.mk
@@ -1,11 +1,9 @@
## gluon site.mk makefile example
## GLUON_SITE_PACKAGES
-# specify gluon/openwrt packages to include here
-# The gluon-mesh-batman-adv-* package must come first because of the dependency resolution
+# specify Gluon/LEDE packages to include here
GLUON_SITE_PACKAGES := \
- gluon-mesh-batman-adv-15 \
gluon-alfred \
gluon-respondd \
gluon-autoupdater \
@@ -21,6 +19,7 @@ GLUON_SITE_PACKAGES := \
gluon-luci-autoupdater \
gluon-luci-portconfig \
gluon-luci-wifi-config \
+ gluon-mesh-batman-adv-15 \
gluon-mesh-vpn-fastd \
gluon-radvd \
gluon-setup-mode \
diff --git a/docs/user/getting_started.rst b/docs/user/getting_started.rst
index c9df1d62d9e071e3c7b3133790f3c61f5e2f8802..dd4ac422e022e7d6588125c3514cf042b906d083 100644
--- a/docs/user/getting_started.rst
+++ b/docs/user/getting_started.rst
@@ -85,7 +85,6 @@ Next go back to the top-level Gluon directory and build Gluon::
make update # Get other repositories used by Gluon
make GLUON_TARGET=ar71xx-generic # Build Gluon
-When calling make, the OpenWrt build environment is prepared/updated.
In case of errors read the messages carefully and try to fix the stated issues (e.g. install tools not available yet).
``ar71xx-generic`` is the most common target and will generate images for most of the supported hardware.
@@ -95,7 +94,7 @@ You should reserve about 10GB of disk space for each `GLUON_TARGET`.
The built images can be found in the directory `output/images`. Of these, the `factory`
images are to be used when flashing from the original firmware a device came with,
-and `sysupgrade` is to upgrade from other versions of Gluon or any other OpenWrt-based
+and `sysupgrade` is to upgrade from other versions of Gluon or any other OpenWrt/LEDE-based
system.
**Note:** The images for some models are identical; to save disk space, symlinks are generated instead
@@ -111,39 +110,25 @@ There are two levels of `make clean`::
make clean GLUON_TARGET=ar71xx-generic
-will ensure all packages are rebuilt for a single target; this is what you normally want to do after an update.
+will ensure all packages are rebuilt for a single target. This normally not
+necessary, but may fix certain kinds of build failures.
::
make dirclean
-will clean the entire tree, so the toolchain will be rebuilt as well, which is
-not necessary in most cases, and will take a while.
-
-So in summary, to update and rebuild a Gluon build tree, the following commands should be used (repeat the
-``make clean`` and ``make`` for all targets you want to build):
-
-::
-
- git pull
- (cd site && git pull)
- make update
- make clean GLUON_TARGET=ar71xx-generic
- make GLUON_TARGET=ar71xx-generic
-
+will clean the entire tree, so the toolchain will be rebuilt as well, which will take a while.
opkg repositories
-----------------
-Gluon is mostly compatible with OpenWrt, so the normal OpenWrt package repositories
-can be used for Gluon as well. It is advisable to setup a mirror or reverse proxy
-reachable over IPv6 and add it to ``site.conf`` as http://downloads.openwrt.org/ does
-not support IPv6.
+Gluon is mostly compatible with LEDE, so the normal LEDE package repositories
+can be used for Gluon as well.
This is not true for kernel modules; the Gluon kernel is incompatible with the
-kernel of the default OpenWrt images. Therefore, Gluon will not only generate images,
-but also an opkg repository containing all kernel modules provided by OpenWrt/Gluon
-for the kernel of the generated images.
+kernel of the default LEDE images. Therefore, Gluon will not only generate images,
+but also an opkg repository containing all core packages provided by LEDE,
+including modules for the kernel of the generated images.
Signing keys
............
@@ -151,18 +136,14 @@ Signing keys
Gluon does not support HTTPS for downloading packages; fortunately, opkg deploys
public-key cryptography to ensure package integrity.
-The Gluon images will contain two public keys: the official OpenWrt signing key
+The Gluon images will contain public keys from two sources: the official LEDE keyring
(to allow installing userspace packages) and a Gluon-specific key (which is used
-to sign the generated module repository).
+to sign the generated package repository).
-By default, Gluon will handle the generation and handling of the keys itself.
+LEDE will handle the generation and handling of the keys itself.
When making firmware releases based on Gluon, it might make sense to store
the keypair, so updating the module repository later is possible.
-The location the keys are stored at and read from can be changed
-(see :ref:`getting-started-make-variables`). To only generate the keypair
-at the configured location without doing a full build, use ``make create-key``.
-
.. _getting-started-make-variables:
Make variables
@@ -217,13 +198,8 @@ GLUON_BUILDDIR
GLUON_IMAGEDIR
Path where images will be stored. Defaults to ``$(GLUON_OUTPUTDIR)/images``.
-GLUON_MODULEDIR
- Path where the kernel module opkg repository will be stored. Defaults to ``$(GLUON_OUTPUTDIR)/modules``.
-
-GLUON_OPKG_KEY
- Path key file used to sign the module opkg repository. Defaults to ``$(GLUON_BULDDIR)/gluon-opkg-key``.
-
- The private key will be stored as ``$(GLUON_OPKG_KEY)``, the public key as ``$(GLUON_OPKG_KEY).pub``.
+GLUON_PACKAGEDIR
+ Path where the opkg package repository will be stored. Defaults to ``$(GLUON_OUTPUTDIR)/packages``.
GLUON_OUTPUTDIR
Path where output files will be stored. Defaults to ``output``.
diff --git a/docs/user/site.rst b/docs/user/site.rst
index df8525be1917d4a3cf5ddce5d73746ba0bb58627..42ef85c6993af83c1d02789bec8e45ba4fb7092c 100644
--- a/docs/user/site.rst
+++ b/docs/user/site.rst
@@ -56,23 +56,27 @@ opkg \: optional
There are two optional fields in the ``opkg`` section:
- - ``openwrt`` overrides the default OpenWrt repository URL
+ - ``lede`` overrides the default LEDE repository URL. The default URL would
+ correspond to ``http://downloads.lede-project.org/snapshots/packages/%A``
+ and usually doesn't need to be changed when nodes are expected to have IPv6
+ internet connectivity.
- ``extra`` specifies a table of additional repositories (with arbitrary keys)
::
opkg = {
- openwrt = 'http://opkg.services.ffac/openwrt/%n/%v/%S/packages',
+ lede = 'http://opkg.services.ffac/lede/snapshots/packages/%A',
extra = {
- modules = 'http://opkg.services.ffac/modules/gluon-%GS-%GR/%S',
+ gluon = 'http://opkg.services.ffac/modules/gluon-%GS-%GR/%S',
},
}
There are various patterns which can be used in the URLs:
- - ``%n`` is replaced by the OpenWrt version codename (e.g. "chaos_calmer")
- - ``%v`` is replaced by the OpenWrt version number (e.g. "15.05")
- - ``%S`` is replaced by the target architecture (e.g. "ar71xx/generic")
+ - ``%n`` is replaced by the LEDE version codename
+ - ``%v`` is replaced by the LEDE version number (e.g. "17.01")
+ - ``%S`` is replaced by the target board (e.g. "ar71xx/generic")
+ - ``%A`` is replaced by the target architecture (e.g. "mips_24kc")
- ``%GS`` is replaced by the Gluon site code (as specified in ``site.conf``)
- ``%GV`` is replaced by the Gluon version
- ``%GR`` is replaced by the Gluon release (as specified in ``site.mk``)
diff --git a/include/config b/include/config
deleted file mode 100644
index 12f8a7d4a5f08dd29d16a8627bc7ddd055467cad..0000000000000000000000000000000000000000
--- a/include/config
+++ /dev/null
@@ -1,22 +0,0 @@
-CONFIG_IMAGEOPT=y
-# CONFIG_PER_FEED_REPO is not set
-# CONFIG_TARGET_ROOTFS_INITRAMFS is not set
-CONFIG_DEVEL=y
-CONFIG_ALL_KMODS=y
-
-CONFIG_BUSYBOX_CUSTOM=y
-CONFIG_BUSYBOX_CONFIG_SHA512SUM=y
-# CONFIG_BUSYBOX_CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set
-CONFIG_BUSYBOX_CONFIG_IP=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_IP_ADDRESS=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_IP_LINK=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_IP_ROUTE=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_IP_TUNNEL=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_IP_RULE=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_IP_SHORT_FORMS=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_WGET_TIMEOUT=y
-
-CONFIG_ATH_USER_REGD=y
-CONFIG_PACKAGE_ATH_DEBUG=y
-
-CONFIG_LUCI_SRCDIET=y
diff --git a/include/gluon.mk b/include/gluon.mk
deleted file mode 100644
index 29ecf3ed908626ca917d2eb8eac9679b05e8cdab..0000000000000000000000000000000000000000
--- a/include/gluon.mk
+++ /dev/null
@@ -1,85 +0,0 @@
-ifneq ($(__gluon_inc),1)
-__gluon_inc=1
-
-GLUON_SITEDIR ?= $(GLUONDIR)/site
-GLUON_BUILDDIR ?= $(GLUONDIR)/build
-
-GLUON_ORIGOPENWRTDIR := $(GLUONDIR)/openwrt
-GLUON_SITE_CONFIG := $(GLUON_SITEDIR)/site.conf
-
-GLUON_OUTPUTDIR ?= $(GLUONDIR)/output
-GLUON_IMAGEDIR ?= $(GLUON_OUTPUTDIR)/images
-GLUON_MODULEDIR ?= $(GLUON_OUTPUTDIR)/modules
-
-GLUON_OPKG_KEY ?= $(GLUON_BUILDDIR)/gluon-opkg-key
-
-export GLUONDIR GLUON_SITEDIR GLUON_BUILDDIR GLUON_SITE_CONFIG GLUON_OUTPUTDIR GLUON_IMAGEDIR GLUON_MODULEDIR
-
-
-BOARD_BUILDDIR = $(GLUON_BUILDDIR)/$(GLUON_TARGET)
-BOARD_KDIR = $(BOARD_BUILDDIR)/kernel
-
-export BOARD_BUILDDIR
-
-
-LINUX_RELEASE := 2
-export LINUX_RELEASE
-
-
-GLUON_OPENWRTDIR = $(BOARD_BUILDDIR)/openwrt
-
-
-$(GLUON_SITEDIR)/site.mk:
- $(error There was no site configuration found. Please check out a site configuration to $(GLUON_SITEDIR))
-
--include $(GLUON_SITEDIR)/site.mk
-
-
-GLUON_VERSION := $(shell cd $(GLUONDIR) && git describe --always --dirty=+ 2>/dev/null || echo unknown)
-export GLUON_VERSION
-
-GLUON_SITE_VERSION := $(shell cd $(GLUON_SITEDIR) && git --git-dir=.git describe --always --dirty=+ 2>/dev/null || echo unknown)
-export GLUON_SITE_VERSION
-
-GLUON_LANGS ?= en
-export GLUON_LANGS
-
-
-ifeq ($(OPENWRT_BUILD),1)
-ifeq ($(GLUON_TOOLS),1)
-
-GLUON_OPENWRT_FEEDS := base packages luci routing telephony management
-export GLUON_OPENWRT_FEEDS
-
-GLUON_SITE_CODE := $(shell $(GLUONDIR)/scripts/site.sh site_code)
-export GLUON_SITE_CODE
-
-ifeq ($(GLUON_RELEASE),)
-$(error GLUON_RELEASE not set. GLUON_RELEASE can be set in site.mk or on the command line.)
-endif
-export GLUON_RELEASE
-
-endif
-endif
-
-
-define merge-lists
-$(1) :=
-$(foreach var,$(2),$(1) := $$(filter-out -% $$(patsubst -%,%,$$(filter -%,$$($(var)))),$$($(1)) $$($(var)))
-)
-endef
-
-GLUON_TARGETS :=
-
-define GluonTarget
-gluon_target := $(1)$$(if $(2),-$(2))
-GLUON_TARGETS += $$(gluon_target)
-GLUON_TARGET_$$(gluon_target)_BOARD := $(1)
-GLUON_TARGET_$$(gluon_target)_SUBTARGET := $(2)
-endef
-
-GLUON_DEFAULT_PACKAGES := gluon-core firewall ip6tables -uboot-envtools -wpad-mini hostapd-mini
-
-override DEFAULT_PACKAGES.router :=
-
-endif #__gluon_inc
diff --git a/include/toplevel.mk b/include/toplevel.mk
deleted file mode 100644
index 087a7a19a5aa3942f66721b4de287639213baa3b..0000000000000000000000000000000000000000
--- a/include/toplevel.mk
+++ /dev/null
@@ -1,62 +0,0 @@
-# Makefile for OpenWrt
-#
-# Copyright (C) 2007-2012 OpenWrt.org
-# Copyright (C) 2013-2014 Project Gluon
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-RELEASE:=Chaos Calmer
-PREP_MK= OPENWRT_BUILD= QUIET=0
-
-export IS_TTY=$(shell tty -s && echo 1 || echo 0)
-
-include $(GLUONDIR)/include/verbose.mk
-
-REVISION:=$(shell [ -d $(TOPDIR) ] && cd $(TOPDIR) && ./scripts/getver.sh 2>/dev/null)
-
-HOSTCC ?= gcc
-OPENWRTVERSION:=$(RELEASE)$(if $(REVISION), ($(REVISION)))
-export RELEASE
-export REVISION
-export OPENWRTVERSION
-export IS_TTY=$(shell tty -s && echo 1 || echo 0)
-export LD_LIBRARY_PATH:=$(subst ::,:,$(if $(LD_LIBRARY_PATH),$(LD_LIBRARY_PATH):)$(STAGING_DIR_HOST)/lib)
-export DYLD_LIBRARY_PATH:=$(subst ::,:,$(if $(DYLD_LIBRARY_PATH),$(DYLD_LIBRARY_PATH):)$(STAGING_DIR_HOST)/lib)
-export GIT_CONFIG_PARAMETERS='core.autocrlf=false'
-export MAKE_JOBSERVER=$(filter --jobserver%,$(MAKEFLAGS))
-
-# prevent perforce from messing with the patch utility
-unexport P4PORT P4USER P4CONFIG P4CLIENT
-
-# prevent user defaults for quilt from interfering
-unexport QUILT_PATCHES QUILT_PATCH_OPTS
-
-unexport C_INCLUDE_PATH CROSS_COMPILE ARCH
-
-# prevent distro default LPATH from interfering
-unexport LPATH
-
-# make sure that a predefined CFLAGS variable does not disturb packages
-export CFLAGS=
-
-ifneq ($(shell $(HOSTCC) 2>&1 | grep clang),)
- export HOSTCC_REAL?=$(HOSTCC)
- export HOSTCC_WRAPPER:=$(TOPDIR)/scripts/clang-gcc-wrapper
-else
- export HOSTCC_WRAPPER:=$(HOSTCC)
-endif
-
-SCAN_COOKIE?=$(shell echo $$$$)
-export SCAN_COOKIE
-
-SUBMAKE:=umask 022; $(SUBMAKE)
-
-ULIMIT_FIX=_limit=`ulimit -n`; [ "$$_limit" = "unlimited" -o "$$_limit" -ge 1024 ] || ulimit -n 1024;
-
-FORCE: ;
-
-.PHONY: FORCE
-.NOTPARALLEL:
-
diff --git a/include/verbose.mk b/include/verbose.mk
deleted file mode 100644
index d34f55fc4867b8a5eb86f6b5daf2bf3f462264b0..0000000000000000000000000000000000000000
--- a/include/verbose.mk
+++ /dev/null
@@ -1,67 +0,0 @@
-#
-# Copyright (C) 2006 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-ifndef OPENWRT_VERBOSE
- OPENWRT_VERBOSE:=
-endif
-ifeq ("$(origin V)", "command line")
- OPENWRT_VERBOSE:=$(V)
-endif
-
-ifeq ($(OPENWRT_VERBOSE),1)
- OPENWRT_VERBOSE:=w
-endif
-ifeq ($(OPENWRT_VERBOSE),99)
- OPENWRT_VERBOSE:=s
-endif
-
-ifeq ($(NO_TRACE_MAKE),)
-NO_TRACE_MAKE := $(MAKE) V=s$(OPENWRT_VERBOSE)
-export NO_TRACE_MAKE
-endif
-
-ifeq ($(IS_TTY),1)
- ifneq ($(strip $(NO_COLOR)),1)
- _Y:=\\033[33m
- _R:=\\033[31m
- _N:=\\033[m
- endif
-endif
-
-ifeq ($(findstring s,$(OPENWRT_VERBOSE)),)
- define MESSAGE
- printf "$(_Y)%s$(_N)\n" "$(1)" >&8
- endef
-
- define ERROR_MESSAGE
- printf "$(_R)%s$(_N)\n" "$(1)" >&8
- endef
-
- ifeq ($(QUIET),1)
- ifneq ($(CURDIR),$(TOPDIR))
- _DIR:=$(patsubst $(TOPDIR)/%,%,${CURDIR})
- else
- _DIR:=
- endif
- _NULL:=$(if $(MAKECMDGOALS),$(shell \
- $(call MESSAGE, make[$(MAKELEVEL)]$(if $(_DIR), -C $(_DIR)) $(MAKECMDGOALS)); \
- ))
- SUBMAKE=$(MAKE)
- else
- SILENT:=>/dev/null $(if $(findstring w,$(OPENWRT_VERBOSE)),,2>&1)
- export QUIET:=1
- SUBMAKE=cmd() { $(SILENT) $(MAKE) -s $$* < /dev/null || { echo "make $$*: build failed. Please re-run make with V=s to see what's going on"; false; } } 8>&1 9>&2; cmd
- endif
-
- .SILENT: $(MAKECMDGOALS)
-else
- SUBMAKE=$(MAKE) -w
- define MESSAGE
- printf "%s\n" "$(1)"
- endef
- ERROR_MESSAGE=$(MESSAGE)
-endif
diff --git a/modules b/modules
index ca2232952254330b56d81061793aa996b87ae61d..7fc0a4e39127d8ebd3570495475130c46356750b 100644
--- a/modules
+++ b/modules
@@ -1,15 +1,13 @@
GLUON_FEEDS='openwrt gluon routing luci'
-OPENWRT_REPO=git://github.com/openwrt/openwrt.git
-OPENWRT_COMMIT=0f757bd2606971252f901ef3faf4dbd0086315f7
-OPENWRT_BRANCH=chaos_calmer
+LEDE_REPO=git://git.lede-project.org/source.git
+LEDE_COMMIT=b9a408c2b49ccfa0e906bda00ef77f4002e401fd
PACKAGES_OPENWRT_REPO=git://github.com/openwrt/packages.git
-PACKAGES_OPENWRT_COMMIT=73776792f7d58e982be9e5819450d4875b273159
-PACKAGES_OPENWRT_BRANCH=for-15.05
+PACKAGES_OPENWRT_COMMIT=ee211f94ec292f7ec3d563fcbc147359b6cf8290
PACKAGES_GLUON_REPO=git://github.com/freifunk-gluon/packages.git
-PACKAGES_GLUON_COMMIT=5c25ed888f9f2e05652a994fc0212e34304d58fa
+PACKAGES_GLUON_COMMIT=ef405e224082c26807fe24c02da9b02135fa46d0
PACKAGES_ROUTING_REPO=git://github.com/openwrt-routing/packages.git
PACKAGES_ROUTING_COMMIT=d848d49d2443448b147c564c2dd8f64433b5fb9c
diff --git a/overlay/opkg.mk b/overlay/opkg.mk
new file mode 100644
index 0000000000000000000000000000000000000000..2506dbe601dd96136588f496a0768a6f272cf9a9
--- /dev/null
+++ b/overlay/opkg.mk
@@ -0,0 +1,2 @@
+FEEDS_ENABLED := $(FEEDS_DISABLED)
+FEEDS_DISABLED :=
diff --git a/package/gluon-autoupdater/Makefile b/package/gluon-autoupdater/Makefile
index 41cdf7965701f8d7793647e2f35a10ac27ebaba3..eacf80c15efad8d2e6a18952514dfbb2d8840e6c 100644
--- a/package/gluon-autoupdater/Makefile
+++ b/package/gluon-autoupdater/Makefile
@@ -2,11 +2,13 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-autoupdater
PKG_VERSION:=4
-PKG_RELEASE:=$(GLUON_BRANCH)
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+
+PKG_CONFIG_DEPENDS := CONFIG_GLUON_BRANCH
PKG_BUILD_DEPENDS := respondd
+
include ../gluon.mk
@@ -17,6 +19,13 @@ define Package/gluon-autoupdater
TITLE:=Automatically update firmware
endef
+define Package/gluon-autoupdater/config
+config GLUON_BRANCH
+ string "Gluon autoupdater branch"
+ depends on PACKAGE_gluon-autoupdater
+ default ""
+endef
+
define Build/Prepare
mkdir -p $(PKG_BUILD_DIR)
$(CP) ./src/* $(PKG_BUILD_DIR)/
@@ -34,10 +43,10 @@ define Package/gluon-autoupdater/install
$(INSTALL_DIR) $(1)/lib/gluon/respondd
$(CP) $(PKG_BUILD_DIR)/respondd.so $(1)/lib/gluon/respondd/autoupdater.so
- if [ '$(GLUON_BRANCH)' ]; then \
- $(INSTALL_DIR) $(1)/lib/gluon/autoupdater; \
- echo '$(GLUON_BRANCH)' > $(1)/lib/gluon/autoupdater/default_branch; \
- fi
+ifneq ($(CONFIG_GLUON_BRANCH),"")
+ $(INSTALL_DIR) $(1)/lib/gluon/autoupdater
+ echo '$(call qstrip,$(CONFIG_GLUON_BRANCH))' > $(1)/lib/gluon/autoupdater/default_branch
+endif
endef
define Package/gluon-autoupdater/postinst
diff --git a/package/gluon-core/Makefile b/package/gluon-core/Makefile
index 3e0ae0598acff0430cd63c2c6f306ddd3cece81e..5a15fc3685eaad71a987d716cc5264f13537a182 100644
--- a/package/gluon-core/Makefile
+++ b/package/gluon-core/Makefile
@@ -1,8 +1,10 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-core
-PKG_VERSION:=3
-PKG_RELEASE:=$(GLUON_VERSION)
+
+GLUON_VERSION = $(shell git describe --always --dirty=+ 2>/dev/null || echo unknown)
+PKG_VERSION:=$(if $(DUMP),x,$(GLUON_VERSION))
+
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
@@ -20,10 +22,6 @@ define Package/gluon-core/description
Gluon community wifi mesh firmware framework: core
endef
-define Build/Prepare
- mkdir -p $(PKG_BUILD_DIR)
-endef
-
define Build/Configure
endef
@@ -34,11 +32,9 @@ endef
define Package/gluon-core/install
$(CP) ./files/* $(1)/
$(CP) $(PKG_BUILD_DIR)/luadest/* $(1)/
- $(SED) 's/__GLUON_OPENWRT_FEEDS__/{$(GLUON_OPENWRT_FEEDS:%="%",)}/' $(1)/lib/gluon/upgrade/500-opkg
$(INSTALL_DIR) $(1)/lib/gluon
- echo "$(GLUON_VERSION)" > $(1)/lib/gluon/gluon-version
- echo "$(GLUON_SITE_VERSION)" > $(1)/lib/gluon/site-version
+ echo '$(GLUON_VERSION)' > $(1)/lib/gluon/gluon-version
endef
define Package/gluon-core/postinst
diff --git a/package/gluon-core/check_site.lua b/package/gluon-core/check_site.lua
index 480b367c769978b67539ee12107c8bbb688cb367..b6c5c68487beca38f2198b63d60bd99edac76104 100644
--- a/package/gluon-core/check_site.lua
+++ b/package/gluon-core/check_site.lua
@@ -2,7 +2,7 @@ need_string 'site_code'
need_string 'site_name'
if need_table('opkg', nil, false) then
- need_string('opkg.openwrt', false)
+ need_string('opkg.lede', false)
function check_repo(k, _)
-- this is not actually a uci name, but using the same naming rules here is fine
diff --git a/package/gluon-core/luasrc/lib/gluon/upgrade/500-opkg b/package/gluon-core/luasrc/lib/gluon/upgrade/500-opkg
index 4380050cb06d35a19b5a2a641a27d0fbb7c2f85a..9acd3b14d6ac5cae24b10779ba956c2cc9d7636a 100755
--- a/package/gluon-core/luasrc/lib/gluon/upgrade/500-opkg
+++ b/package/gluon-core/luasrc/lib/gluon/upgrade/500-opkg
@@ -8,42 +8,51 @@ local util = require 'luci.util'
local subst = {}
subst['%%v'] = util.trim(fs.readfile('/etc/openwrt_version'))
-subst['%%n'], subst['%%S'] = util.exec('. /etc/openwrt_release; echo $DISTRIB_CODENAME; echo $DISTRIB_TARGET'):match('([^\n]*)\n([^\n]*)')
+subst['%%n'], subst['%%S'], subst['%%A'] = util.exec('. /etc/openwrt_release; echo "$DISTRIB_CODENAME"; echo "$DISTRIB_TARGET"; echo "$DISTRIB_ARCH"'):match('([^\n]*)\n([^\n]*)\n([^\n]*)')
subst['%%GS'] = site.site_code
subst['%%GV'] = util.trim(fs.readfile('/lib/gluon/gluon-version'))
subst['%%GR'] = util.trim(fs.readfile('/lib/gluon/release'))
function replace_patterns(url)
- for k, v in pairs(subst) do
- url = url:gsub(k, v)
- end
+ for k, v in pairs(subst) do
+ url = url:gsub(k, v)
+ end
- return url
+ return url
end
-if site.opkg then
- if site.opkg.openwrt then
- local url = replace_patterns(site.opkg.openwrt)
- local f = io.open('/etc/opkg/distfeeds.conf', 'w')
+local prefix = subst['%%n'] .. '_'
- for _, v in ipairs(__GLUON_OPENWRT_FEEDS__) do
- f:write(replace_patterns(string.format('src/gz %%n_%s %s/%s\n', v, site.opkg.openwrt, v)))
- end
+local distfeeds = {}
+for line in io.lines('/etc/opkg/distfeeds.conf') do
+ table.insert(distfeeds, line)
+end
+
+local f = io.open('/etc/opkg/distfeeds.conf', 'w')
+
+for _, line in ipairs(distfeeds) do
+ local name = line:match('^src/gz%s' .. prefix .. '(%S+)%s')
+ if name == 'core' then
+ f:write('# ' .. line .. '\n')
+ elseif name and site.opkg and site.opkg.lede then
+ f:write(string.format('src/gz %s %s/%s\n', prefix .. name, replace_patterns(site.opkg.lede), name))
+ else
+ f:write(line .. '\n')
+ end
+end
- f:close()
- end
+f:close()
- if site.opkg.extra and next(site.opkg.extra) then
- local f = io.open('/etc/opkg/gluon.conf', 'w')
+if site.opkg and site.opkg.extra and next(site.opkg.extra) then
+ local f = io.open('/etc/opkg/gluon.conf', 'w')
- for k, v in pairs(site.opkg.extra) do
- f:write(string.format('src/gz %s %s\n', k, replace_patterns(v)))
- end
+ for k, v in pairs(site.opkg.extra) do
+ f:write(string.format('src/gz %s %s\n', k, replace_patterns(v)))
+ end
- f:close()
+ f:close()
- else
- os.remove('/etc/opkg/gluon.conf')
- end
+else
+ os.remove('/etc/opkg/gluon.conf')
end
diff --git a/package/gluon-setup-mode/files/lib/gluon/setup-mode/rc.d/K50dropbear b/package/gluon-setup-mode/files/lib/gluon/setup-mode/rc.d/K50dropbear
deleted file mode 120000
index 066549b3aabb4255cab1d3ffd1db5a65c9a01a38..0000000000000000000000000000000000000000
--- a/package/gluon-setup-mode/files/lib/gluon/setup-mode/rc.d/K50dropbear
+++ /dev/null
@@ -1 +0,0 @@
-/etc/init.d/dropbear
\ No newline at end of file
diff --git a/package/gluon-setup-mode/files/lib/gluon/setup-mode/rc.d/S13haveged b/package/gluon-setup-mode/files/lib/gluon/setup-mode/rc.d/S13haveged
index b4af677a51a190e43a81cfddb2c3a3fc9dfb9f73..27b1a595d0335174e49d7f4fa2323faf5d4240a1 100755
--- a/package/gluon-setup-mode/files/lib/gluon/setup-mode/rc.d/S13haveged
+++ b/package/gluon-setup-mode/files/lib/gluon/setup-mode/rc.d/S13haveged
@@ -1,5 +1,5 @@
#!/bin/sh /etc/rc.common
-if /etc/init.d/haveged enabled; then
+if [ -x /etc/init.d/haveged ] && /etc/init.d/haveged enabled; then
. /etc/init.d/haveged
fi
diff --git a/package/gluon-setup-mode/files/lib/gluon/setup-mode/rc.d/S50dropbear b/package/gluon-setup-mode/files/lib/gluon/setup-mode/rc.d/S50dropbear
deleted file mode 120000
index 066549b3aabb4255cab1d3ffd1db5a65c9a01a38..0000000000000000000000000000000000000000
--- a/package/gluon-setup-mode/files/lib/gluon/setup-mode/rc.d/S50dropbear
+++ /dev/null
@@ -1 +0,0 @@
-/etc/init.d/dropbear
\ No newline at end of file
diff --git a/package/gluon-setup-mode/files/lib/gluon/setup-mode/rc.d/S50dropbear b/package/gluon-setup-mode/files/lib/gluon/setup-mode/rc.d/S50dropbear
new file mode 100755
index 0000000000000000000000000000000000000000..590aede3ec1cb1bc0e2b7f3a7af8c03fee300ed6
--- /dev/null
+++ b/package/gluon-setup-mode/files/lib/gluon/setup-mode/rc.d/S50dropbear
@@ -0,0 +1,21 @@
+#!/bin/sh /etc/rc.common
+
+USE_PROCD=1
+PROG=/usr/sbin/dropbear
+NAME=dropbear
+
+start_service() {
+ [ -x /etc/init.d/dropbear ] || return 0
+
+ . /etc/init.d/dropbear
+
+ [ -s /etc/dropbear/dropbear_rsa_host_key ] || keygen
+
+ . /lib/functions.sh
+ . /lib/functions/network.sh
+
+ procd_open_instance
+ procd_set_param command "$PROG" -F -f
+ procd_set_param respawn
+ procd_close_instance
+}
diff --git a/package/gluon-setup-mode/files/lib/gluon/setup-mode/rc.d/S50telnet b/package/gluon-setup-mode/files/lib/gluon/setup-mode/rc.d/S50telnet
deleted file mode 100755
index b524b2cec41f17ec686dfc26048975c17f4e2de1..0000000000000000000000000000000000000000
--- a/package/gluon-setup-mode/files/lib/gluon/setup-mode/rc.d/S50telnet
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=50
-
-USE_PROCD=1
-PROG=/usr/sbin/telnetd
-
-start_service() {
- procd_open_instance
- procd_set_param command "$PROG" -F -l /lib/gluon/setup-mode/ash-login
- procd_close_instance
-}
diff --git a/package/gluon-site/Makefile b/package/gluon-site/Makefile
index b7138e3ce55a134d1a8f979d6779310caad1b07b..0f80388944070fca7745c27d7631890128f31129 100644
--- a/package/gluon-site/Makefile
+++ b/package/gluon-site/Makefile
@@ -1,9 +1,13 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-site
-PKG_VERSION:=$(if $(GLUON_SITE_CODE),$(GLUON_SITE_CODE),1)
-PKG_RELEASE:=$(GLUON_RELEASE)
+GLUON_SITEDIR = '$(call qstrip,$(CONFIG_GLUON_SITEDIR))'
+GLUON_SITE_VERSION = $(shell ( cd $(GLUON_SITEDIR) && git --git-dir=.git describe --always --dirty=+ ) 2>/dev/null || echo unknown)
+PKG_VERSION:=$(if $(DUMP),x,$(GLUON_SITE_VERSION))
+
+
+PKG_CONFIG_DEPENDS := CONFIG_GLUON_RELEASE CONFIG_GLUON_SITEDIR
PKG_FILE_DEPENDS := $(GLUON_SITEDIR)/site.conf $(GLUON_SITEDIR)/i18n/
PKG_BUILD_DEPENDS := luci-base/host lua-cjson/host
@@ -20,6 +24,18 @@ define Package/gluon-site
TITLE:=Site-specific files of Gluon
endef
+define Package/gluon-site/config
+config GLUON_RELEASE
+ string "Gluon release number"
+ depends on PACKAGE_gluon-site
+ default ""
+
+config GLUON_SITEDIR
+ string "Gluon site configuration directory"
+ depends on PACKAGE_gluon-site
+ default ""
+endef
+
define Build/Prepare
mkdir -p $(PKG_BUILD_DIR)
endef
@@ -28,14 +44,15 @@ define Build/Configure
endef
define Build/Compile
- lua -e 'print(require("cjson").encode(assert(dofile("../../scripts/site_config.lua"))))' > $(PKG_BUILD_DIR)/site.json
+ GLUON_SITEDIR='$(call qstrip,$(CONFIG_GLUON_SITEDIR))' lua -e 'print(require("cjson").encode(assert(dofile("../../scripts/site_config.lua"))))' > $(PKG_BUILD_DIR)/site.json
$(call GluonBuildI18N,gluon-site,$(GLUON_SITEDIR)/i18n)
endef
define Package/gluon-site/install
$(INSTALL_DIR) $(1)/lib/gluon
$(INSTALL_DATA) $(PKG_BUILD_DIR)/site.json $(1)/lib/gluon/
- echo "$(GLUON_RELEASE)" > $(1)/lib/gluon/release
+ echo '$(GLUON_SITE_VERSION)' > $(1)/lib/gluon/site-version
+ echo '$(call qstrip,$(CONFIG_GLUON_RELEASE))' > $(1)/lib/gluon/release
$(call GluonInstallI18N,gluon-site,$(1))
endef
diff --git a/package/gluon.mk b/package/gluon.mk
index 05875a44b2b577c5f88eeda98fcad3aa590142a1..a36a9836b13b05169c600f68d061c7beed65af2d 100644
--- a/package/gluon.mk
+++ b/package/gluon.mk
@@ -5,8 +5,13 @@ include $(INCLUDE_DIR)/package.mk
# Annoyingly, make's shell function replaces all newlines with spaces, so we have to do some escaping work. Yuck.
define GluonCheckSite
-[ -z "$$GLUONDIR" ] || sed -e 's/-@/\n/g' -e 's/+@/@/g' <<'END__GLUON__CHECK__SITE' | "$$GLUONDIR"/scripts/check_site.sh
-$(shell cat $(1) | sed -ne '1h; 1!H; $$ {g; s/@/+@/g; s/\n/-@/g; p}')
+[ -z "$$IPKG_INSTROOT" ] || sed -e 's/-@/\n/g' -e 's/+@/@/g' <<'END__GLUON__CHECK__SITE' | "${TOPDIR}/staging_dir/hostpkg/bin/lua" -e 'dofile()'
+local f = assert(io.open(os.getenv('IPKG_INSTROOT') .. '/lib/gluon/site.json'))
+local site_json = f:read('*a')
+f:close()
+
+site = require('cjson').decode(site_json)
+$(shell cat '$(TOPDIR)/../scripts/check_site_lib.lua' '$(1)' | sed -ne '1h; 1!H; $$ {g; s/@/+@/g; s/\n/-@/g; p}')
END__GLUON__CHECK__SITE
endef
@@ -41,11 +46,9 @@ define GluonSrcDiet
rm -rf $(2)
$(CP) $(1) $(2)
$(FIND) $(2) -type f | while read src; do \
- if $(STAGING_DIR_HOST)/bin/lua $(STAGING_DIR_HOST)/bin/LuaSrcDiet \
- --noopt-binequiv -o "$$$$src.o" "$$$$src"; \
- then \
- chmod $$$$(stat -c%a "$$$$src") "$$$$src.o"; \
- mv "$$$$src.o" "$$$$src"; \
- fi; \
+ if LuaSrcDiet --noopt-binequiv -o "$$$$src.o" "$$$$src"; then \
+ chmod $$$$(stat -c%a "$$$$src") "$$$$src.o"; \
+ mv "$$$$src.o" "$$$$src"; \
+ fi; \
done
endef
diff --git a/patches/lede/0001-build-move-STAGING_DIR_HOSTPKG-and-BUILD_DIR_HOST-back-to-a-common-directory-for-all-targets.patch b/patches/lede/0001-build-move-STAGING_DIR_HOSTPKG-and-BUILD_DIR_HOST-back-to-a-common-directory-for-all-targets.patch
new file mode 100644
index 0000000000000000000000000000000000000000..3aecb9f523e94ff5253beb28d8b2186502fc504a
--- /dev/null
+++ b/patches/lede/0001-build-move-STAGING_DIR_HOSTPKG-and-BUILD_DIR_HOST-back-to-a-common-directory-for-all-targets.patch
@@ -0,0 +1,111 @@
+From: Matthias Schiffer <mschiffer@universe-factory.net>
+Date: Sat, 14 Jan 2017 18:13:14 +0100
+Subject: build: move STAGING_DIR_HOSTPKG and BUILD_DIR_HOST back to a common directory for all targets
+
+$(STAGING_DIR)/host is kept in addition to $(STAGING_DIR_HOSTPKG) in most
+places; it is still used as destination for host files in Build/InstallDev.
+
+Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
+
+diff --git a/Makefile b/Makefile
+index b220dfd3c56a11f3e27d70e3d6e58cc6448abd2f..c1a7285c83df310e987eaef8376500d2b614eafb 100644
+--- a/Makefile
++++ b/Makefile
+@@ -55,7 +55,7 @@ clean: FORCE
+ rm -rf $(BUILD_DIR) $(STAGING_DIR) $(BIN_DIR) $(OUTPUT_DIR)/packages/$(ARCH_PACKAGES) $(BUILD_LOG_DIR) $(TOPDIR)/staging_dir/packages
+
+ dirclean: clean
+- rm -rf $(STAGING_DIR_HOST) $(TOOLCHAIN_DIR) $(BUILD_DIR_HOST) $(BUILD_DIR_TOOLCHAIN)
++ rm -rf $(STAGING_DIR_HOST) $(STAGING_DIR_HOSTPKG) $(TOOLCHAIN_DIR) $(BUILD_DIR_BASE)/host $(BUILD_DIR_BASE)/hostpkg $(BUILD_DIR_TOOLCHAIN)
+ rm -rf $(TMP_DIR)
+
+ ifndef DUMP_TARGET_DB
+diff --git a/include/autotools.mk b/include/autotools.mk
+index c6aa47e0bef311697b4def7a7183d1ac59dcf599..7bd400ab36d052b39fcb76a66873c8673eb189a0 100644
+--- a/include/autotools.mk
++++ b/include/autotools.mk
+@@ -75,7 +75,7 @@ define autoreconf_target
+ $(strip $(call autoreconf, \
+ $(PKG_BUILD_DIR), $(PKG_REMOVE_FILES), \
+ $(PKG_AUTOMAKE_PATHS), $(PKG_LIBTOOL_PATHS), \
+- $(STAGING_DIR)/host/share/aclocal $(STAGING_DIR)/usr/share/aclocal $(PKG_MACRO_PATHS)))
++ $(STAGING_DIR)/host/share/aclocal $(STAGING_DIR_HOSTPKG)/share/aclocal $(STAGING_DIR)/usr/share/aclocal $(PKG_MACRO_PATHS)))
+ endef
+
+ define patch_libtool_target
+diff --git a/include/cmake.mk b/include/cmake.mk
+index 5f572e9d7475e807ea56713ee2069dc98f5c1f6b..80c1b05937410cb9fce20e7b759577480cf390e7 100644
+--- a/include/cmake.mk
++++ b/include/cmake.mk
+@@ -34,7 +34,7 @@ CMAKE_NM:=$(call cmake_tool,$(TARGET_NM))
+ CMAKE_RANLIB:=$(call cmake_tool,$(TARGET_RANLIB))
+
+ CMAKE_FIND_ROOT_PATH:=$(STAGING_DIR)/usr;$(TOOLCHAIN_DIR)$(if $(CONFIG_EXTERNAL_TOOLCHAIN),;$(CONFIG_TOOLCHAIN_ROOT))
+-CMAKE_HOST_FIND_ROOT_PATH:=$(STAGING_DIR)/host;$(STAGING_DIR_HOST)
++CMAKE_HOST_FIND_ROOT_PATH:=$(STAGING_DIR)/host;$(STAGING_DIR_HOSTPKG);$(STAGING_DIR_HOST)
+ CMAKE_SHARED_LDFLAGS:=-Wl,-Bsymbolic-functions
+
+ define Build/Configure/Default
+diff --git a/include/host-build.mk b/include/host-build.mk
+index 5cfbdeba5138c4362f82b7ae86b910a1f41f082a..fee7c6ce8fca6160a7055a8ccb9c0ebd0759032b 100644
+--- a/include/host-build.mk
++++ b/include/host-build.mk
+@@ -115,7 +115,7 @@ ifneq ($(if $(HOST_QUILT),,$(CONFIG_AUTOREBUILD)),)
+ endif
+
+ define Host/Exports/Default
+- $(1) : export ACLOCAL_INCLUDE=$$(foreach p,$$(wildcard $$(STAGING_DIR_HOST)/share/aclocal $$(STAGING_DIR_HOST)/share/aclocal-* $(if $(IS_PACKAGE_BUILD),$$(STAGING_DIR)/host/share/aclocal $$(STAGING_DIR)/host/share/aclocal-*)),-I $$(p))
++ $(1) : export ACLOCAL_INCLUDE=$$(foreach p,$$(wildcard $$(STAGING_DIR_HOST)/share/aclocal $$(STAGING_DIR_HOST)/share/aclocal-* $(if $(IS_PACKAGE_BUILD),$$(STAGING_DIR)/host/share/aclocal $$(STAGING_DIR_HOSTPKG)/share/aclocal $$(STAGING_DIR)/host/share/aclocal-*)),-I $$(p))
+ $(1) : export STAGING_PREFIX=$$(HOST_BUILD_PREFIX)
+ $(1) : export PKG_CONFIG_PATH=$$(STAGING_DIR_HOST)/lib/pkgconfig:$$(HOST_BUILD_PREFIX)/lib/pkgconfig
+ $(1) : export PKG_CONFIG_LIBDIR=$$(HOST_BUILD_PREFIX)/lib/pkgconfig
+diff --git a/include/package.mk b/include/package.mk
+index 32485176577b040f6e4a561c5d1144509877bcdf..ea801288eadb139cc0dd2412b4c927c6bd7330e0 100644
+--- a/include/package.mk
++++ b/include/package.mk
+@@ -130,7 +130,7 @@ ifdef USE_SOURCE_DIR
+ endif
+
+ define Build/Exports/Default
+- $(1) : export ACLOCAL_INCLUDE=$$(foreach p,$$(wildcard $$(STAGING_DIR)/usr/share/aclocal $$(STAGING_DIR)/usr/share/aclocal-* $$(STAGING_DIR)/host/share/aclocal $$(STAGING_DIR)/host/share/aclocal-*),-I $$(p))
++ $(1) : export ACLOCAL_INCLUDE=$$(foreach p,$$(wildcard $$(STAGING_DIR)/usr/share/aclocal $$(STAGING_DIR)/usr/share/aclocal-* $$(STAGING_DIR_HOSTPKG)/share/aclocal $$(STAGING_DIR_HOSTPKG)/share/aclocal-* $$(STAGING_DIR)/host/share/aclocal $$(STAGING_DIR)/host/share/aclocal-*),-I $$(p))
+ $(1) : export STAGING_PREFIX=$$(STAGING_DIR)/usr
+ $(1) : export PATH=$$(TARGET_PATH_PKG)
+ $(1) : export CONFIG_SITE:=$$(CONFIG_SITE)
+diff --git a/rules.mk b/rules.mk
+index 04fd936660bef4af49de5500cd2d7c3601c1b9f6..95b18f9e5c69de479db54c5bdb740103140dcf74 100644
+--- a/rules.mk
++++ b/rules.mk
+@@ -145,9 +145,9 @@ STAGING_DIR_ROOT:=$(STAGING_DIR)/root-$(BOARD)
+ BUILD_LOG_DIR:=$(TOPDIR)/logs
+ PKG_INFO_DIR := $(STAGING_DIR)/pkginfo
+
+-BUILD_DIR_HOST:=$(if $(IS_PACKAGE_BUILD),$(BUILD_DIR)/host,$(BUILD_DIR_BASE)/host)
++BUILD_DIR_HOST:=$(if $(IS_PACKAGE_BUILD),$(BUILD_DIR_BASE)/hostpkg,$(BUILD_DIR_BASE)/host)
+ STAGING_DIR_HOST:=$(TOPDIR)/staging_dir/host
+-STAGING_DIR_HOSTPKG:=$(STAGING_DIR)/host
++STAGING_DIR_HOSTPKG:=$(TOPDIR)/staging_dir/hostpkg
+
+ TARGET_PATH:=$(subst $(space),:,$(filter-out .,$(filter-out ./,$(subst :,$(space),$(PATH)))))
+ TARGET_INIT_PATH:=$(call qstrip,$(CONFIG_TARGET_INIT_PATH))
+@@ -206,7 +206,7 @@ ifndef DUMP
+ endif
+ endif
+ endif
+-TARGET_PATH_PKG:=$(STAGING_DIR)/host/bin:$(TARGET_PATH)
++TARGET_PATH_PKG:=$(STAGING_DIR)/host/bin:$(STAGING_DIR_HOSTPKG)/bin:$(TARGET_PATH)
+
+ ifeq ($(CONFIG_SOFT_FLOAT),y)
+ SOFT_FLOAT_CONFIG_OPTION:=--with-float=soft
+@@ -232,9 +232,9 @@ export PKG_CONFIG
+
+ HOSTCC:=gcc
+ HOSTCXX:=g++
+-HOST_CPPFLAGS:=-I$(STAGING_DIR_HOST)/include -I$(STAGING_DIR_HOST)/usr/include $(if $(IS_PACKAGE_BUILD),-I$(STAGING_DIR)/host/include)
++HOST_CPPFLAGS:=-I$(STAGING_DIR_HOST)/include -I$(STAGING_DIR_HOST)/usr/include $(if $(IS_PACKAGE_BUILD),-I$(STAGING_DIR_HOSTPKG)/include -I$(STAGING_DIR)/host/include)
+ HOST_CFLAGS:=-O2 $(HOST_CPPFLAGS)
+-HOST_LDFLAGS:=-L$(STAGING_DIR_HOST)/lib -L$(STAGING_DIR_HOST)/usr/lib $(if $(IS_PACKAGE_BUILD),-L$(STAGING_DIR)/host/lib)
++HOST_LDFLAGS:=-L$(STAGING_DIR_HOST)/lib -L$(STAGING_DIR_HOST)/usr/lib $(if $(IS_PACKAGE_BUILD),-L$(STAGING_DIR_HOSTPKG)/lib -L$(STAGING_DIR)/host/lib)
+
+ ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
+ TARGET_AR:=$(TARGET_CROSS)gcc-ar
diff --git a/patches/openwrt/0002-procd-add-support-for-alternative-rc.d-directories.patch b/patches/lede/0002-procd-add-support-for-alternative-rc.d-directories.patch
similarity index 100%
rename from patches/openwrt/0002-procd-add-support-for-alternative-rc.d-directories.patch
rename to patches/lede/0002-procd-add-support-for-alternative-rc.d-directories.patch
diff --git a/patches/lede/0003-base-files-disable-reset-button-handling.patch b/patches/lede/0003-base-files-disable-reset-button-handling.patch
new file mode 100644
index 0000000000000000000000000000000000000000..7e44f2903f026b15951a90a787e3e9d865e3c764
--- /dev/null
+++ b/patches/lede/0003-base-files-disable-reset-button-handling.patch
@@ -0,0 +1,43 @@
+From: Matthias Schiffer <mschiffer@universe-factory.net>
+Date: Sat, 21 Mar 2015 16:40:52 +0100
+Subject: base-files: disable reset button handling
+
+This conflicts with our reset button usage.
+
+diff --git a/package/base-files/files/etc/rc.button/reset b/package/base-files/files/etc/rc.button/reset
+deleted file mode 100755
+index 4265767437e8eda3c758fe7f7941d7f608c95782..0000000000000000000000000000000000000000
+--- a/package/base-files/files/etc/rc.button/reset
++++ /dev/null
+@@ -1,31 +0,0 @@
+-#!/bin/sh
+-
+-. /lib/functions.sh
+-
+-OVERLAY="$( grep ' /overlay ' /proc/mounts )"
+-
+-case "$ACTION" in
+-pressed)
+- [ -z "$OVERLAY" ] && return 0
+-
+- return 5
+-;;
+-timeout)
+- . /etc/diag.sh
+- set_state failsafe
+-;;
+-released)
+- if [ "$SEEN" -lt 1 ]
+- then
+- echo "REBOOT" > /dev/console
+- sync
+- reboot
+- elif [ "$SEEN" -gt 5 -a -n "$OVERLAY" ]
+- then
+- echo "FACTORY RESET" > /dev/console
+- jffs2reset -y && reboot &
+- fi
+-;;
+-esac
+-
+-return 0
diff --git a/patches/openwrt/0009-hostapd-prevent-channel-switch-for-5GHz.patch b/patches/lede/0004-hostapd-prevent-channel-switch-for-5GHz.patch
similarity index 100%
rename from patches/openwrt/0009-hostapd-prevent-channel-switch-for-5GHz.patch
rename to patches/lede/0004-hostapd-prevent-channel-switch-for-5GHz.patch
diff --git a/patches/openwrt/0042-libjson-c-Add-support-for-custom-format-strings-for-doubles.patch b/patches/lede/0005-libjson-c-Add-support-for-custom-format-strings-for-doubles.patch
similarity index 100%
rename from patches/openwrt/0042-libjson-c-Add-support-for-custom-format-strings-for-doubles.patch
rename to patches/lede/0005-libjson-c-Add-support-for-custom-format-strings-for-doubles.patch
diff --git a/patches/lede/0006-dropbear-add-a-failsafe-mode-that-will-always-allow-password-less-root-login.patch b/patches/lede/0006-dropbear-add-a-failsafe-mode-that-will-always-allow-password-less-root-login.patch
new file mode 100644
index 0000000000000000000000000000000000000000..d0a36b271743d2ffb541d91537adab1ea4ac3fdb
--- /dev/null
+++ b/patches/lede/0006-dropbear-add-a-failsafe-mode-that-will-always-allow-password-less-root-login.patch
@@ -0,0 +1,69 @@
+From: Matthias Schiffer <mschiffer@universe-factory.net>
+Date: Tue, 27 Sep 2016 03:55:55 +0200
+Subject: dropbear: add a failsafe mode that will always allow password-less root login
+
+Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
+
+diff --git a/package/network/services/dropbear/patches/700-failsafe-mode.patch b/package/network/services/dropbear/patches/700-failsafe-mode.patch
+new file mode 100644
+index 0000000000000000000000000000000000000000..c6e45423e2dba1258549a5bfe4b5a59ac32d73d8
+--- /dev/null
++++ b/package/network/services/dropbear/patches/700-failsafe-mode.patch
+@@ -0,0 +1,57 @@
++--- a/runopts.h
+++++ b/runopts.h
++@@ -97,6 +97,8 @@ typedef struct svr_runopts {
++ int norootpass;
++ int allowblankpass;
++
+++ int failsafe_mode;
+++
++ #ifdef ENABLE_SVR_REMOTETCPFWD
++ int noremotetcp;
++ #endif
++--- a/svr-auth.c
+++++ b/svr-auth.c
++@@ -149,10 +149,11 @@ void recv_msg_userauth_request() {
++ AUTH_METHOD_NONE_LEN) == 0) {
++ TRACE(("recv_msg_userauth_request: 'none' request"))
++ if (valid_user
++- && (svr_opts.allowblankpass || !strcmp(ses.authstate.pw_name, "root"))
++- && !svr_opts.noauthpass
++- && !(svr_opts.norootpass && ses.authstate.pw_uid == 0)
++- && ses.authstate.pw_passwd[0] == '\0')
+++ && ((svr_opts.failsafe_mode && !strcmp(ses.authstate.pw_name, "root"))
+++ || ((svr_opts.allowblankpass || !strcmp(ses.authstate.pw_name, "root"))
+++ && !svr_opts.noauthpass
+++ && !(svr_opts.norootpass && ses.authstate.pw_uid == 0)
+++ && ses.authstate.pw_passwd[0] == '\0')))
++ {
++ dropbear_log(LOG_NOTICE,
++ "Auth succeeded with blank password for '%s' from %s",
++--- a/svr-runopts.c
+++++ b/svr-runopts.c
++@@ -72,6 +72,7 @@ static void printhelp(const char * progn
++ "-s Disable password logins\n"
++ "-g Disable password logins for root\n"
++ "-B Allow blank password logins\n"
+++ "-f Failsafe mode: always allow password-less root login\n"
++ #endif
++ #ifdef ENABLE_SVR_LOCALTCPFWD
++ "-j Disable local port forwarding\n"
++@@ -130,6 +131,7 @@ void svr_getopts(int argc, char ** argv)
++ svr_opts.noauthpass = 0;
++ svr_opts.norootpass = 0;
++ svr_opts.allowblankpass = 0;
+++ svr_opts.failsafe_mode = 0;
++ svr_opts.inetdmode = 0;
++ svr_opts.portcount = 0;
++ svr_opts.hostkey = NULL;
++@@ -244,6 +246,9 @@ void svr_getopts(int argc, char ** argv)
++ case 'B':
++ svr_opts.allowblankpass = 1;
++ break;
+++ case 'f':
+++ svr_opts.failsafe_mode = 1;
+++ break;
++ #endif
++ case 'h':
++ printhelp(argv[0]);
diff --git a/patches/openwrt/0001-tools-Makefile-fix-host-tools-build-dependencies.patch b/patches/openwrt/0001-tools-Makefile-fix-host-tools-build-dependencies.patch
deleted file mode 100644
index e86fba90463906429168206ac531df7c370dbe15..0000000000000000000000000000000000000000
--- a/patches/openwrt/0001-tools-Makefile-fix-host-tools-build-dependencies.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Sat, 26 Jul 2014 06:10:23 +0200
-Subject: tools/Makefile: fix host tools build dependencies
-
-diff --git a/tools/Makefile b/tools/Makefile
-index d2fe2ffddf4b7207a937ca75efe1c2728e8067aa..c6cded8eccd81c422f99e7ee50754c4bc66decc7 100644
---- a/tools/Makefile
-+++ b/tools/Makefile
-@@ -95,10 +95,16 @@ define PrepareStaging
- endef
-
- # preparatory work
-+ifneq ($(ARCH),)
-+staging_prepared = $(STAGING_DIR)/.prepared
-+
- $(STAGING_DIR)/.prepared: $(TMP_DIR)/.build
- $(call PrepareStaging,$(STAGING_DIR))
- mkdir -p $(BUILD_DIR)/stamp
- touch $@
-+else
-+staging_prepared :=
-+endif
-
- $(STAGING_DIR_HOST)/.prepared: $(TMP_DIR)/.build
- $(call PrepareStaging,$(STAGING_DIR_HOST))
-@@ -110,8 +116,8 @@ $(STAGING_DIR_HOST)/.prepared: $(TMP_DIR)/.build
-
- endif
-
--$(curdir)//prepare = $(STAGING_DIR)/.prepared $(STAGING_DIR_HOST)/.prepared
--$(curdir)//compile = $(STAGING_DIR)/.prepared $(STAGING_DIR_HOST)/.prepared
-+$(curdir)//prepare = $(staging_prepared) $(STAGING_DIR_HOST)/.prepared
-+$(curdir)//compile = $(staging_prepared) $(STAGING_DIR_HOST)/.prepared
-
- # prerequisites for the individual targets
- $(curdir)/ := .config prereq
diff --git a/patches/openwrt/0003-odhcp6c-backport-from-LEDE-0d49f9f4b4da9d1960f82e68ae797290e4b9c434.patch b/patches/openwrt/0003-odhcp6c-backport-from-LEDE-0d49f9f4b4da9d1960f82e68ae797290e4b9c434.patch
deleted file mode 100644
index 75993f39a537c1b400d12fc3d120a8d274d1bf2a..0000000000000000000000000000000000000000
--- a/patches/openwrt/0003-odhcp6c-backport-from-LEDE-0d49f9f4b4da9d1960f82e68ae797290e4b9c434.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Tue, 17 Jan 2017 22:08:21 +0100
-Subject: odhcp6c: backport from LEDE 0d49f9f4b4da9d1960f82e68ae797290e4b9c434
-
-diff --git a/package/network/ipv6/odhcp6c/Makefile b/package/network/ipv6/odhcp6c/Makefile
-index 3705705f6540dc841c7041e81f6d208a41a1f08a..a8e45588a52859daf14c68c665a53690b9d09be2 100644
---- a/package/network/ipv6/odhcp6c/Makefile
-+++ b/package/network/ipv6/odhcp6c/Makefile
-@@ -8,15 +8,16 @@
- include $(TOPDIR)/rules.mk
-
- PKG_NAME:=odhcp6c
--PKG_VERSION:=2016-02-08
-+PKG_VERSION:=2017-01-07
- PKG_RELEASE=$(PKG_SOURCE_VERSION)
-
- PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
- PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
--PKG_SOURCE_URL:=https://github.com/openwrt/odhcp6c.git
-+PKG_SOURCE_URL:=git://git.lede-project.org/project/odhcp6c.git
- PKG_SOURCE_PROTO:=git
--PKG_SOURCE_VERSION:=dc186d6d2b0dd4ad23ca5fc69c00e81f796ff6d9
--PKG_MAINTAINER:=Steven Barth <steven@midlink.org>
-+PKG_SOURCE_VERSION:=d420f49396c627ce1072b83170889baf0720bc8b
-+PKG_MIRROR_HASH:=a7c599b5600b6cca9aec221dd32fc7754e0e942b0192bd902f1e789f53345127
-+PKG_MAINTAINER:=Hans Dedecker <dedeckeh@gmail.com>
- PKG_LICENSE:=GPL-2.0
-
- include $(INCLUDE_DIR)/package.mk
-@@ -30,7 +31,7 @@ define Package/odhcp6c
- SECTION:=net
- CATEGORY:=Network
- TITLE:=Embedded DHCPv6-client for OpenWrt
-- DEPENDS:=+kmod-ipv6
-+ DEPENDS:=@IPV6 +libubox
- endef
-
- define Package/odhcp6c/config
-diff --git a/package/network/ipv6/odhcp6c/files/dhcpv6.script b/package/network/ipv6/odhcp6c/files/dhcpv6.script
-index 677d35f4f92e82d6a7fe9ca01a35e071097baca8..1bb5e771b6dc80c1f5bceef88508d92cc69b1d3a 100755
---- a/package/network/ipv6/odhcp6c/files/dhcpv6.script
-+++ b/package/network/ipv6/odhcp6c/files/dhcpv6.script
-@@ -77,6 +77,11 @@ setup_interface () {
- -z "$RA_DNS" -a "$FAKE_ROUTES" = 1 ]; then
- RA_ROUTES="::/0,$SERVER,$valid,4096"
- fi
-+
-+ # RFC 7278
-+ if [ "$mask" -eq 64 -a -z "$PREFIXES" -a -n "$EXTENDPREFIX" ]; then
-+ proto_add_ipv6_prefix "$addr/$mask,$preferred,$valid"
-+ fi
- done
-
- for entry in $RA_ROUTES; do
-@@ -180,7 +185,7 @@ setup_interface () {
- # Apply IPv6 / ND configuration
- HOPLIMIT=$(cat /proc/sys/net/ipv6/conf/$device/hop_limit)
- [ -n "$RA_HOPLIMIT" -a -n "$HOPLIMIT" ] && [ "$RA_HOPLIMIT" -gt "$HOPLIMIT" ] && echo "$RA_HOPLIMIT" > /proc/sys/net/ipv6/conf/$device/hop_limit
-- [ -n "$RA_MTU" ] && [ "$RA_MTU" -gt 0 ] && echo "$RA_MTU" > /proc/sys/net/ipv6/conf/$device/mtu
-+ [ -n "$RA_MTU" ] && [ "$RA_MTU" -ge 1280 ] && echo "$RA_MTU" > /proc/sys/net/ipv6/conf/$device/mtu 2>/dev/null
- [ -n "$RA_REACHABLE" ] && [ "$RA_REACHABLE" -gt 0 ] && echo "$RA_REACHABLE" > /proc/sys/net/ipv6/neigh/$device/base_reachable_time_ms
- [ -n "$RA_RETRANSMIT" ] && [ "$RA_RETRANSMIT" -gt 0 ] && echo "$RA_RETRANSMIT" > /proc/sys/net/ipv6/neigh/$device/retrans_time_ms
-
-@@ -209,6 +214,6 @@ case "$2" in
- esac
-
- # user rules
--[ -f /etc/odhcp6c.user ] && . /etc/odhcp6c.user
-+[ -f /etc/odhcp6c.user ] && . /etc/odhcp6c.user "@"
-
- exit 0
-diff --git a/package/network/ipv6/odhcp6c/files/dhcpv6.sh b/package/network/ipv6/odhcp6c/files/dhcpv6.sh
-index 4a453fdc4d94d9298067a986b0e4c6054b6c0a60..9e3f6697335a55cf4be1751fec907a4ac93f09ec 100755
---- a/package/network/ipv6/odhcp6c/files/dhcpv6.sh
-+++ b/package/network/ipv6/odhcp6c/files/dhcpv6.sh
-@@ -13,6 +13,7 @@ proto_dhcpv6_init_config() {
- proto_config_add_string 'reqopts:list(uinteger)'
- proto_config_add_string 'noslaaconly:bool'
- proto_config_add_string 'forceprefix:bool'
-+ proto_config_add_string 'extendprefix:bool'
- proto_config_add_string 'norelease:bool'
- proto_config_add_string 'ip6prefix:ip6addr'
- proto_config_add_string iface_dslite
-@@ -29,14 +30,15 @@ proto_dhcpv6_init_config() {
- proto_config_add_int "soltimeout"
- proto_config_add_boolean fakeroutes
- proto_config_add_boolean sourcefilter
-+ proto_config_add_boolean keep_ra_dnslifetime
- }
-
- proto_dhcpv6_setup() {
- local config="$1"
- local iface="$2"
-
-- local reqaddress reqprefix clientid reqopts noslaaconly forceprefix norelease ip6prefix iface_dslite iface_map iface_464xlat ifaceid userclass vendorclass delegate zone_dslite zone_map zone_464xlat zone soltimeout fakeroutes sourcefilter
-- json_get_vars reqaddress reqprefix clientid reqopts noslaaconly forceprefix norelease ip6prefix iface_dslite iface_map iface_464xlat ifaceid userclass vendorclass delegate zone_dslite zone_map zone_464xlat zone soltimeout fakeroutes sourcefilter
-+ local reqaddress reqprefix clientid reqopts noslaaconly forceprefix extendprefix norelease ip6prefix iface_dslite iface_map iface_464xlat ifaceid userclass vendorclass delegate zone_dslite zone_map zone_464xlat zone soltimeout fakeroutes sourcefilter keep_ra_dnslifetime
-+ json_get_vars reqaddress reqprefix clientid reqopts noslaaconly forceprefix extendprefix norelease ip6prefix iface_dslite iface_map iface_464xlat ifaceid userclass vendorclass delegate zone_dslite zone_map zone_464xlat zone soltimeout fakeroutes sourcefilter keep_ra_dnslifetime
-
-
- # Configure
-@@ -60,6 +62,8 @@ proto_dhcpv6_setup() {
-
- [ -n "$userclass" ] && append opts "-u$userclass"
-
-+ [ "$keep_ra_dnslifetime" = "1" ] && append opts "-L"
-+
- for opt in $reqopts; do
- append opts "-r$opt"
- done
-@@ -78,6 +82,7 @@ proto_dhcpv6_setup() {
- [ -n "$zone" ] && proto_export "ZONE=$zone"
- [ "$fakeroutes" != "0" ] && proto_export "FAKE_ROUTES=1"
- [ "$sourcefilter" = "0" ] && proto_export "NOSOURCEFILTER=1"
-+ [ "$extendprefix" = "1" ] && proto_export "EXTENDPREFIX=1"
-
- proto_export "INTERFACE=$config"
- proto_run_command "$config" odhcp6c \
diff --git a/patches/openwrt/0004-busybox-enable-telnet-only-when-root-password-is-really-empty-not-when-it-is-locked.patch b/patches/openwrt/0004-busybox-enable-telnet-only-when-root-password-is-really-empty-not-when-it-is-locked.patch
deleted file mode 100644
index 74e6ad36ab8ce1c793201f47a3866bbb960bc79e..0000000000000000000000000000000000000000
--- a/patches/openwrt/0004-busybox-enable-telnet-only-when-root-password-is-really-empty-not-when-it-is-locked.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Fri, 5 Dec 2014 18:57:16 +0100
-Subject: busybox: enable telnet only when root password is really empty, not when it is locked
-
-diff --git a/package/utils/busybox/files/telnet b/package/utils/busybox/files/telnet
-index a1d1cdf9b18d69895e7a08a8b1318f1ff591ea07..f95be90490597f6251d8c3e1247b522dfd9e72c0 100755
---- a/package/utils/busybox/files/telnet
-+++ b/package/utils/busybox/files/telnet
-@@ -11,7 +11,7 @@ has_root_pwd() {
- pwd="${pwd#*root:}"
- pwd="${pwd%%:*}"
-
-- test -n "${pwd#[\!x]}"
-+ test -n "${pwd}"
- }
-
- get_root_home() {
-@@ -28,7 +28,7 @@ has_ssh_pubkey() {
-
- start_service() {
- if ( ! has_ssh_pubkey && \
-- ! has_root_pwd /etc/passwd && ! has_root_pwd /etc/shadow ) || \
-+ ( ! has_root_pwd /etc/passwd || ! has_root_pwd /etc/shadow ) ) || \
- ( ! /etc/init.d/dropbear enabled 2> /dev/null && ! /etc/init.d/sshd enabled 2> /dev/null );
- then
- procd_open_instance
diff --git a/patches/openwrt/0005-base-files-disable-reset-button-handling.patch b/patches/openwrt/0005-base-files-disable-reset-button-handling.patch
deleted file mode 100644
index 3d99089351e10a1243c1f4635fcd8e0741c72292..0000000000000000000000000000000000000000
--- a/patches/openwrt/0005-base-files-disable-reset-button-handling.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Sat, 21 Mar 2015 16:40:52 +0100
-Subject: base-files: disable reset button handling
-
-This conflicts with our reset button usage.
-
-diff --git a/package/base-files/files/etc/rc.button/reset b/package/base-files/files/etc/rc.button/reset
-deleted file mode 100755
-index 3e241460efbb08abaa775c1a7843b5fa3e237d44..0000000000000000000000000000000000000000
---- a/package/base-files/files/etc/rc.button/reset
-+++ /dev/null
-@@ -1,20 +0,0 @@
--#!/bin/sh
--
--[ "${ACTION}" = "released" ] || exit 0
--
--. /lib/functions.sh
--
--logger "$BUTTON pressed for $SEEN seconds"
--
--if [ "$SEEN" -lt 1 ]
--then
-- echo "REBOOT" > /dev/console
-- sync
-- reboot
--elif [ "$SEEN" -gt 5 ]
--then
-- echo "FACTORY RESET" > /dev/console
-- jffs2reset -y && reboot &
--fi
--
--return 0
diff --git a/patches/openwrt/0006-ar71xx-define-wmac-reset-function-for-QCA955x.patch b/patches/openwrt/0006-ar71xx-define-wmac-reset-function-for-QCA955x.patch
deleted file mode 100644
index dfc8549112eaa1c29df8a4d56edef8ab2674ebc6..0000000000000000000000000000000000000000
--- a/patches/openwrt/0006-ar71xx-define-wmac-reset-function-for-QCA955x.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Tue, 19 Jul 2016 17:48:53 +0200
-Subject: ar71xx: define wmac reset function for QCA955x
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
-
-Backport of LEDE a176168a85477caa44eef7e979567d1d52868fde
-
-diff --git a/target/linux/ar71xx/patches-3.18/640-MIPS-ath79-add-QCA955x-wmac-reset.patch b/target/linux/ar71xx/patches-3.18/640-MIPS-ath79-add-QCA955x-wmac-reset.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..4ac5acd618748fc9ad0f091d110d2503cdc39d53
---- /dev/null
-+++ b/target/linux/ar71xx/patches-3.18/640-MIPS-ath79-add-QCA955x-wmac-reset.patch
-@@ -0,0 +1,71 @@
-+--- a/arch/mips/ath79/common.h
-++++ b/arch/mips/ath79/common.h
-+@@ -19,6 +19,8 @@
-+ #define ATH79_MEM_SIZE_MIN (2 * 1024 * 1024)
-+ #define ATH79_MEM_SIZE_MAX (128 * 1024 * 1024)
-+
-++extern void __iomem *ath79_ddr_base;
-++
-+ void ath79_clocks_init(void);
-+ unsigned long ath79_get_sys_clk_rate(const char *id);
-+
-+--- a/arch/mips/ath79/dev-wmac.c
-++++ b/arch/mips/ath79/dev-wmac.c
-+@@ -149,6 +149,27 @@ static void ar934x_wmac_setup(void)
-+ ath79_wmac_data.is_clk_25mhz = true;
-+ }
-+
-++static int ar955x_wmac_reset(void)
-++{
-++ int i;
-++
-++ /* Try to wait for WMAC DDR activity to stop */
-++ for (i = 0; i < 10; i++) {
-++ if (!(__raw_readl(ath79_ddr_base + QCA955X_DDR_CTL_CONFIG) &
-++ QCA955X_DDR_CTL_CONFIG_ACT_WMAC))
-++ break;
-++
-++ udelay(10);
-++ }
-++
-++ ath79_device_reset_set(QCA955X_RESET_RTC);
-++ udelay(10);
-++ ath79_device_reset_clear(QCA955X_RESET_RTC);
-++ udelay(10);
-++
-++ return 0;
-++}
-++
-+ static void qca955x_wmac_setup(void)
-+ {
-+ u32 t;
-+@@ -165,6 +186,8 @@ static void qca955x_wmac_setup(void)
-+ ath79_wmac_data.is_clk_25mhz = false;
-+ else
-+ ath79_wmac_data.is_clk_25mhz = true;
-++
-++ ath79_wmac_data.external_reset = ar955x_wmac_reset;
-+ }
-+
-+ static bool __init
-+--- a/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
-++++ b/arch/mips/include/asm/mach-ath79/ar71xx_regs.h
-+@@ -32,7 +32,7 @@
-+ #define AR71XX_SPI_SIZE 0x01000000
-+
-+ #define AR71XX_DDR_CTRL_BASE (AR71XX_APB_BASE + 0x00000000)
-+-#define AR71XX_DDR_CTRL_SIZE 0x100
-++#define AR71XX_DDR_CTRL_SIZE 0x200
-+ #define AR71XX_UART_BASE (AR71XX_APB_BASE + 0x00020000)
-+ #define AR71XX_UART_SIZE 0x100
-+ #define AR71XX_USB_CTRL_BASE (AR71XX_APB_BASE + 0x00030000)
-+@@ -173,6 +173,9 @@
-+ #define AR934X_DDR_REG_FLUSH_PCIE 0xa8
-+ #define AR934X_DDR_REG_FLUSH_WMAC 0xac
-+
-++#define QCA955X_DDR_CTL_CONFIG 0x108
-++#define QCA955X_DDR_CTL_CONFIG_ACT_WMAC BIT(23)
-++
-+ /*
-+ * PLL block
-+ */
diff --git a/patches/openwrt/0007-mac80211-hostapd-iw-.-update.patch b/patches/openwrt/0007-mac80211-hostapd-iw-.-update.patch
deleted file mode 100644
index 5a47e39dd6c8a52cd8a8cd52e916ea099c40df59..0000000000000000000000000000000000000000
--- a/patches/openwrt/0007-mac80211-hostapd-iw-.-update.patch
+++ /dev/null
@@ -1,25894 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Tue, 11 Oct 2016 02:53:43 +0200
-Subject: mac80211, hostapd, iw, ...: update
-
-The following package is updated to
-LEDE 6c2651566cce8f5b3a3d3b976439dee2bac5e07e:
-
-* mac80211
-
-The following packages are updated to
-LEDE 42f559ed70897a7b74dd3e6293b42e6d2e511eaa:
-
-* acx-mac80211
-* ath10k-firmware
-* hostapd
-* iw
-* linux-firmware
-* mt76
-
-diff --git a/package/firmware/ath10k-firmware/Makefile b/package/firmware/ath10k-firmware/Makefile
-index b03d64491a554fafb72170eaa4fae171b5599835..624da6a1ed43ea37bbb3409b3dbe4b3af01263b5 100644
---- a/package/firmware/ath10k-firmware/Makefile
-+++ b/package/firmware/ath10k-firmware/Makefile
-@@ -8,7 +8,7 @@
- include $(TOPDIR)/rules.mk
-
- PKG_NAME:=ath10k-firmware
--PKG_SOURCE_VERSION:=77f72b5f7dd940386d9e619a17904987759b7186
-+PKG_SOURCE_VERSION:=b00eb8d30fbebb6a5047ccacefa8c37e072fca9c
- PKG_VERSION:=2014-11-13-$(PKG_SOURCE_VERSION)
- PKG_RELEASE:=1
-
-@@ -17,7 +17,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
- PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
- PKG_SOURCE_URL:=https://github.com/kvalo/ath10k-firmware.git
-
--PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
-+PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
-
- include $(INCLUDE_DIR)/package.mk
-
-@@ -28,14 +28,48 @@ define Package/ath10k-firmware-default
- CATEGORY:=Kernel modules
- SUBMENU:=$(WMENU)
- URL:=$(PKG_SOURCE_URL)
-+ DEPENDS:=
- endef
-
-+define Package/ath10k-firmware-qca9887
-+$(Package/ath10k-firmware-default)
-+ TITLE:=ath10k firmware for QCA9887 devices
-+endef
-+
-+QCA9887_REV:=3cce88e245f2d685e49411c4f80998f94baf67b8
-+QCA9887_FIRMWARE_FILE:=firmware-5.bin_10.2.4-1.0-00013
-+QCA9887_FIRMWARE_FILE_MD5:=bd9cdcbf49561c7176432a81c29e7e87
-+QCA9887_FIRMWARE_FILE_DL:=$(QCA9887_FIRMWARE_FILE).$(QCA9887_FIRMWARE_FILE_MD5)
-+QCA9887_BOARD_FILE:=board.bin
-+QCA9887_BOARD_FILE_MD5:=ebf3af10160c45373f19e0b8226b02ae
-+QCA9887_BOARD_FILE_DL:=$(QCA9887_BOARD_FILE).$(QCA9887_BOARD_FILE_MD5)
-+
-+define Download/ath10k-qca9887-firmware
-+ URL:=https://github.com/kvalo/ath10k-firmware/raw/$(QCA9887_REV)/QCA9887/hw1.0/
-+ URL_FILE:=$(QCA9887_FIRMWARE_FILE)
-+ FILE:=$(QCA9887_FIRMWARE_FILE_DL)
-+ MD5SUM:=$(QCA9887_FIRMWARE_FILE_MD5)
-+endef
-+$(eval $(call Download,ath10k-qca9887-firmware))
-+
-+define Download/ath10k-qca9887-board
-+ URL:=https://github.com/kvalo/ath10k-firmware/raw/$(QCA9887_REV)/QCA9887/hw1.0/
-+ URL_FILE:=$(QCA9887_BOARD_FILE)
-+ FILE:=$(QCA9887_BOARD_FILE_DL)
-+ MD5SUM:=$(QCA9887_BOARD_FILE_MD5)
-+endef
-+$(eval $(call Download,ath10k-qca9887-board))
-+
- define Package/ath10k-firmware-qca988x
- $(Package/ath10k-firmware-default)
-+ DEFAULT:=PACKAGE_kmod-ath10k
- TITLE:=ath10k firmware for QCA988x devices
- endef
-
- QCA988X_FIRMWARE_FILE:=firmware-5.bin_10.2.4.97-1
-+QCA988X_FIRMWARE_FILE_CT:=firmware-2-ct-full-community-16.1.bin-lede
-+QCA99X0_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-7.bin-lede.004
-+QCA9984_FIRMWARE_FILE_CT:=firmware-5-ct-full-community-7.bin-lede.004
-
- define Download/ath10k-firmware-qca988x
- URL:=https://www.codeaurora.org/cgit/quic/qsdk/oss/firmware/ath10k-firmware/plain/10.2.4/
-@@ -44,11 +78,83 @@ define Download/ath10k-firmware-qca988x
- endef
- $(eval $(call Download,ath10k-firmware-qca988x))
-
-+define Download/ath10k-firmware-qca988x-ct
-+ URL:=https://www.candelatech.com/downloads/
-+ FILE:=$(QCA988X_FIRMWARE_FILE_CT)
-+ MD5SUM:=d7e081e9782936ed544b78994c9133fb
-+endef
-+$(eval $(call Download,ath10k-firmware-qca988x-ct))
-+
-+define Download/ath10k-firmware-qca99x0-ct
-+ URL:=https://www.candelatech.com/downloads/ath10k-10-4/
-+ FILE:=$(QCA99X0_FIRMWARE_FILE_CT)
-+ MD5SUM:=809bb9bf8a18ea218a8e1b9ffc0f8447
-+endef
-+$(eval $(call Download,ath10k-firmware-qca99x0-ct))
-+
-+define Download/ath10k-firmware-qca9984-ct
-+ URL:=https://www.candelatech.com/downloads/ath10k-9984-10-4/
-+ FILE:=$(QCA9984_FIRMWARE_FILE_CT)
-+ MD5SUM:=924eb8ea30de11299b13e207469a3350
-+endef
-+$(eval $(call Download,ath10k-firmware-qca9984-ct))
-+
- define Package/ath10k-firmware-qca99x0
- $(Package/ath10k-firmware-default)
- TITLE:=ath10k firmware for QCA99x0 devices
- endef
-
-+define Package/ath10k-firmware-qca988x-ct
-+$(Package/ath10k-firmware-default)
-+ TITLE:=ath10k CT 10.1 firmware for QCA988x devices
-+endef
-+
-+define Package/ath10k-firmware-qca988x-ct/description
-+Alternative ath10k firmware for QCA988X from Candela Technologies.
-+Enables IBSS and other features. See:
-+http://www.candelatech.com/ath10k-10.1.php
-+This firmware will NOT be used unless the standard ath10k-firmware-qca988x
-+is un-selected since the driver will try to load firmware-5.bin before
-+firmware-2.bin
-+endef
-+
-+define Package/ath10k-firmware-qca99x0-ct/description
-+Alternative ath10k firmware for QCA99x0 from Candela Technologies.
-+Enables IBSS and other features. See:
-+http://www.candelatech.com/ath10k-10.4.php
-+This firmware conflicts with the standard 99x0 firmware, so select only
-+one.
-+endef
-+
-+define Package/ath10k-firmware-qca9984-ct/description
-+Alternative ath10k firmware for QCA9984 from Candela Technologies.
-+Enables IBSS and other features. See:
-+http://www.candelatech.com/ath10k-10.4-9984.php
-+This firmware conflicts with the standard 9984 firmware, so select only
-+one.
-+endef
-+
-+define Package/ath10k-firmware-qca99x0/description
-+Standard ath10k firmware for QCA99x0 from QCA
-+This firmware conflicts with the CT 99x0 firmware, so select only
-+one.
-+endef
-+
-+define Package/ath10k-firmware-qca99x0-ct
-+$(Package/ath10k-firmware-default)
-+ TITLE:=ath10k CT 10.4.3 firmware for QCA99x0 devices
-+endef
-+
-+define Package/ath10k-firmware-qca9984-ct
-+$(Package/ath10k-firmware-default)
-+ TITLE:=ath10k CT 10.4.3 firmware for QCA9984 devices
-+endef
-+
-+define Package/ath10k-firmware-qca9984
-+$(Package/ath10k-firmware-default)
-+ TITLE:=ath10k firmware for QCA9984 devices
-+endef
-+
- define Package/ath10k-firmware-qca6174
- $(Package/ath10k-firmware-default)
- TITLE:=ath10k firmware for QCA6174 devices
-@@ -58,8 +164,8 @@ QCA99X0_BOARD_REV:=ddcec9efd245da9365c474f513a855a55f3ac7fe
- QCA99X0_BOARD_FILE:=board-2.bin.$(QCA99X0_BOARD_REV)
-
- define Download/qca99x0-board
-- URL:=https://www.codeaurora.org/cgit/quic/qsdk/oss/firmware/ath10k-firmware/plain/ath10k/QCA99X0/hw2.0
-- URL_FILE:=board-2.bin?id=ddcec9efd245da9365c474f513a855a55f3ac7fe
-+ URL:=https://source.codeaurora.org/quic/qsdk/oss/firmware/ath10k-firmware/plain/ath10k/QCA99X0/hw2.0
-+ URL_FILE:=board-2.bin?id=$(QCA99X0_BOARD_REV)
- FILE:=$(QCA99X0_BOARD_FILE)
- MD5SUM:=a2b3c653c2363a5641200051d6333d0a
- endef
-@@ -69,6 +175,16 @@ define Build/Compile
-
- endef
-
-+define Package/ath10k-firmware-qca9887/install
-+ $(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA9887/hw1.0
-+ $(INSTALL_DATA) \
-+ $(DL_DIR)/$(QCA9887_FIRMWARE_FILE_DL) \
-+ $(1)/lib/firmware/ath10k/QCA9887/hw1.0/firmware-5.bin
-+ $(INSTALL_DATA) \
-+ $(DL_DIR)/$(QCA9887_BOARD_FILE_DL) \
-+ $(1)/lib/firmware/ath10k/QCA9887/hw1.0/board.bin
-+endef
-+
- define Package/ath10k-firmware-qca988x/install
- $(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA988X/hw2.0
- $(INSTALL_DATA) \
-@@ -79,6 +195,16 @@ define Package/ath10k-firmware-qca988x/install
- $(1)/lib/firmware/ath10k/QCA988X/hw2.0/firmware-5.bin
- endef
-
-+define Package/ath10k-firmware-qca988x-ct/install
-+ $(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA988X/hw2.0
-+ $(INSTALL_DATA) \
-+ $(PKG_BUILD_DIR)/QCA988X/board.bin \
-+ $(1)/lib/firmware/ath10k/QCA988X/hw2.0/
-+ $(INSTALL_DATA) \
-+ $(DL_DIR)/$(QCA988X_FIRMWARE_FILE_CT) \
-+ $(1)/lib/firmware/ath10k/QCA988X/hw2.0/firmware-2.bin
-+endef
-+
- define Package/ath10k-firmware-qca6174/install
- $(INSTALL_DIR) $(1)/lib/firmware/ath10k
- $(CP) $(PKG_BUILD_DIR)/QCA6174 $(1)/lib/firmware/ath10k/
-@@ -97,6 +223,51 @@ define Package/ath10k-firmware-qca99x0/install
- $(1)/lib/firmware/ath10k/QCA99X0/hw2.0/firmware-5.bin
- endef
-
-+define Package/ath10k-firmware-qca99x0-ct/install
-+ $(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA99X0/hw2.0
-+ $(INSTALL_DATA) \
-+ $(DL_DIR)/$(QCA99X0_BOARD_FILE) \
-+ $(1)/lib/firmware/ath10k/QCA99X0/hw2.0/board-2.bin
-+ $(INSTALL_DATA) \
-+ $(PKG_BUILD_DIR)/QCA99X0/hw2.0/boardData_AR900B_CUS239_5G_v2_001.bin \
-+ $(1)/lib/firmware/ath10k/QCA99X0/hw2.0/board.bin
-+ $(INSTALL_DATA) \
-+ $(DL_DIR)/$(QCA99X0_FIRMWARE_FILE_CT) \
-+ $(1)/lib/firmware/ath10k/QCA99X0/hw2.0/firmware-5.bin
-+endef
-+
-+define Package/ath10k-firmware-qca9984/install
-+ $(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA9984/hw1.0
-+ ln -s \
-+ ../../cal-pci-0000:01:00.0.bin \
-+ $(1)/lib/firmware/ath10k/QCA9984/hw1.0/board.bin
-+ $(INSTALL_DATA) \
-+ $(PKG_BUILD_DIR)/QCA9984/hw1.0/board-2.bin \
-+ $(1)/lib/firmware/ath10k/QCA9984/hw1.0/board-2.bin
-+ $(INSTALL_DATA) \
-+ $(PKG_BUILD_DIR)/QCA9984/hw1.0/firmware-5.bin_10.4-3.2-00072 \
-+ $(1)/lib/firmware/ath10k/QCA9984/hw1.0/firmware-5.bin
-+endef
-+
-+define Package/ath10k-firmware-qca9984-ct/install
-+ $(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA9984/hw1.0
-+ ln -s \
-+ ../../cal-pci-0000:01:00.0.bin \
-+ $(1)/lib/firmware/ath10k/QCA9984/hw1.0/board.bin
-+ $(INSTALL_DATA) \
-+ $(PKG_BUILD_DIR)/QCA9984/hw1.0/board-2.bin \
-+ $(1)/lib/firmware/ath10k/QCA9984/hw1.0/board-2.bin
-+ $(INSTALL_DATA) \
-+ $(DL_DIR)/$(QCA9984_FIRMWARE_FILE_CT) \
-+ $(1)/lib/firmware/ath10k/QCA9984/hw1.0/firmware-5.bin
-+endef
-+
-+$(eval $(call BuildPackage,ath10k-firmware-qca9887))
- $(eval $(call BuildPackage,ath10k-firmware-qca988x))
- $(eval $(call BuildPackage,ath10k-firmware-qca99x0))
- $(eval $(call BuildPackage,ath10k-firmware-qca6174))
-+$(eval $(call BuildPackage,ath10k-firmware-qca9984))
-+
-+$(eval $(call BuildPackage,ath10k-firmware-qca988x-ct))
-+$(eval $(call BuildPackage,ath10k-firmware-qca99x0-ct))
-+$(eval $(call BuildPackage,ath10k-firmware-qca9984-ct))
-diff --git a/package/firmware/linux-firmware/Makefile b/package/firmware/linux-firmware/Makefile
-index 2fcd93b2ef104647a61c3aa40e2cef4404b1e484..ae5894cc56ff28271dff8871d640cc213c5c0107 100644
---- a/package/firmware/linux-firmware/Makefile
-+++ b/package/firmware/linux-firmware/Makefile
-@@ -17,9 +17,9 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
- PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)
- PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
- PKG_SOURCE_URL:=git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
--PKG_MIRROR_MD5SUM:=ca4d289ad9380471cae376fc7dd3660a
-+PKG_MIRROR_MD5SUM:=8d44332359de89b1936b4ff608a72614
-
--PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
-+PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
-
- SCAN_DEPS = *.mk
-
-diff --git a/package/firmware/linux-firmware/realtek.mk b/package/firmware/linux-firmware/realtek.mk
-index 0f8b1ce75053713b25ea601fd56ad02c410861b7..4229ca0ebbaa1fe55c3e30be5769c0cc492084d6 100644
---- a/package/firmware/linux-firmware/realtek.mk
-+++ b/package/firmware/linux-firmware/realtek.mk
-@@ -43,8 +43,15 @@ endef
- $(eval $(call BuildPackage,rtl8192de-firmware))
-
- Package/rtl8192se-firmware = $(call Package/firmware-default,RealTek RTL8192SE firmware)
--define KernelPackage/rtl8192se/install
-+define Package/rtl8192se-firmware/install
- $(INSTALL_DIR) $(1)/lib/firmware/rtlwifi
- $(INSTALL_DATA) $(PKG_BUILD_DIR)/rtlwifi/rtl8192sefw.bin $(1)/lib/firmware/rtlwifi
- endef
- $(eval $(call BuildPackage,rtl8192se-firmware))
-+
-+Package/rtl8192su-firmware = $(call Package/firmware-default,RealTek RTL8192SU firmware)
-+define Package/rtl8192su-firmware/install
-+ $(INSTALL_DIR) $(1)/lib/firmware/rtlwifi
-+ $(INSTALL_DATA) $(PKG_BUILD_DIR)/rtlwifi/rtl8712u.bin $(1)/lib/firmware/rtlwifi
-+endef
-+$(eval $(call BuildPackage,rtl8192su-firmware))
-diff --git a/package/kernel/acx-mac80211/Makefile b/package/kernel/acx-mac80211/Makefile
-index 1820e7abb3ed5adbe74c1e9774b9c910d72d34eb..8fce374d2b99446d11e3bf56b2df014fdd9cbc9d 100644
---- a/package/kernel/acx-mac80211/Makefile
-+++ b/package/kernel/acx-mac80211/Makefile
-@@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk
- include $(INCLUDE_DIR)/kernel.mk
-
- PKG_NAME:=acx-mac80211
--PKG_REV:=v20130127
--PKG_VERSION:=20130909
-+PKG_REV:=b6fc31491020cb01d2cd1acc170cfa03ced7e726
-+PKG_VERSION:=20140216
- PKG_RELEASE:=1
-
- PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
--PKG_SOURCE_URL:=git://acx100.git.sourceforge.net/gitroot/acx100/acx-mac80211
-+PKG_SOURCE_URL:=http://git.code.sf.net/p/acx100/acx-mac80211
- PKG_SOURCE_PROTO:=git
- PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
- PKG_SOURCE_VERSION:=$(PKG_REV)
-@@ -190,7 +190,7 @@ define Build/Compile
- CROSS_COMPILE="$(TARGET_CROSS)" \
- SUBDIRS="$(PKG_BUILD_DIR)" \
- $(PKG_EXTRA_KCONFIG) \
-- EXTRA_CFLAGS="$(PKG_EXTRA_CFLAGS) -DCONFIG_ACX_MAC80211_VERSION=\"KERNEL_VERSION(3,14,0)\"" \
-+ 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) \
-diff --git a/package/kernel/acx-mac80211/patches/001-pci-mem-Fix-3.8-build.patch b/package/kernel/acx-mac80211/patches/001-pci-mem-Fix-3.8-build.patch
-deleted file mode 100644
-index fa4a6be6ab09ad9515ccc9595808a093aeac7ab2..0000000000000000000000000000000000000000
---- a/package/kernel/acx-mac80211/patches/001-pci-mem-Fix-3.8-build.patch
-+++ /dev/null
-@@ -1,129 +0,0 @@
--From 8a0f5890019bf43f4bc95ef0754b062ddfcfa9cd Mon Sep 17 00:00:00 2001
--From: Oliver Winker <oliver@oli1170.net>
--Date: Sun, 10 Mar 2013 21:04:23 +0100
--Subject: [PATCH 1/3] pci, mem: Fix 3.8 build
--
--__devexit and __devinit not used anymore in 3.8
--
--Signed-off-by: Reinhard Karcher <reinhard.karcher@gmx.net>
--Signed-off-by: Oliver Winker <oliver@oli1170.net>
-----
-- mem.c | 13 ++++++++++++-
-- pci.c | 26 +++++++++++++++++++++++++-
-- 2 files changed, 37 insertions(+), 2 deletions(-)
--
----- a/mem.c
--+++ b/mem.c
--@@ -2216,7 +2216,11 @@ int acx100mem_ioctl_set_phy_amp_bias(str
-- * ==================================================
-- */
--
--+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
-- static int __devinit acxmem_probe(struct platform_device *pdev)
--+#else
--+static int acxmem_probe(struct platform_device *pdev)
--+#endif
-- {
-- acx_device_t *adev = NULL;
-- const char *chip_name;
--@@ -2392,7 +2396,11 @@ static int __devinit acxmem_probe(struct
-- * pdev - ptr to PCI device structure containing info about pci
-- * configuration
-- */
--+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
-- static int __devexit acxmem_remove(struct platform_device *pdev)
--+#else
--+static int acxmem_remove(struct platform_device *pdev)
--+#endif
-- {
-- struct ieee80211_hw *hw = (struct ieee80211_hw *)
-- platform_get_drvdata(pdev);
--@@ -2594,8 +2602,11 @@ static struct platform_driver acxmem_dri
-- .name = "acx-mem",
-- },
-- .probe = acxmem_probe,
--+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
-- .remove = __devexit_p(acxmem_remove),
---
--+#else
--+ .remove = acxmem_remove,
--+#endif
-- #ifdef CONFIG_PM
-- .suspend = acxmem_e_suspend,
-- .resume = acxmem_e_resume
----- a/pci.c
--+++ b/pci.c
--@@ -1039,7 +1039,11 @@ int acx100pci_ioctl_set_phy_amp_bias(str
-- * id - ptr to the device id entry that matched this device
-- */
-- #ifdef CONFIG_PCI
--+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
-- static int __devinit acxpci_probe(struct pci_dev *pdev,
--+#else
--+static int acxpci_probe(struct pci_dev *pdev,
--+#endif
-- const struct pci_device_id *id)
-- {
-- unsigned long mem_region1 = 0;
--@@ -1292,7 +1296,11 @@ static int __devinit acxpci_probe(struct
-- *
-- * pdev - ptr to PCI device structure containing info about pci configuration
-- */
--+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
-- static void __devexit acxpci_remove(struct pci_dev *pdev)
--+#else
--+static void acxpci_remove(struct pci_dev *pdev)
--+#endif
-- {
-- struct ieee80211_hw *hw
-- = (struct ieee80211_hw *) pci_get_drvdata(pdev);
--@@ -1505,7 +1513,11 @@ static struct pci_driver acxpci_driver =
-- .name = "acx_pci",
-- .id_table = acxpci_id_tbl,
-- .probe = acxpci_probe,
--+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
-- .remove = __devexit_p(acxpci_remove),
--+#else
--+ .remove = acxpci_remove,
--+#endif
-- #ifdef CONFIG_PM
-- .suspend = acxpci_e_suspend,
-- .resume = acxpci_e_resume
--@@ -1603,8 +1615,12 @@ static struct vlynq_device_id acx_vlynq_
-- };
--
--
--+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
-- static __devinit int vlynq_probe(struct vlynq_device *vdev,
--- struct vlynq_device_id *id)
--+#else
--+static int vlynq_probe(struct vlynq_device *vdev,
--+#endif
--+ struct vlynq_device_id *id)
-- {
-- int result = -EIO, i;
-- u32 addr;
--@@ -1785,7 +1801,11 @@ static __devinit int vlynq_probe(struct
-- return result;
-- }
--
--+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
-- static __devexit void vlynq_remove(struct vlynq_device *vdev)
--+#else
--+static void vlynq_remove(struct vlynq_device *vdev)
--+#endif
-- {
-- struct ieee80211_hw *hw = vlynq_get_drvdata(vdev);
-- acx_device_t *adev = hw2adev(hw);
--@@ -1851,7 +1871,11 @@ static struct vlynq_driver acxvlynq_driv
-- .name = "acx_vlynq",
-- .id_table = acx_vlynq_id,
-- .probe = vlynq_probe,
--+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
-- .remove = __devexit_p(vlynq_remove),
--+#else
--+ .remove = vlynq_remove,
--+#endif
-- };
-- #endif /* CONFIG_VLYNQ */
--
-diff --git a/package/kernel/acx-mac80211/patches/003-Fix-3.10-build.patch b/package/kernel/acx-mac80211/patches/003-Fix-3.10-build.patch
-deleted file mode 100644
-index c73784465e0729863aeba1c51a64ee8069bc99d1..0000000000000000000000000000000000000000
---- a/package/kernel/acx-mac80211/patches/003-Fix-3.10-build.patch
-+++ /dev/null
-@@ -1,31 +0,0 @@
--From 1daf4bfdb072b08f3b4e412bbfa9645f88dc0a01 Mon Sep 17 00:00:00 2001
--From: Oliver Winker <oliver@oli1170.net>
--Date: Tue, 3 Sep 2013 20:36:36 +0200
--Subject: [PATCH 3/3] Fix 3.10 build
--
--Signed-off-by: Reinhard Karcher <reinhard.karcher@gmx.net>
--Signed-off-by: Oliver Winker <oliver@oli1170.net>
-----
-- main.c | 7 +++++++
-- 1 file changed, 7 insertions(+)
--
----- a/main.c
--+++ b/main.c
--@@ -682,10 +682,17 @@ int acx_op_config(struct ieee80211_hw *h
--
-- if (changed & IEEE80211_CONF_CHANGE_CHANNEL) {
-- logf1(L_DEBUG, "IEEE80211_CONF_CHANGE_CHANNEL,"
--+#if CONFIG_ACX_MAC80211_VERSION >= KERNEL_VERSION(3, 10, 0)
--+ "channel->hw_value=%i\n", conf->chandef.chan->hw_value);
--+
--+ acx_set_channel(adev, conf->chandef.chan->hw_value,
--+ conf->chandef.chan->center_freq);
--+#else
-- "channel->hw_value=%i\n", conf->channel->hw_value);
--
-- acx_set_channel(adev, conf->channel->hw_value,
-- conf->channel->center_freq);
--+#endif
--
-- changed_not_done &= ~IEEE80211_CONF_CHANGE_CHANNEL;
-- }
-diff --git a/package/kernel/acx-mac80211/patches/004-Fix-3.14-build.patch b/package/kernel/acx-mac80211/patches/004-Fix-3.14-build.patch
-deleted file mode 100644
-index 847b5731598caee82179813fcc9dea2d75ffdebd..0000000000000000000000000000000000000000
---- a/package/kernel/acx-mac80211/patches/004-Fix-3.14-build.patch
-+++ /dev/null
-@@ -1,22 +0,0 @@
--From d17fcac710e629463591f6bd09d76b66ec591583 Mon Sep 17 00:00:00 2001
--From: Hauke Mehrtens <hauke@hauke-m.de>
--Date: Wed, 5 Feb 2014 20:57:07 +0100
--Subject: [PATCH] Fix 3.14 build
--
--Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
-----
-- main.c | 2 ++
-- 1 file changed, 2 insertions(+)
--
----- a/main.c
--+++ b/main.c
--@@ -500,7 +500,9 @@ int acx_init_ieee80211(acx_device_t *ade
-- hw->flags &= ~IEEE80211_HW_RX_INCLUDES_FCS;
-- hw->queues = 1;
-- hw->wiphy->max_scan_ssids = 1;
--+#if CONFIG_ACX_MAC80211_VERSION < KERNEL_VERSION(3, 14, 0)
-- hw->channel_change_time = 10000;
--+#endif
--
-- /* OW TODO Check if RTS/CTS threshold can be included here */
--
-diff --git a/package/kernel/acx-mac80211/patches/300-api_sync.patch b/package/kernel/acx-mac80211/patches/300-api_sync.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..94d61351aaaa530cc881448679219b28ab51888c
---- /dev/null
-+++ b/package/kernel/acx-mac80211/patches/300-api_sync.patch
-@@ -0,0 +1,83 @@
-+--- a/main.c
-++++ b/main.c
-+@@ -497,7 +497,7 @@ int acx_free_mechanics(acx_device_t *ade
-+
-+ 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,14 +525,14 @@ int acx_init_ieee80211(acx_device_t *ade
-+ /* 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)) {
-+- adev->hw->wiphy->bands[IEEE80211_BAND_2GHZ] =
-++ adev->hw->wiphy->bands[NL80211_BAND_2GHZ] =
-+ &acx100_band_2GHz;
-+ } else if (IS_ACX111(adev))
-+- adev->hw->wiphy->bands[IEEE80211_BAND_2GHZ] =
-++ adev->hw->wiphy->bands[NL80211_BAND_2GHZ] =
-+ &acx111_band_2GHz;
-+ else {
-+ log(L_ANY, "Error: Unknown device");
-+@@ -945,8 +945,8 @@ void acx_op_configure_filter(struct ieee
-+ 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,
-+ }
-+
-+ 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 *
-+ 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;
-+--- a/main.h
-++++ b/main.h
-+@@ -62,7 +62,7 @@ void acx_op_tx(struct ieee80211_hw *hw,
-+ #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);
-+
-+--- a/cardsetting.c
-++++ b/cardsetting.c
-+@@ -159,7 +159,7 @@ int acx_set_channel(acx_device_t *adev,
-+ int res = 0;
-+
-+ adev->rx_status.freq = freq;
-+- adev->rx_status.band = IEEE80211_BAND_2GHZ;
-++ adev->rx_status.band = NL80211_BAND_2GHZ;
-+
-+ adev->channel = channel;
-+
-diff --git a/package/kernel/ath10k-ct/Makefile b/package/kernel/ath10k-ct/Makefile
-new file mode 100644
-index 0000000000000000000000000000000000000000..bbff8d8042ade849e467196056ca4ae1828dc3fe
---- /dev/null
-+++ b/package/kernel/ath10k-ct/Makefile
-@@ -0,0 +1,80 @@
-+include $(TOPDIR)/rules.mk
-+
-+PKG_NAME:=ath10k-ct
-+PKG_VERSION:=2016-08-24
-+PKG_RELEASE=1
-+
-+PKG_LICENSE:=GPLv2
-+PKG_LICENSE_FILES:=
-+
-+PKG_SOURCE_URL:=https://github.com/greearb/ath10k-ct.git
-+PKG_SOURCE_PROTO:=git
-+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-+PKG_SOURCE_VERSION:=cd725d5465e1d4476a504794c541afeeba84b479
-+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
-+
-+PKG_MAINTAINER:=Ben Greear <greearb@candelatech.com>
-+PKG_BUILD_PARALLEL:=1
-+
-+STAMP_CONFIGURED_DEPENDS := $(STAGING_DIR)/usr/include/mac80211-backport/backport/autoconf.h
-+
-+include $(INCLUDE_DIR)/kernel.mk
-+include $(INCLUDE_DIR)/package.mk
-+
-+define KernelPackage/ath10k-ct
-+ SUBMENU:=Wireless Drivers
-+ TITLE:=ath10k-ct driver optimized for CT ath10k firmware
-+ DEPENDS:=+kmod-mac80211 +kmod-ath +@DRIVER_11N_SUPPORT @PCI_SUPPORT +@KERNEL_RELAY
-+ FILES:=\
-+ $(PKG_BUILD_DIR)/ath10k/ath10k_pci.ko \
-+ $(PKG_BUILD_DIR)/ath10k/ath10k_core.ko
-+ AUTOLOAD:=$(call AutoLoad,50,mac80211 ath ath10k_core ath10k_pci)
-+endef
-+
-+NOSTDINC_FLAGS = \
-+ -I$(PKG_BUILD_DIR) \
-+ -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 \
-+ -include backport/autoconf.h \
-+ -include backport/backport.h
-+
-+ifdef CONFIG_PACKAGE_MAC80211_MESH
-+ NOSTDINC_FLAGS += -DCONFIG_MAC80211_MESH
-+endif
-+
-+CT_MAKEDEFS += CONFIG_ATH10K=m CONFIG_ATH10K_PCI=m
-+# No AHB support enabled yet. Could conditionally enable it later.
-+#CT_MAKEDEFS += CONFIG_ATH10K_AHB=y
-+#NOSTDINC_FLAGS += -DCONFIG_ATH10K_AHB
-+NOSTDINC_FLAGS += -DSTANDALONE_CT
-+
-+ifdef CONFIG_PACKAGE_MAC80211_DEBUGFS
-+ CT_MAKEDEFS += CONFIG_ATH10K_DEBUGFS=y CONFIG_MAC80211_DEBUGFS=y
-+ NOSTDINC_FLAGS += -DCONFIG_MAC80211_DEBUGFS
-+ NOSTDINC_FLAGS += -DCONFIG_ATH10K_DEBUGFS
-+endif
-+
-+ifdef CONFIG_PACKAGE_ATH_DEBUG
-+ NOSTDINC_FLAGS += -DCONFIG_ATH10K_DEBUG
-+endif
-+
-+define Build/Configure
-+ cp $(STAGING_DIR)/usr/include/mac80211/ath/*.h $(PKG_BUILD_DIR)
-+endef
-+
-+ifneq ($(findstring c,$(OPENWRT_VERBOSE)),)
-+ CT_MAKEDEFS += V=1
-+endif
-+
-+define Build/Compile
-+ +$(MAKE) $(CT_MAKEDEFS) $(PKG_JOBS) -C "$(LINUX_DIR)" \
-+ ARCH="$(LINUX_KARCH)" \
-+ CROSS_COMPILE="$(TARGET_CROSS)" \
-+ SUBDIRS="$(PKG_BUILD_DIR)/ath10k" \
-+ NOSTDINC_FLAGS="$(NOSTDINC_FLAGS)" \
-+ modules
-+endef
-+
-+$(eval $(call KernelPackage,ath10k-ct))
-diff --git a/package/kernel/mac80211/Makefile b/package/kernel/mac80211/Makefile
-index 30da1cfe250fd9cd630bf04e0c68cd7382355a2a..f2839cde2b1514f4342989b72e0baf1d79fddab2 100644
---- a/package/kernel/mac80211/Makefile
-+++ b/package/kernel/mac80211/Makefile
-@@ -10,20 +10,21 @@ include $(INCLUDE_DIR)/kernel.mk
-
- PKG_NAME:=mac80211
-
--PKG_VERSION:=2016-01-10
-+PKG_VERSION:=2016-06-20
- PKG_RELEASE:=1
- PKG_SOURCE_URL:=http://mirror2.openwrt.org/sources
- PKG_BACKPORT_VERSION:=
--PKG_MD5SUM:=be5fae2e8d6f7490f9b073374fb895ba
-+PKG_MD5SUM:=29c79bdc3928ef5113b17042ebda9237
-
- PKG_SOURCE:=compat-wireless-$(PKG_VERSION)$(PKG_BACKPORT_VERSION).tar.bz2
- PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/compat-wireless-$(PKG_VERSION)
- PKG_BUILD_PARALLEL:=1
-
--PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
-+PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
-
- PKG_DRIVERS = \
- adm8211 \
-+ airo \
- ath ath5k ath9k ath9k-common ath9k-htc ath10k \
- b43 b43legacy \
- carl9170 \
-@@ -52,6 +53,7 @@ PKG_CONFIG_DEPENDS:= \
- $(patsubst %,CONFIG_PACKAGE_kmod-%,$(PKG_DRIVERS)) \
- CONFIG_PACKAGE_MAC80211_DEBUGFS \
- CONFIG_PACKAGE_MAC80211_MESH \
-+ CONFIG_PACKAGE_MAC80211_TRACING \
- CONFIG_PACKAGE_ATH_DEBUG \
- CONFIG_PACKAGE_ATH_DFS \
- CONFIG_PACKAGE_B43_DEBUG \
-@@ -63,7 +65,12 @@ PKG_CONFIG_DEPENDS:= \
- CONFIG_PACKAGE_B43_BUSES_BCMA_AND_SSB \
- CONFIG_PACKAGE_B43_BUSES_BCMA \
- CONFIG_PACKAGE_B43_BUSES_SSB \
-+ CONFIG_PACKAGE_BRCM80211_DEBUG \
-+ CONFIG_PACKAGE_IWLWIFI_DEBUG \
-+ CONFIG_PACKAGE_IWLWIFI_DEBUGFS \
- CONFIG_PACKAGE_RTLWIFI_DEBUG \
-+ CONFIG_ATH9K_SUPPORT_PCOEM \
-+ CONFIG_ATH9K_TX99 \
- CONFIG_ATH_USER_REGD \
-
- include $(INCLUDE_DIR)/package.mk
-@@ -73,7 +80,7 @@ WMENU:=Wireless Drivers
- define KernelPackage/mac80211/Default
- SUBMENU:=$(WMENU)
- URL:=https://wireless.wiki.kernel.org/
-- MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
-+ MAINTAINER:=Felix Fietkau <nbd@nbd.name>
- endef
-
- define KernelPackage/cfg80211
-@@ -92,7 +99,7 @@ endef
- define KernelPackage/mac80211
- $(call KernelPackage/mac80211/Default)
- TITLE:=Linux 802.11 Wireless Networking Stack
-- DEPENDS+= +kmod-cfg80211 +hostapd-common +kmod-crypto-core +kmod-crypto-arc4
-+ DEPENDS+= +kmod-cfg80211 +hostapd-common
- KCONFIG:=\
- CONFIG_AVERAGE=y
- FILES:= $(PKG_BUILD_DIR)/net/mac80211/mac80211.ko
-@@ -138,10 +145,23 @@ define KernelPackage/adm8211
- AUTOLOAD:=$(call AutoProbe,adm8211)
- endef
-
-+define KernelPackage/airo
-+ $(call KernelPackage/mac80211/Default)
-+ TITLE:=Cisco Aironet driver
-+ DEPENDS+=@PCI_SUPPORT +@DRIVER_WEXT_SUPPORT +kmod-cfg80211 @TARGET_x86
-+ FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/cisco/airo.ko
-+ AUTOLOAD:=$(call AutoProbe,airo)
-+endef
-+
-+define KernelPackage/airo/description
-+ Kernel support for Cisco Aironet cards
-+endef
-+
- define KernelPackage/ath/config
- if PACKAGE_kmod-ath
- config ATH_USER_REGD
- bool "Force Atheros drivers to respect the user's regdomain settings"
-+ default y
- help
- Atheros' idea of regulatory handling is that the EEPROM of the card defines
- the regulatory limits and the user is only allowed to restrict the settings
-@@ -199,6 +219,7 @@ define KernelPackage/ath9k-common
- $(call KernelPackage/mac80211/Default)
- TITLE:=Atheros 802.11n wireless devices (common code for ath9k and ath9k_htc)
- URL:=https://wireless.wiki.kernel.org/en/users/drivers/ath9k
-+ HIDDEN:=1
- DEPENDS+= @PCI_SUPPORT||USB_SUPPORT||TARGET_ar71xx +kmod-ath +@DRIVER_11N_SUPPORT +@DRIVER_11W_SUPPORT +@KERNEL_RELAY
- FILES:= \
- $(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath9k/ath9k_common.ko \
-@@ -226,6 +247,10 @@ define KernelPackage/ath9k/config
- bool "Support chips used in PC OEM cards"
- depends on PACKAGE_kmod-ath9k
-
-+ config ATH9K_TX99
-+ bool "Enable TX99 support"
-+ depends on PACKAGE_kmod-ath9k
-+
- endef
-
- define KernelPackage/ath9k-htc
-@@ -247,7 +272,7 @@ define KernelPackage/ath10k
- $(call KernelPackage/mac80211/Default)
- TITLE:=Atheros 802.11ac wireless cards support
- URL:=https://wireless.wiki.kernel.org/en/users/Drivers/ath10k
-- DEPENDS+= @PCI_SUPPORT +kmod-ath +@DRIVER_11N_SUPPORT +@DRIVER_11W_SUPPORT +@KERNEL_RELAY +ath10k-firmware-qca988x
-+ DEPENDS+= @PCI_SUPPORT +kmod-ath +@DRIVER_11N_SUPPORT +@DRIVER_11W_SUPPORT +@KERNEL_RELAY
- FILES:= \
- $(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath10k/ath10k_core.ko \
- $(PKG_BUILD_DIR)/drivers/net/wireless/ath/ath10k/ath10k_pci.ko
-@@ -673,6 +698,7 @@ define KernelPackage/brcmfmac/config
-
- config BRCMFMAC_SDIO
- bool "Enable SDIO bus interface support"
-+ default y if TARGET_brcm2708
- default n
- help
- Enable support for cards attached to an SDIO bus.
-@@ -761,7 +787,7 @@ endef
-
- define KernelPackage/iwlwifi
- $(call KernelPackage/mac80211/Default)
-- DEPENDS:= +kmod-mac80211 @PCI_SUPPORT +@DRIVER_11N_SUPPORT +iwlwifi-firmware
-+ DEPENDS:= +kmod-mac80211 @PCI_SUPPORT +@DRIVER_11N_SUPPORT +iwlwifi-firmware @!LINUX_3_18
- TITLE:=Intel AGN Wireless support
- FILES:= \
- $(PKG_BUILD_DIR)/drivers/net/wireless/intel/iwlwifi/iwlwifi.ko \
-@@ -870,7 +896,7 @@ endef
- define KernelPackage/lib80211
- $(call KernelPackage/mac80211/Default)
- TITLE:=802.11 Networking stack
-- DEPENDS:=+kmod-cfg80211
-+ DEPENDS:=+kmod-cfg80211 +kmod-crypto-hash
- FILES:= \
- $(PKG_BUILD_DIR)/net/wireless/lib80211.ko \
- $(PKG_BUILD_DIR)/net/wireless/lib80211_crypt_wep.ko \
-@@ -897,7 +923,7 @@ endef
- define KernelPackage/libipw
- $(call KernelPackage/mac80211/Default)
- TITLE:=libipw for ipw2100 and ipw2200
-- DEPENDS:=@PCI_SUPPORT +kmod-crypto-michael-mic +kmod-crypto-core +kmod-crypto-arc4 +kmod-lib80211 +kmod-cfg80211 +@DRIVER_WEXT_SUPPORT @!BIG_ENDIAN
-+ DEPENDS:=@PCI_SUPPORT +kmod-crypto-michael-mic +kmod-lib80211 +kmod-cfg80211 +@DRIVER_WEXT_SUPPORT @!BIG_ENDIAN
- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/intel/ipw2x00/libipw.ko
- AUTOLOAD:=$(call AutoProbe,libipw)
- endef
-@@ -978,7 +1004,7 @@ endef
- define KernelPackage/libertas-spi
- $(call KernelPackage/mac80211/Default)
- SUBMENU:=Wireless Drivers
-- DEPENDS+= +kmod-cfg80211 +kmod-lib80211 +@DRIVER_WEXT_SUPPORT +libertas-spi-firmware
-+ DEPENDS+= +kmod-cfg80211 +kmod-lib80211 +@DRIVER_WEXT_SUPPORT @!TARGET_uml +libertas-spi-firmware
- KCONFIG := \
- CONFIG_SPI=y \
- CONFIG_SPI_MASTER=y
-@@ -1036,33 +1062,6 @@ define KernelPackage/mwifiex-pcie/description
- Kernel modules for Marvell 802.11n/802.11ac PCIe Wireless cards
- endef
-
--
--# Prism54 drivers
--P54PCIFW:=2.13.12.0.arm
--P54USBFW:=2.13.24.0.lm87.arm
--P54SPIFW:=2.13.0.0.a.13.14.arm
--
--define Download/p54usb
-- FILE:=$(P54USBFW)
-- URL:=http://daemonizer.de/prism54/prism54-fw/fw-usb
-- MD5SUM:=8e8ab005a4f8f0123bcdc51bc25b47f6
--endef
--$(eval $(call Download,p54usb))
--
--define Download/p54pci
-- FILE:=$(P54PCIFW)
-- URL:=http://daemonizer.de/prism54/prism54-fw/fw-softmac
-- MD5SUM:=ff7536af2092b1c4b21315bd103ef4c4
--endef
--$(eval $(call Download,p54pci))
--
--define Download/p54spi
-- FILE:=$(P54SPIFW)
-- URL:=http://daemonizer.de/prism54/prism54-fw/stlc4560
-- MD5SUM:=42661f8ecbadd88012807493f596081d
--endef
--$(eval $(call Download,p54spi))
--
- define KernelPackage/p54/Default
- $(call KernelPackage/mac80211/Default)
- TITLE:=Prism54 Drivers
-@@ -1082,7 +1081,7 @@ endef
- define KernelPackage/p54-pci
- $(call KernelPackage/p54/Default)
- TITLE+= (PCI)
-- DEPENDS+= @PCI_SUPPORT +kmod-p54-common
-+ DEPENDS+= @PCI_SUPPORT +kmod-p54-common +p54-pci-firmware
- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/intersil/p54/p54pci.ko
- AUTOLOAD:=$(call AutoProbe,p54pci)
- endef
-@@ -1090,7 +1089,7 @@ endef
- define KernelPackage/p54-usb
- $(call KernelPackage/p54/Default)
- TITLE+= (USB)
-- DEPENDS+= @USB_SUPPORT +kmod-usb-core +kmod-p54-common
-+ DEPENDS+= @USB_SUPPORT +kmod-usb-core +kmod-p54-common +p54-usb-firmware
- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/intersil/p54/p54usb.ko
- AUTOLOAD:=$(call AutoProbe,p54usb)
- endef
-@@ -1098,7 +1097,7 @@ endef
- define KernelPackage/p54-spi
- $(call KernelPackage/p54/Default)
- TITLE+= (SPI)
-- DEPENDS+= @TARGET_omap24xx +kmod-p54-common
-+ DEPENDS+= @TARGET_omap24xx +kmod-p54-common +p54-spi-firmware
- FILES:=$(PKG_BUILD_DIR)/drivers/net/wireless/intersil/p54/p54spi.ko
- AUTOLOAD:=$(call AutoProbe,p54spi)
- endef
-@@ -1453,6 +1452,7 @@ config-y:= \
- WLAN_VENDOR_ATH \
- WLAN_VENDOR_ATMEL \
- WLAN_VENDOR_BROADCOM \
-+ WLAN_VENDOR_CISCO \
- WLAN_VENDOR_INTEL \
- WLAN_VENDOR_INTERSIL \
- WLAN_VENDOR_MARVELL \
-@@ -1491,6 +1491,8 @@ endif
-
- config-$(call config_package,lib80211) += LIB80211 LIB80211_CRYPT_WEP LIB80211_CRYPT_CCMP LIB80211_CRYPT_TKIP
-
-+config-$(call config_package,airo) += AIRO
-+
- config-$(call config_package,ath) += ATH_CARDS ATH_COMMON
- config-$(CONFIG_PACKAGE_ATH_DEBUG) += ATH_DEBUG ATH10K_DEBUG
- config-$(CONFIG_PACKAGE_ATH_DFS) += ATH9K_DFS_CERTIFIED ATH10K_DFS_CERTIFIED
-@@ -1501,6 +1503,7 @@ config-$(CONFIG_TARGET_ar71xx) += ATH9K_AHB
- config-$(CONFIG_PCI) += ATH9K_PCI
- config-$(CONFIG_ATH_USER_REGD) += ATH_USER_REGD
- config-$(CONFIG_ATH9K_SUPPORT_PCOEM) += ATH9K_PCOEM
-+config-$(CONFIG_ATH9K_TX99) += ATH9K_TX99
-
- config-$(call config_package,ath9k-htc) += ATH9K_HTC
- config-$(call config_package,ath10k) += ATH10K ATH10K_PCI
-@@ -1742,21 +1745,6 @@ define KernelPackage/ipw2200/install
- $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(IPW2200_NAME)-$(IPW2200_VERSION)/ipw2200*.fw $(1)/lib/firmware
- endef
-
--define KernelPackage/p54-pci/install
-- $(INSTALL_DIR) $(1)/lib/firmware
-- $(INSTALL_DATA) $(DL_DIR)/$(P54PCIFW) $(1)/lib/firmware/isl3886pci
--endef
--
--define KernelPackage/p54-usb/install
-- $(INSTALL_DIR) $(1)/lib/firmware
-- $(INSTALL_DATA) $(DL_DIR)/$(P54USBFW) $(1)/lib/firmware/isl3887usb
--endef
--
--define KernelPackage/p54-spi/install
-- $(INSTALL_DIR) $(1)/lib/firmware
-- $(INSTALL_DATA) $(DL_DIR)/$(P54SPIFW) $(1)/lib/firmware/3826.arm
--endef
--
- define KernelPackage/zd1211rw/install
- $(INSTALL_DIR) $(1)/lib/firmware/zd1211
- $(INSTALL_DATA) $(PKG_BUILD_DIR)/$(ZD1211FW_NAME)/zd1211* $(1)/lib/firmware/zd1211
-@@ -1764,6 +1752,7 @@ endef
-
-
- $(eval $(call KernelPackage,adm8211))
-+$(eval $(call KernelPackage,airo))
- $(eval $(call KernelPackage,ath))
- $(eval $(call KernelPackage,ath10k))
- $(eval $(call KernelPackage,ath5k))
-diff --git a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
-index fb2f928751a8c7dd282022d64be784cfcca4663b..e3d612e4b2f3d6dc1345bf71311fd31ee3649f1e 100644
---- a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
-+++ b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh
-@@ -23,6 +23,7 @@ drv_mac80211_init_device_config() {
- config_add_int rxantenna txantenna antenna_gain txpower distance
- config_add_boolean noscan ht_coex
- config_add_array ht_capab
-+ config_add_array channels
- config_add_boolean \
- rxldpc \
- short_gi_80 \
-@@ -89,6 +90,7 @@ mac80211_hostapd_setup_base() {
- json_select config
-
- [ "$auto_channel" -gt 0 ] && channel=acs_survey
-+ [ "$auto_channel" -gt 0 ] && json_get_values channel_list channels
-
- json_get_vars noscan ht_coex
- json_get_values ht_capab_list ht_capab
-@@ -218,7 +220,6 @@ mac80211_hostapd_setup_base() {
- vht_max_a_mpdu_len_exp:7 \
- vht_max_mpdu:11454 \
- rx_stbc:4 \
-- tx_stbc:4 \
- vht_link_adapt:3 \
- vht160:2
-
-@@ -230,13 +231,13 @@ mac80211_hostapd_setup_base() {
-
- cap_rx_stbc=$((($vht_cap >> 8) & 7))
- [ "$rx_stbc" -lt "$cap_rx_stbc" ] && cap_rx_stbc="$rx_stbc"
-- ht_cap_mask="$(( ($vht_cap & ~(0x700)) | ($cap_rx_stbc << 8) ))"
-+ vht_cap="$(( ($vht_cap & ~(0x700)) | ($cap_rx_stbc << 8) ))"
-
- mac80211_add_capabilities vht_capab $vht_cap \
- RXLDPC:0x10::$rxldpc \
- SHORT-GI-80:0x20::$short_gi_80 \
- SHORT-GI-160:0x40::$short_gi_160 \
-- TX-STBC-2BY1:0x80::$tx_stbc \
-+ TX-STBC-2BY1:0x80::$tx_stbc_2by1 \
- SU-BEAMFORMER:0x800::$su_beamformer \
- SU-BEAMFORMEE:0x1000::$su_beamformee \
- MU-BEAMFORMER:0x80000::$mu_beamformer \
-@@ -245,10 +246,10 @@ mac80211_hostapd_setup_base() {
- HTC-VHT:0x400000::$htc_vht \
- RX-ANTENNA-PATTERN:0x10000000::$rx_antenna_pattern \
- TX-ANTENNA-PATTERN:0x20000000::$tx_antenna_pattern \
-- RX-STBC1:0x700:0x100:1 \
-- RX-STBC12:0x700:0x200:1 \
-- RX-STBC123:0x700:0x300:1 \
-- RX-STBC1234:0x700:0x400:1 \
-+ RX-STBC-1:0x700:0x100:1 \
-+ RX-STBC-12:0x700:0x200:1 \
-+ RX-STBC-123:0x700:0x300:1 \
-+ RX-STBC-1234:0x700:0x400:1 \
-
- # supported Channel widths
- vht160_hw=0
-@@ -301,6 +302,7 @@ mac80211_hostapd_setup_base() {
- hostapd_prepare_device_config "$hostapd_conf_file" nl80211
- cat >> "$hostapd_conf_file" <<EOF
- ${channel:+channel=$channel}
-+${channel_list:+chanlist=$channel_list}
- ${noscan:+noscan=$noscan}
- $base_cfg
-
-@@ -391,11 +393,10 @@ mac80211_generate_mac() {
- find_phy() {
- [ -n "$phy" -a -d /sys/class/ieee80211/$phy ] && return 0
- [ -n "$path" ] && {
-- for phy in /sys/devices/$path/ieee80211/phy*; do
-- [ -e "$phy" ] && {
-- phy="${phy##*/}"
-- return 0
-- }
-+ for phy in $(ls /sys/class/ieee80211 2>/dev/null); do
-+ case "$(readlink -f /sys/class/ieee80211/$phy/device)" in
-+ *$path) return 0;;
-+ esac
- done
- }
- [ -n "$macaddr" ] && {
-@@ -481,7 +482,7 @@ mac80211_prepare_vif() {
- # All interfaces must have unique mac addresses
- # which can either be explicitly set in the device
- # section, or automatically generated
-- ifconfig "$ifname" hw ether "$macaddr"
-+ ip link set dev "$ifname" address "$macaddr"
- fi
-
- json_select ..
-@@ -496,7 +497,7 @@ mac80211_setup_supplicant() {
- mac80211_setup_adhoc_htmode() {
- case "$htmode" in
- VHT20|HT20) ibss_htmode=HT20;;
-- HT40*|VHT40|VHT80|VHT160)
-+ HT40*|VHT40|VHT160)
- case "$hwmode" in
- a)
- case "$(( ($channel / 4) % 2 ))" in
-@@ -520,6 +521,9 @@ mac80211_setup_adhoc_htmode() {
- esac
- [ "$auto_channel" -gt 0 ] && ibss_htmode="HT40+"
- ;;
-+ VHT80)
-+ ibss_htmode="80MHZ"
-+ ;;
- NONE|NOHT)
- ibss_htmode="NOHT"
- ;;
-@@ -580,7 +584,7 @@ mac80211_setup_vif() {
- json_get_vars mode
- json_get_var vif_txpower txpower
-
-- ifconfig "$ifname" up || {
-+ ip link set dev "$ifname" up || {
- wireless_setup_vif_failed IFUP_ERROR
- json_select ..
- return
-@@ -643,7 +647,7 @@ mac80211_interface_cleanup() {
- local phy="$1"
-
- for wdev in $(list_phy_interfaces "$phy"); do
-- ifconfig "$wdev" down 2>/dev/null
-+ ip link set dev "$wdev" down 2>/dev/null
- iw dev "$wdev" del
- done
- }
-diff --git a/package/kernel/mac80211/files/lib/wifi/mac80211.sh b/package/kernel/mac80211/files/lib/wifi/mac80211.sh
-index ea229d6c03393d4673c733c99ead4c24ff92817d..06f3b8b449fbf482d42123fd3d21f8c5b0d315bf 100644
---- a/package/kernel/mac80211/files/lib/wifi/mac80211.sh
-+++ b/package/kernel/mac80211/files/lib/wifi/mac80211.sh
-@@ -9,11 +9,10 @@ lookup_phy() {
- local devpath
- config_get devpath "$device" path
- [ -n "$devpath" ] && {
-- for _phy in /sys/devices/$devpath/ieee80211/phy*; do
-- [ -e "$_phy" ] && {
-- phy="${_phy##*/}"
-- return
-- }
-+ for phy in $(ls /sys/class/ieee80211 2>/dev/null); do
-+ case "$(readlink -f /sys/class/ieee80211/$phy/device)" in
-+ *$devpath) return;;
-+ esac
- done
- }
-
-@@ -102,6 +101,9 @@ detect_mac80211() {
- fi
- if [ -n "$path" ]; then
- path="${path##/sys/devices/}"
-+ case "$path" in
-+ platform*/pci*) path="${path##platform/}";;
-+ esac
- dev_id=" option path '$path'"
- else
- dev_id=" option macaddr $(cat /sys/class/ieee80211/${dev}/macaddress)"
-diff --git a/package/kernel/mac80211/patches/004-backports-add-skb_free_frag.patch b/package/kernel/mac80211/patches/004-backports-add-skb_free_frag.patch
-deleted file mode 100644
-index 9adfd8f719805961fb06d4fc3bc104b668e4fd41..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/004-backports-add-skb_free_frag.patch
-+++ /dev/null
-@@ -1,21 +0,0 @@
--From: Felix Fietkau <nbd@openwrt.org>
--Date: Thu, 28 Jan 2016 15:16:35 +0100
--Subject: [PATCH] backports: add skb_free_frag()
--
--Signed-off-by: Felix Fietkau <nbd@openwrt.org>
-----
--
----- a/backport-include/linux/skbuff.h
--+++ b/backport-include/linux/skbuff.h
--@@ -300,4 +300,11 @@ int skb_ensure_writable(struct sk_buff *
--
-- #endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0) */
--
--+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,2,0)
--+static inline void skb_free_frag(void *data)
--+{
--+ put_page(virt_to_head_page(data));
--+}
--+#endif
--+
-- #endif /* __BACKPORT_SKBUFF_H */
-diff --git a/package/kernel/mac80211/patches/004-fix_duplicate_skcipher_backport.patch b/package/kernel/mac80211/patches/004-fix_duplicate_skcipher_backport.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..38b31795a4ee0f3c5f0ad4895554117a63c2f037
---- /dev/null
-+++ b/package/kernel/mac80211/patches/004-fix_duplicate_skcipher_backport.patch
-@@ -0,0 +1,11 @@
-+--- a/compat/Makefile
-++++ b/compat/Makefile
-+@@ -35,8 +35,6 @@ compat-$(CPTCFG_KERNEL_4_6) += backport-
-+
-+ compat-$(CPTCFG_BPAUTO_BUILD_CRYPTO_CCM) += crypto-ccm.o
-+ compat-$(CPTCFG_BPAUTO_CRYPTO_SKCIPHER) += crypto-skcipher.o
-+-skcipher-objs += crypto-skcipher.o
-+-obj-$(CPTCFG_BPAUTO_CRYPTO_SKCIPHER) += skcipher.o
-+ compat-$(CPTCFG_BPAUTO_BUILD_WANT_DEV_COREDUMP) += drivers-base-devcoredump.o
-+ compat-$(CPTCFG_BPAUTO_RHASHTABLE) += lib-rhashtable.o
-+ cordic-objs += lib-cordic.o
-diff --git a/package/kernel/mac80211/patches/005-backport_skb_get_hash_perturb.patch b/package/kernel/mac80211/patches/005-backport_skb_get_hash_perturb.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..29bccc1e995f910ff6d1aeaf0829e9bdfe4f72d7
---- /dev/null
-+++ b/package/kernel/mac80211/patches/005-backport_skb_get_hash_perturb.patch
-@@ -0,0 +1,22 @@
-+--- a/backport-include/linux/skbuff.h
-++++ b/backport-include/linux/skbuff.h
-+@@ -305,6 +305,19 @@ static inline void skb_free_frag(void *d
-+ {
-+ put_page(virt_to_head_page(data));
-+ }
-++
-++#include <net/flow_keys.h>
-++#include <linux/jhash.h>
-++
-++static inline u32 skb_get_hash_perturb(struct sk_buff *skb, u32 key)
-++{
-++ struct flow_keys keys;
-++
-++ skb_flow_dissect(skb, &keys);
-++ return jhash_3words((__force u32)keys.dst,
-++ (__force u32)keys.src ^ keys.ip_proto,
-++ (__force u32)keys.ports, key);
-++}
-+ #endif
-+
-+ #endif /* __BACKPORT_SKBUFF_H */
-diff --git a/package/kernel/mac80211/patches/005-backports-add-napi_alloc_frag.patch b/package/kernel/mac80211/patches/005-backports-add-napi_alloc_frag.patch
-deleted file mode 100644
-index 9b672a8d14ec4e27c7d14bd6018059520ae8296c..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/005-backports-add-napi_alloc_frag.patch
-+++ /dev/null
-@@ -1,20 +0,0 @@
--From: Felix Fietkau <nbd@openwrt.org>
--Date: Thu, 28 Jan 2016 15:19:22 +0100
--Subject: [PATCH] backports: add napi_alloc_frag
--
--Signed-off-by: Felix Fietkau <nbd@openwrt.org>
-----
--
----- a/backport-include/linux/netdevice.h
--+++ b/backport-include/linux/netdevice.h
--@@ -232,6 +232,10 @@ static inline void backport_unregister_n
-- #define unregister_netdevice_many LINUX_BACKPORT(unregister_netdevice_many)
-- #endif
--
--+#if LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0)
--+#define napi_alloc_frag netdev_alloc_frag
--+#endif
--+
-- /*
-- * Complicated way of saying: We only backport netdev_rss_key stuff on kernels
-- * that either already have net_get_random_once() (>= 3.13) or where we've been
-diff --git a/package/kernel/mac80211/patches/060-no_local_ssb_bcma.patch b/package/kernel/mac80211/patches/060-no_local_ssb_bcma.patch
-index fd1e1cff3020078b5529982d5868ec65b8b4c9da..8be5fa15e92b747bfeedb3360b62cb139ae5257a 100644
---- a/package/kernel/mac80211/patches/060-no_local_ssb_bcma.patch
-+++ b/package/kernel/mac80211/patches/060-no_local_ssb_bcma.patch
-@@ -1,6 +1,6 @@
- --- a/.local-symbols
- +++ b/.local-symbols
--@@ -476,44 +476,6 @@ USB_IPHETH=
-+@@ -481,45 +481,6 @@ USB_IPHETH=
- USB_SIERRA_NET=
- USB_VL600=
- USB_NET_CH9200=
-@@ -37,6 +37,7 @@
- -BCMA_DRIVER_PCI=
- -BCMA_DRIVER_PCI_HOSTMODE=
- -BCMA_DRIVER_MIPS=
-+-BCMA_PFLASH=
- -BCMA_SFLASH=
- -BCMA_NFLASH=
- -BCMA_DRIVER_GMAC_CMN=
-@@ -56,7 +57,7 @@
- return (bus->chipco.dev ? bus->chipco.dev : bus->pcicore.dev);
- #else
- return bus->chipco.dev;
--@@ -4903,7 +4903,7 @@ static int b43_wireless_core_init(struct
-+@@ -4883,7 +4883,7 @@ static int b43_wireless_core_init(struct
- }
- if (sprom->boardflags_lo & B43_BFL_XTAL_NOSLOW)
- hf |= B43_HF_DSCRQ; /* Disable slowclock requests from ucode. */
-diff --git a/package/kernel/mac80211/patches/080-disable_clk_backport.patch b/package/kernel/mac80211/patches/080-disable_clk_backport.patch
-deleted file mode 100644
-index 3765591ebb8c5863e552417c3fb36275c711b118..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/080-disable_clk_backport.patch
-+++ /dev/null
-@@ -1,20 +0,0 @@
----- a/compat/compat-3.6.c
--+++ b/compat/compat-3.6.c
--@@ -147,17 +147,3 @@ int sg_alloc_table_from_pages(struct sg_
-- return 0;
-- }
-- EXPORT_SYMBOL_GPL(sg_alloc_table_from_pages);
---
---/* whoopsie ! */
---#ifndef CONFIG_COMMON_CLK
---int clk_enable(struct clk *clk)
---{
--- return 0;
---}
---EXPORT_SYMBOL_GPL(clk_enable);
---
---void clk_disable(struct clk *clk)
---{
---}
---EXPORT_SYMBOL_GPL(clk_disable);
---#endif
-diff --git a/package/kernel/mac80211/patches/100-remove-cryptoapi-dependencies.patch b/package/kernel/mac80211/patches/100-remove-cryptoapi-dependencies.patch
-index 02f46c778d8cd704b96af062ea73c2cffbf2c19a..fbe22e51b71eb513e3612d021b7c8ab62415d583 100644
---- a/package/kernel/mac80211/patches/100-remove-cryptoapi-dependencies.patch
-+++ b/package/kernel/mac80211/patches/100-remove-cryptoapi-dependencies.patch
-@@ -309,7 +309,7 @@
- #endif /* AES_GMAC_H */
- --- a/net/mac80211/key.h
- +++ b/net/mac80211/key.h
--@@ -84,7 +84,7 @@ struct ieee80211_key {
-+@@ -88,7 +88,7 @@ struct ieee80211_key {
- * Management frames.
- */
- u8 rx_pn[IEEE80211_NUM_TIDS + 1][IEEE80211_CCMP_PN_LEN];
-@@ -320,7 +320,7 @@
- struct {
- --- a/net/mac80211/wpa.c
- +++ b/net/mac80211/wpa.c
--@@ -307,7 +307,8 @@ ieee80211_crypto_tkip_decrypt(struct iee
-+@@ -304,7 +304,8 @@ ieee80211_crypto_tkip_decrypt(struct iee
- }
-
-
-@@ -330,7 +330,7 @@
- {
- __le16 mask_fc;
- int a4_included, mgmt;
--@@ -337,14 +338,8 @@ static void ccmp_special_blocks(struct s
-+@@ -334,14 +335,8 @@ static void ccmp_special_blocks(struct s
- else
- qos_tid = 0;
-
-@@ -347,7 +347,7 @@
-
- /* Nonce: Nonce Flags | A2 | PN
- * Nonce Flags: Priority (b0..b3) | Management (b4) | Reserved (b5..b7)
--@@ -352,6 +347,8 @@ static void ccmp_special_blocks(struct s
-+@@ -349,6 +344,8 @@ static void ccmp_special_blocks(struct s
- b_0[1] = qos_tid | (mgmt << 4);
- memcpy(&b_0[2], hdr->addr2, ETH_ALEN);
- memcpy(&b_0[8], pn, IEEE80211_CCMP_PN_LEN);
-@@ -356,7 +356,7 @@
-
- /* AAD (extra authenticate-only data) / masked 802.11 header
- * FC | A1 | A2 | A3 | SC | [A4] | [QC] */
--@@ -463,7 +460,7 @@ static int ccmp_encrypt_skb(struct ieee8
-+@@ -460,7 +457,7 @@ static int ccmp_encrypt_skb(struct ieee8
- return 0;
-
- pos += IEEE80211_CCMP_HDR_LEN;
-@@ -365,7 +365,7 @@
- ieee80211_aes_ccm_encrypt(key->u.ccmp.tfm, b_0, aad, pos, len,
- skb_put(skb, mic_len), mic_len);
-
--@@ -534,7 +531,7 @@ ieee80211_crypto_ccmp_decrypt(struct iee
-+@@ -537,7 +534,7 @@ ieee80211_crypto_ccmp_decrypt(struct iee
- u8 aad[2 * AES_BLOCK_SIZE];
- u8 b_0[AES_BLOCK_SIZE];
- /* hardware didn't decrypt/verify MIC */
-diff --git a/package/kernel/mac80211/patches/110-mac80211_keep_keys_on_stop_ap.patch b/package/kernel/mac80211/patches/110-mac80211_keep_keys_on_stop_ap.patch
-index d1d9fbd9b157c5b888797ab650db04064dfa7d31..3ca166ff45552c1c544e301fd2833b06ffd9f8a1 100644
---- a/package/kernel/mac80211/patches/110-mac80211_keep_keys_on_stop_ap.patch
-+++ b/package/kernel/mac80211/patches/110-mac80211_keep_keys_on_stop_ap.patch
-@@ -2,7 +2,7 @@ Used for AP+STA support in OpenWrt - preserve AP mode keys across STA reconnects
-
- --- a/net/mac80211/cfg.c
- +++ b/net/mac80211/cfg.c
--@@ -846,7 +846,6 @@ static int ieee80211_stop_ap(struct wiph
-+@@ -850,7 +850,6 @@ static int ieee80211_stop_ap(struct wiph
- sdata->u.ap.driver_smps_mode = IEEE80211_SMPS_OFF;
-
- __sta_info_flush(sdata, true);
-diff --git a/package/kernel/mac80211/patches/150-disable_addr_notifier.patch b/package/kernel/mac80211/patches/150-disable_addr_notifier.patch
-index 2855a88af7b4017f8dfeebeb34ea430a0ad51914..16fab845356343480dd706bfe558a08420a6be90 100644
---- a/package/kernel/mac80211/patches/150-disable_addr_notifier.patch
-+++ b/package/kernel/mac80211/patches/150-disable_addr_notifier.patch
-@@ -18,9 +18,9 @@
- static int ieee80211_ifa6_changed(struct notifier_block *nb,
- unsigned long data, void *arg)
- {
--@@ -1087,14 +1087,14 @@ int ieee80211_register_hw(struct ieee802
--
-- rtnl_unlock();
-+@@ -1090,14 +1090,14 @@ int ieee80211_register_hw(struct ieee802
-+ if (result)
-+ goto fail_flows;
-
- -#ifdef CONFIG_INET
- +#ifdef __disabled__CONFIG_INET
-@@ -35,7 +35,7 @@
- local->ifa6_notifier.notifier_call = ieee80211_ifa6_changed;
- result = register_inet6addr_notifier(&local->ifa6_notifier);
- if (result)
--@@ -1103,13 +1103,13 @@ int ieee80211_register_hw(struct ieee802
-+@@ -1106,13 +1106,13 @@ int ieee80211_register_hw(struct ieee802
-
- return 0;
-
-@@ -51,8 +51,8 @@
- +#if defined(__disabled__CONFIG_INET) || defined(__disabled__CONFIG_IPV6)
- fail_ifa:
- #endif
-- rtnl_lock();
--@@ -1137,10 +1137,10 @@ void ieee80211_unregister_hw(struct ieee
-+ ieee80211_txq_teardown_flows(local);
-+@@ -1142,10 +1142,10 @@ void ieee80211_unregister_hw(struct ieee
- tasklet_kill(&local->tx_pending_tasklet);
- tasklet_kill(&local->tasklet);
-
-diff --git a/package/kernel/mac80211/patches/210-ap_scan.patch b/package/kernel/mac80211/patches/210-ap_scan.patch
-index a99cbd2bee913d292310e258c15c94050e90db71..29f05c44d6e205fe0a7f20009899f1de690ada5a 100644
---- a/package/kernel/mac80211/patches/210-ap_scan.patch
-+++ b/package/kernel/mac80211/patches/210-ap_scan.patch
-@@ -1,6 +1,6 @@
- --- a/net/mac80211/cfg.c
- +++ b/net/mac80211/cfg.c
--@@ -1999,7 +1999,7 @@ static int ieee80211_scan(struct wiphy *
-+@@ -2008,7 +2008,7 @@ static int ieee80211_scan(struct wiphy *
- * the frames sent while scanning on other channel will be
- * lost)
- */
-diff --git a/package/kernel/mac80211/patches/220-fq_disable_hack.patch b/package/kernel/mac80211/patches/220-fq_disable_hack.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..7f420beea56335d5043de6fd71b5febae3e9bd79
---- /dev/null
-+++ b/package/kernel/mac80211/patches/220-fq_disable_hack.patch
-@@ -0,0 +1,15 @@
-+mac80211 fq has been found to cause a regression in multi-stream TCP
-+performance. Disable it until the cause has been found and fixed
-+
-+--- a/include/net/fq_impl.h
-++++ b/include/net/fq_impl.h
-+@@ -104,6 +104,9 @@ static struct fq_flow *fq_flow_classify(
-+
-+ lockdep_assert_held(&fq->lock);
-+
-++ /* HACK: disable fq for now until TCP issues are fixed */
-++ return get_default_func(fq, tin, 0, skb);
-++
-+ hash = skb_get_hash_perturb(skb, fq->perturbation);
-+ idx = reciprocal_scale(hash, fq->flows_cnt);
-+ flow = &fq->flows[idx];
-diff --git a/package/kernel/mac80211/patches/300-ath9k-force-rx_clear-when-disabling-rx.patch b/package/kernel/mac80211/patches/300-ath9k-force-rx_clear-when-disabling-rx.patch
-index bddb15ad1a6bbcfcd0903c8b063c8289e5b6c43f..098bda7e93aa4453aa282eb170b2bc502bc85edd 100644
---- a/package/kernel/mac80211/patches/300-ath9k-force-rx_clear-when-disabling-rx.patch
-+++ b/package/kernel/mac80211/patches/300-ath9k-force-rx_clear-when-disabling-rx.patch
-@@ -3,15 +3,16 @@ Date: Sun, 7 Jun 2015 13:53:35 +0200
- Subject: [PATCH] ath9k: force rx_clear when disabling rx
-
- This makes stopping Rx more reliable and should reduce the frequency of
--Rx related DMA stop warnings
-+Rx related DMA stop warnings. Don't use rx_clear in TX99 mode.
-
- Cc: stable@vger.kernel.org
--Signed-off-by: Felix Fietkau <nbd@openwrt.org>
-+Signed-off-by: Felix Fietkau <nbd@nbd.name>
-+Signed-off-by: Helmut Schaa <helmut.schaa@googlemail.com>
- ---
-
- --- a/drivers/net/wireless/ath/ath9k/mac.c
- +++ b/drivers/net/wireless/ath/ath9k/mac.c
--@@ -677,13 +677,15 @@ void ath9k_hw_startpcureceive(struct ath
-+@@ -677,13 +677,18 @@ void ath9k_hw_startpcureceive(struct ath
-
- ath9k_ani_reset(ah, is_scanning);
-
-@@ -24,8 +25,11 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
- void ath9k_hw_abortpcurecv(struct ath_hw *ah)
- {
- - REG_SET_BIT(ah, AR_DIAG_SW, AR_DIAG_RX_ABORT | AR_DIAG_RX_DIS);
--+ REG_SET_BIT(ah, AR_DIAG_SW,
--+ AR_DIAG_RX_DIS | AR_DIAG_RX_ABORT | AR_DIAG_FORCE_RX_CLEAR);
-++ u32 reg = AR_DIAG_RX_DIS | AR_DIAG_RX_ABORT;
-++
-++ if (!config_enabled(CPTCFG_ATH9K_TX99))
-++ reg |= AR_DIAG_FORCE_RX_CLEAR;
-++ REG_SET_BIT(ah, AR_DIAG_SW, reg);
-
- ath9k_hw_disable_mib_counters(ah);
- }
-diff --git a/package/kernel/mac80211/patches/302-Revert-ath9k-interpret-requested-txpower-in-EIRP-dom.patch b/package/kernel/mac80211/patches/302-Revert-ath9k-interpret-requested-txpower-in-EIRP-dom.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..7caa9be5a8b963b6199bf1a29cc370899d30b291
---- /dev/null
-+++ b/package/kernel/mac80211/patches/302-Revert-ath9k-interpret-requested-txpower-in-EIRP-dom.patch
-@@ -0,0 +1,37 @@
-+From: Felix Fietkau <nbd@nbd.name>
-+Date: Sat, 14 May 2016 14:51:02 +0200
-+Subject: [PATCH] Revert "ath9k: interpret requested txpower in EIRP
-+ domain"
-+
-+This reverts commit 71f5137bf010c6faffab50c0ec15374c59c4a411.
-+---
-+
-+--- a/drivers/net/wireless/ath/ath9k/hw.c
-++++ b/drivers/net/wireless/ath/ath9k/hw.c
-+@@ -2914,7 +2914,8 @@ void ath9k_hw_apply_txpower(struct ath_h
-+ {
-+ struct ath_regulatory *reg = ath9k_hw_regulatory(ah);
-+ struct ieee80211_channel *channel;
-+- int chan_pwr, new_pwr;
-++ int chan_pwr, new_pwr, max_gain;
-++ int ant_gain, ant_reduction = 0;
-+
-+ if (!chan)
-+ return;
-+@@ -2922,10 +2923,15 @@ void ath9k_hw_apply_txpower(struct ath_h
-+ channel = chan->chan;
-+ chan_pwr = min_t(int, channel->max_power * 2, MAX_RATE_POWER);
-+ new_pwr = min_t(int, chan_pwr, reg->power_limit);
-++ max_gain = chan_pwr - new_pwr + channel->max_antenna_gain * 2;
-++
-++ ant_gain = get_antenna_gain(ah, chan);
-++ if (ant_gain > max_gain)
-++ ant_reduction = ant_gain - max_gain;
-+
-+ ah->eep_ops->set_txpower(ah, chan,
-+ ath9k_regd_get_ctl(reg, chan),
-+- get_antenna_gain(ah, chan), new_pwr, test);
-++ ant_reduction, new_pwr, test);
-+ }
-+
-+ void ath9k_hw_set_txpowerlimit(struct ath_hw *ah, u32 limit, bool test)
-diff --git a/package/kernel/mac80211/patches/302-ath9k_hw-add-low-power-tx-gain-table-for-AR953x.patch b/package/kernel/mac80211/patches/302-ath9k_hw-add-low-power-tx-gain-table-for-AR953x.patch
-deleted file mode 100644
-index 22b987aa7aaae92f889adc938ca88042d3edfdf6..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/302-ath9k_hw-add-low-power-tx-gain-table-for-AR953x.patch
-+++ /dev/null
-@@ -1,95 +0,0 @@
--From: Felix Fietkau <nbd@openwrt.org>
--Date: Thu, 14 Jan 2016 03:14:03 +0100
--Subject: [PATCH] ath9k_hw: add low power tx gain table for AR953x
--
--Used in some newer TP-Link AR9533 devices.
--
--Signed-off-by: Felix Fietkau <nbd@openwrt.org>
-----
--
----- a/drivers/net/wireless/ath/ath9k/ar9003_hw.c
--+++ b/drivers/net/wireless/ath/ath9k/ar9003_hw.c
--@@ -698,6 +698,9 @@ static void ar9003_tx_gain_table_mode2(s
-- else if (AR_SREV_9340(ah))
-- INIT_INI_ARRAY(&ah->iniModesTxGain,
-- ar9340Modes_low_ob_db_tx_gain_table_1p0);
--+ else if (AR_SREV_9531_11(ah))
--+ INIT_INI_ARRAY(&ah->iniModesTxGain,
--+ qca953x_1p1_modes_no_xpa_low_power_tx_gain_table);
-- else if (AR_SREV_9485_11_OR_LATER(ah))
-- INIT_INI_ARRAY(&ah->iniModesTxGain,
-- ar9485Modes_low_ob_db_tx_gain_1_1);
----- a/drivers/net/wireless/ath/ath9k/ar953x_initvals.h
--+++ b/drivers/net/wireless/ath/ath9k/ar953x_initvals.h
--@@ -757,6 +757,71 @@ static const u32 qca953x_1p1_modes_xpa_t
-- {0x00016448, 0x6c927a70},
-- };
--
--+static const u32 qca953x_1p1_modes_no_xpa_low_power_tx_gain_table[][2] = {
--+ /* Addr allmodes */
--+ {0x0000a2dc, 0xfff55592},
--+ {0x0000a2e0, 0xfff99924},
--+ {0x0000a2e4, 0xfffe1e00},
--+ {0x0000a2e8, 0xffffe000},
--+ {0x0000a410, 0x000050d6},
--+ {0x0000a500, 0x00000069},
--+ {0x0000a504, 0x0400006b},
--+ {0x0000a508, 0x0800006d},
--+ {0x0000a50c, 0x0c000269},
--+ {0x0000a510, 0x1000026b},
--+ {0x0000a514, 0x1400026d},
--+ {0x0000a518, 0x18000669},
--+ {0x0000a51c, 0x1c00066b},
--+ {0x0000a520, 0x1d000a68},
--+ {0x0000a524, 0x21000a6a},
--+ {0x0000a528, 0x25000a6c},
--+ {0x0000a52c, 0x29000a6e},
--+ {0x0000a530, 0x2d0012a9},
--+ {0x0000a534, 0x310012ab},
--+ {0x0000a538, 0x350012ad},
--+ {0x0000a53c, 0x39001b0a},
--+ {0x0000a540, 0x3d001b0c},
--+ {0x0000a544, 0x41001b0e},
--+ {0x0000a548, 0x43001bae},
--+ {0x0000a54c, 0x45001914},
--+ {0x0000a550, 0x47001916},
--+ {0x0000a554, 0x49001b96},
--+ {0x0000a558, 0x49001b96},
--+ {0x0000a55c, 0x49001b96},
--+ {0x0000a560, 0x49001b96},
--+ {0x0000a564, 0x49001b96},
--+ {0x0000a568, 0x49001b96},
--+ {0x0000a56c, 0x49001b96},
--+ {0x0000a570, 0x49001b96},
--+ {0x0000a574, 0x49001b96},
--+ {0x0000a578, 0x49001b96},
--+ {0x0000a57c, 0x49001b96},
--+ {0x0000a600, 0x00000000},
--+ {0x0000a604, 0x00000000},
--+ {0x0000a608, 0x00000000},
--+ {0x0000a60c, 0x00000000},
--+ {0x0000a610, 0x00000000},
--+ {0x0000a614, 0x00000000},
--+ {0x0000a618, 0x00804201},
--+ {0x0000a61c, 0x01408201},
--+ {0x0000a620, 0x01408502},
--+ {0x0000a624, 0x01408502},
--+ {0x0000a628, 0x01408502},
--+ {0x0000a62c, 0x01408502},
--+ {0x0000a630, 0x01408502},
--+ {0x0000a634, 0x01408502},
--+ {0x0000a638, 0x01408502},
--+ {0x0000a63c, 0x01408502},
--+ {0x0000b2dc, 0xfff55592},
--+ {0x0000b2e0, 0xfff99924},
--+ {0x0000b2e4, 0xfffe1e00},
--+ {0x0000b2e8, 0xffffe000},
--+ {0x00016044, 0x044922db},
--+ {0x00016048, 0x6c927a70},
--+ {0x00016444, 0x044922db},
--+ {0x00016448, 0x6c927a70},
--+};
--+
-- static const u32 qca953x_2p0_baseband_core[][2] = {
-- /* Addr allmodes */
-- {0x00009800, 0xafe68e30},
-diff --git a/package/kernel/mac80211/patches/303-ath10k-Ensure-txrx-compl-task-is-stopped-when-cleani.patch b/package/kernel/mac80211/patches/303-ath10k-Ensure-txrx-compl-task-is-stopped-when-cleani.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..73accd866b91e84bfc42684daa3804b0a3bbc563
---- /dev/null
-+++ b/package/kernel/mac80211/patches/303-ath10k-Ensure-txrx-compl-task-is-stopped-when-cleani.patch
-@@ -0,0 +1,21 @@
-+From: Ben Greear <greearb@candelatech.com>
-+Date: Fri, 1 Apr 2016 14:12:08 -0700
-+Subject: [PATCH] ath10k: Ensure txrx-compl-task is stopped when cleaning
-+ htt-tx.
-+
-+Otherwise, the txrx-compl-task may access some bad memory?
-+
-+Signed-off-by: Ben Greear <greearb@candelatech.com>
-+---
-+
-+--- a/drivers/net/wireless/ath/ath10k/htt_tx.c
-++++ b/drivers/net/wireless/ath/ath10k/htt_tx.c
-+@@ -388,6 +388,8 @@ void ath10k_htt_tx_free(struct ath10k_ht
-+ {
-+ int size;
-+
-++ tasklet_kill(&htt->txrx_compl_task);
-++
-+ idr_for_each(&htt->pending_tx, ath10k_htt_tx_clean_up_pending, htt->ar);
-+ idr_destroy(&htt->pending_tx);
-+
-diff --git a/package/kernel/mac80211/patches/303-rt2x00-fix-monitor-mode-regression.patch b/package/kernel/mac80211/patches/303-rt2x00-fix-monitor-mode-regression.patch
-deleted file mode 100644
-index 7bb74353eb128442bf26bc098d62a89c32cfc9d4..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/303-rt2x00-fix-monitor-mode-regression.patch
-+++ /dev/null
-@@ -1,156 +0,0 @@
--From: Eli Cooper <elicooper@gmx.com>
--Date: Thu, 14 Jan 2016 00:07:12 +0800
--Subject: [PATCH] rt2x00: fix monitor mode regression
--
--Since commit df1404650ccbfeb76a84f301f22316be0d00a864 monitor mode for rt2x00
--has been made effectively useless because the hardware filter is configured to
--drop packets whose intended recipient is not the device, regardless of the
--presence of monitor mode interfaces.
--
--This patch fixes this regression by adding explicit monitor mode support, and
--configuring the hardware filter accordingly.
--
--Signed-off-by: Eli Cooper <elicooper@gmx.com>
-----
--
----- a/drivers/net/wireless/ralink/rt2x00/rt2400pci.c
--+++ b/drivers/net/wireless/ralink/rt2x00/rt2400pci.c
--@@ -273,8 +273,10 @@ static void rt2400pci_config_filter(stru
-- !(filter_flags & FIF_PLCPFAIL));
-- rt2x00_set_field32(®, RXCSR0_DROP_CONTROL,
-- !(filter_flags & FIF_CONTROL));
--- rt2x00_set_field32(®, RXCSR0_DROP_NOT_TO_ME, 1);
--+ rt2x00_set_field32(®, RXCSR0_DROP_NOT_TO_ME,
--+ !rt2x00dev->is_monitoring);
-- rt2x00_set_field32(®, RXCSR0_DROP_TODS,
--+ !rt2x00dev->is_monitoring &&
-- !rt2x00dev->intf_ap_count);
-- rt2x00_set_field32(®, RXCSR0_DROP_VERSION_ERROR, 1);
-- rt2x00mmio_register_write(rt2x00dev, RXCSR0, reg);
----- a/drivers/net/wireless/ralink/rt2x00/rt2500pci.c
--+++ b/drivers/net/wireless/ralink/rt2x00/rt2500pci.c
--@@ -274,8 +274,10 @@ static void rt2500pci_config_filter(stru
-- !(filter_flags & FIF_PLCPFAIL));
-- rt2x00_set_field32(®, RXCSR0_DROP_CONTROL,
-- !(filter_flags & FIF_CONTROL));
--- rt2x00_set_field32(®, RXCSR0_DROP_NOT_TO_ME, 1);
--+ rt2x00_set_field32(®, RXCSR0_DROP_NOT_TO_ME,
--+ !rt2x00dev->is_monitoring);
-- rt2x00_set_field32(®, RXCSR0_DROP_TODS,
--+ !rt2x00dev->is_monitoring &&
-- !rt2x00dev->intf_ap_count);
-- rt2x00_set_field32(®, RXCSR0_DROP_VERSION_ERROR, 1);
-- rt2x00_set_field32(®, RXCSR0_DROP_MCAST,
----- a/drivers/net/wireless/ralink/rt2x00/rt2500usb.c
--+++ b/drivers/net/wireless/ralink/rt2x00/rt2500usb.c
--@@ -437,8 +437,10 @@ static void rt2500usb_config_filter(stru
-- !(filter_flags & FIF_PLCPFAIL));
-- rt2x00_set_field16(®, TXRX_CSR2_DROP_CONTROL,
-- !(filter_flags & FIF_CONTROL));
--- rt2x00_set_field16(®, TXRX_CSR2_DROP_NOT_TO_ME, 1);
--+ rt2x00_set_field16(®, TXRX_CSR2_DROP_NOT_TO_ME,
--+ !rt2x00dev->is_monitoring);
-- rt2x00_set_field16(®, TXRX_CSR2_DROP_TODS,
--+ !rt2x00dev->is_monitoring &&
-- !rt2x00dev->intf_ap_count);
-- rt2x00_set_field16(®, TXRX_CSR2_DROP_VERSION_ERROR, 1);
-- rt2x00_set_field16(®, TXRX_CSR2_DROP_MULTICAST,
----- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
--+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
--@@ -1490,7 +1490,8 @@ void rt2800_config_filter(struct rt2x00_
-- !(filter_flags & FIF_FCSFAIL));
-- rt2x00_set_field32(®, RX_FILTER_CFG_DROP_PHY_ERROR,
-- !(filter_flags & FIF_PLCPFAIL));
--- rt2x00_set_field32(®, RX_FILTER_CFG_DROP_NOT_TO_ME, 1);
--+ rt2x00_set_field32(®, RX_FILTER_CFG_DROP_NOT_TO_ME,
--+ !rt2x00dev->is_monitoring);
-- rt2x00_set_field32(®, RX_FILTER_CFG_DROP_NOT_MY_BSSD, 0);
-- rt2x00_set_field32(®, RX_FILTER_CFG_DROP_VER_ERROR, 1);
-- rt2x00_set_field32(®, RX_FILTER_CFG_DROP_MULTICAST,
----- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h
--+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h
--@@ -844,11 +844,13 @@ struct rt2x00_dev {
-- * - Open sta interface count.
-- * - Association count.
-- * - Beaconing enabled count.
--+ * - Whether the device is monitoring.
-- */
-- unsigned int intf_ap_count;
-- unsigned int intf_sta_count;
-- unsigned int intf_associated;
-- unsigned int intf_beaconing;
--+ bool is_monitoring;
--
-- /*
-- * Interface combinations
----- a/drivers/net/wireless/ralink/rt2x00/rt2x00config.c
--+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00config.c
--@@ -244,6 +244,16 @@ void rt2x00lib_config(struct rt2x00_dev
-- (ieee80211_flags & IEEE80211_CONF_CHANGE_PS))
-- cancel_delayed_work_sync(&rt2x00dev->autowakeup_work);
--
--+ if (ieee80211_flags & IEEE80211_CONF_CHANGE_MONITOR) {
--+ if (conf->flags & IEEE80211_CONF_MONITOR) {
--+ rt2x00_dbg(rt2x00dev, "Monitor mode is enabled\n");
--+ rt2x00dev->is_monitoring = true;
--+ } else {
--+ rt2x00_dbg(rt2x00dev, "Monitor mode is disabled\n");
--+ rt2x00dev->is_monitoring = false;
--+ }
--+ }
--+
-- /*
-- * Start configuration.
-- */
----- a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
--+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
--@@ -1204,6 +1204,7 @@ int rt2x00lib_start(struct rt2x00_dev *r
-- rt2x00dev->intf_ap_count = 0;
-- rt2x00dev->intf_sta_count = 0;
-- rt2x00dev->intf_associated = 0;
--+ rt2x00dev->is_monitoring = false;
--
-- /* Enable the radio */
-- retval = rt2x00lib_enable_radio(rt2x00dev);
----- a/drivers/net/wireless/ralink/rt2x00/rt2x00mac.c
--+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00mac.c
--@@ -385,11 +385,6 @@ void rt2x00mac_configure_filter(struct i
-- *total_flags |= FIF_PSPOLL;
-- }
--
--- /*
--- * Check if there is any work left for us.
--- */
--- if (rt2x00dev->packet_filter == *total_flags)
--- return;
-- rt2x00dev->packet_filter = *total_flags;
--
-- rt2x00dev->ops->lib->config_filter(rt2x00dev, *total_flags);
----- a/drivers/net/wireless/ralink/rt2x00/rt61pci.c
--+++ b/drivers/net/wireless/ralink/rt2x00/rt61pci.c
--@@ -530,8 +530,10 @@ static void rt61pci_config_filter(struct
-- !(filter_flags & FIF_PLCPFAIL));
-- rt2x00_set_field32(®, TXRX_CSR0_DROP_CONTROL,
-- !(filter_flags & (FIF_CONTROL | FIF_PSPOLL)));
--- rt2x00_set_field32(®, TXRX_CSR0_DROP_NOT_TO_ME, 1);
--+ rt2x00_set_field32(®, TXRX_CSR0_DROP_NOT_TO_ME,
--+ !rt2x00dev->is_monitoring);
-- rt2x00_set_field32(®, TXRX_CSR0_DROP_TO_DS,
--+ !rt2x00dev->is_monitoring &&
-- !rt2x00dev->intf_ap_count);
-- rt2x00_set_field32(®, TXRX_CSR0_DROP_VERSION_ERROR, 1);
-- rt2x00_set_field32(®, TXRX_CSR0_DROP_MULTICAST,
----- a/drivers/net/wireless/ralink/rt2x00/rt73usb.c
--+++ b/drivers/net/wireless/ralink/rt2x00/rt73usb.c
--@@ -480,8 +480,10 @@ static void rt73usb_config_filter(struct
-- !(filter_flags & FIF_PLCPFAIL));
-- rt2x00_set_field32(®, TXRX_CSR0_DROP_CONTROL,
-- !(filter_flags & (FIF_CONTROL | FIF_PSPOLL)));
--- rt2x00_set_field32(®, TXRX_CSR0_DROP_NOT_TO_ME, 1);
--+ rt2x00_set_field32(®, TXRX_CSR0_DROP_NOT_TO_ME,
--+ !rt2x00dev->is_monitoring);
-- rt2x00_set_field32(®, TXRX_CSR0_DROP_TO_DS,
--+ !rt2x00dev->is_monitoring &&
-- !rt2x00dev->intf_ap_count);
-- rt2x00_set_field32(®, TXRX_CSR0_DROP_VERSION_ERROR, 1);
-- rt2x00_set_field32(®, TXRX_CSR0_DROP_MULTICAST,
-diff --git a/package/kernel/mac80211/patches/304-ath10k-Ensure-peer_map-references-are-cleaned-up.patch b/package/kernel/mac80211/patches/304-ath10k-Ensure-peer_map-references-are-cleaned-up.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..7dec1fb55ab64fed606c9162d39f90902a20d4e0
---- /dev/null
-+++ b/package/kernel/mac80211/patches/304-ath10k-Ensure-peer_map-references-are-cleaned-up.patch
-@@ -0,0 +1,60 @@
-+From: Ben Greear <greearb@candelatech.com>
-+Date: Fri, 1 Apr 2016 14:12:09 -0700
-+Subject: [PATCH] ath10k: Ensure peer_map references are cleaned up.
-+
-+While debugging OS crashes due to firmware crashes, I enabled
-+kasan, and it noticed that peer objects were being used-after-freed.
-+
-+Looks like there are two places we could be leaving stale references
-+in the peer-map, so clean that up.
-+
-+Signed-off-by: Ben Greear <greearb@candelatech.com>
-+---
-+
-+--- a/drivers/net/wireless/ath/ath10k/mac.c
-++++ b/drivers/net/wireless/ath/ath10k/mac.c
-+@@ -802,6 +802,7 @@ static void ath10k_peer_cleanup(struct a
-+ {
-+ struct ath10k_peer *peer, *tmp;
-+ int peer_id;
-++ int i;
-+
-+ lockdep_assert_held(&ar->conf_mutex);
-+
-+@@ -818,6 +819,17 @@ static void ath10k_peer_cleanup(struct a
-+ ar->peer_map[peer_id] = NULL;
-+ }
-+
-++ /* Double check that peer is properly un-referenced from
-++ * the peer_map
-++ */
-++ for (i = 0; i < ARRAY_SIZE(ar->peer_map); i++) {
-++ if (ar->peer_map[i] == peer) {
-++ ath10k_warn(ar, "removing stale peer_map entry for %pM (ptr %p idx %d)\n",
-++ peer->addr, peer, i);
-++ ar->peer_map[i] = NULL;
-++ }
-++ }
-++
-+ list_del(&peer->list);
-+ kfree(peer);
-+ ar->num_peers--;
-+@@ -828,6 +840,7 @@ static void ath10k_peer_cleanup(struct a
-+ static void ath10k_peer_cleanup_all(struct ath10k *ar)
-+ {
-+ struct ath10k_peer *peer, *tmp;
-++ int i;
-+
-+ lockdep_assert_held(&ar->conf_mutex);
-+
-+@@ -836,6 +849,10 @@ static void ath10k_peer_cleanup_all(stru
-+ list_del(&peer->list);
-+ kfree(peer);
-+ }
-++
-++ for (i = 0; i < ARRAY_SIZE(ar->peer_map); i++)
-++ ar->peer_map[i] = NULL;
-++
-+ spin_unlock_bh(&ar->data_lock);
-+
-+ ar->num_peers = 0;
-diff --git a/package/kernel/mac80211/patches/304-ath9k-avoid-ANI-restart-if-no-trigger.patch b/package/kernel/mac80211/patches/304-ath9k-avoid-ANI-restart-if-no-trigger.patch
-deleted file mode 100644
-index 049059aa24b50e71636336e3928bc66e64c39ae1..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/304-ath9k-avoid-ANI-restart-if-no-trigger.patch
-+++ /dev/null
-@@ -1,32 +0,0 @@
--From: Miaoqing Pan <miaoqing@codeaurora.org>
--Date: Fri, 15 Jan 2016 18:17:17 +0800
--Subject: [PATCH] ath9k: avoid ANI restart if no trigger
--
--Fixes commit 54da20d83f0e ("ath9k_hw: improve ANI processing and rx desensitizing parameters")
--
--Call ath9k_ani_restart() only when the phy error rate reach the
--ANI immunity threshold. Sync the logic with internal code base.
--
--Signed-off-by: Miaoqing Pan <miaoqing@codeaurora.org>
-----
--
----- a/drivers/net/wireless/ath/ath9k/ani.c
--+++ b/drivers/net/wireless/ath/ath9k/ani.c
--@@ -444,14 +444,16 @@ void ath9k_hw_ani_monitor(struct ath_hw
-- ofdmPhyErrRate < ah->config.ofdm_trig_low) {
-- ath9k_hw_ani_lower_immunity(ah);
-- aniState->ofdmsTurn = !aniState->ofdmsTurn;
--+ ath9k_ani_restart(ah);
-- } else if (ofdmPhyErrRate > ah->config.ofdm_trig_high) {
-- ath9k_hw_ani_ofdm_err_trigger(ah);
-- aniState->ofdmsTurn = false;
--+ ath9k_ani_restart(ah);
-- } else if (cckPhyErrRate > ah->config.cck_trig_high) {
-- ath9k_hw_ani_cck_err_trigger(ah);
-- aniState->ofdmsTurn = true;
--+ ath9k_ani_restart(ah);
-- }
--- ath9k_ani_restart(ah);
-- }
-- }
-- EXPORT_SYMBOL(ath9k_hw_ani_monitor);
-diff --git a/package/kernel/mac80211/patches/305-ath10k-Clean-up-peer-when-sta-goes-away.patch b/package/kernel/mac80211/patches/305-ath10k-Clean-up-peer-when-sta-goes-away.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..7248a8cecf6b0798d354aa3fd44386f2e1f1b52d
---- /dev/null
-+++ b/package/kernel/mac80211/patches/305-ath10k-Clean-up-peer-when-sta-goes-away.patch
-@@ -0,0 +1,32 @@
-+From: Ben Greear <greearb@candelatech.com>
-+Date: Fri, 1 Apr 2016 14:12:11 -0700
-+Subject: [PATCH] ath10k: Clean up peer when sta goes away.
-+
-+If WMI and/or firmware has issues removing the peer object,
-+then we still need to clean up the peer object in the driver.
-+
-+Signed-off-by: Ben Greear <greearb@candelatech.com>
-+---
-+
-+--- a/drivers/net/wireless/ath/ath10k/mac.c
-++++ b/drivers/net/wireless/ath/ath10k/mac.c
-+@@ -5992,9 +5992,17 @@ static int ath10k_sta_state(struct ieee8
-+ continue;
-+
-+ if (peer->sta == sta) {
-+- ath10k_warn(ar, "found sta peer %pM entry on vdev %i after it was supposedly removed\n",
-+- sta->addr, arvif->vdev_id);
-++ ath10k_warn(ar, "found sta peer %pM (ptr %p id %d) entry on vdev %i after it was supposedly removed\n",
-++ sta->addr, peer, i, arvif->vdev_id);
-+ peer->sta = NULL;
-++
-++ /* Clean up the peer object as well since we
-++ * must have failed to do this above.
-++ */
-++ list_del(&peer->list);
-++ ar->peer_map[i] = NULL;
-++ kfree(peer);
-++ ar->num_peers--;
-+ }
-+ }
-+ spin_unlock_bh(&ar->data_lock);
-diff --git a/package/kernel/mac80211/patches/305-ath9k-clean-up-ANI-per-channel-pointer-checking.patch b/package/kernel/mac80211/patches/305-ath9k-clean-up-ANI-per-channel-pointer-checking.patch
-deleted file mode 100644
-index a1ac67c828deb429af4ba4db0e8c18e87a3e12b6..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/305-ath9k-clean-up-ANI-per-channel-pointer-checking.patch
-+++ /dev/null
-@@ -1,91 +0,0 @@
--From: Miaoqing Pan <miaoqing@codeaurora.org>
--Date: Fri, 15 Jan 2016 18:17:18 +0800
--Subject: [PATCH] ath9k: clean up ANI per-channel pointer checking
--
--commit c24bd3620c50 ("ath9k: Do not maintain ANI state per-channel")
--removed per-channel handling, the code to check 'curchan' also
--should be removed as never used.
--
--Signed-off-by: Miaoqing Pan <miaoqing@codeaurora.org>
-----
--
----- a/drivers/net/wireless/ath/ath9k/ani.c
--+++ b/drivers/net/wireless/ath/ath9k/ani.c
--@@ -126,12 +126,8 @@ static void ath9k_hw_update_mibstats(str
--
-- static void ath9k_ani_restart(struct ath_hw *ah)
-- {
--- struct ar5416AniState *aniState;
---
--- if (!ah->curchan)
--- return;
--+ struct ar5416AniState *aniState = &ah->ani;
--
--- aniState = &ah->ani;
-- aniState->listenTime = 0;
--
-- ENABLE_REGWRITE_BUFFER(ah);
--@@ -221,12 +217,7 @@ static void ath9k_hw_set_ofdm_nil(struct
--
-- static void ath9k_hw_ani_ofdm_err_trigger(struct ath_hw *ah)
-- {
--- struct ar5416AniState *aniState;
---
--- if (!ah->curchan)
--- return;
---
--- aniState = &ah->ani;
--+ struct ar5416AniState *aniState = &ah->ani;
--
-- if (aniState->ofdmNoiseImmunityLevel < ATH9K_ANI_OFDM_MAX_LEVEL)
-- ath9k_hw_set_ofdm_nil(ah, aniState->ofdmNoiseImmunityLevel + 1, false);
--@@ -281,12 +272,7 @@ static void ath9k_hw_set_cck_nil(struct
--
-- static void ath9k_hw_ani_cck_err_trigger(struct ath_hw *ah)
-- {
--- struct ar5416AniState *aniState;
---
--- if (!ah->curchan)
--- return;
---
--- aniState = &ah->ani;
--+ struct ar5416AniState *aniState = &ah->ani;
--
-- if (aniState->cckNoiseImmunityLevel < ATH9K_ANI_CCK_MAX_LEVEL)
-- ath9k_hw_set_cck_nil(ah, aniState->cckNoiseImmunityLevel + 1,
--@@ -299,9 +285,7 @@ static void ath9k_hw_ani_cck_err_trigger
-- */
-- static void ath9k_hw_ani_lower_immunity(struct ath_hw *ah)
-- {
--- struct ar5416AniState *aniState;
---
--- aniState = &ah->ani;
--+ struct ar5416AniState *aniState = &ah->ani;
--
-- /* lower OFDM noise immunity */
-- if (aniState->ofdmNoiseImmunityLevel > 0 &&
--@@ -329,7 +313,7 @@ void ath9k_ani_reset(struct ath_hw *ah,
-- struct ath_common *common = ath9k_hw_common(ah);
-- int ofdm_nil, cck_nil;
--
--- if (!ah->curchan)
--+ if (!chan)
-- return;
--
-- BUG_ON(aniState == NULL);
--@@ -416,14 +400,10 @@ static bool ath9k_hw_ani_read_counters(s
--
-- void ath9k_hw_ani_monitor(struct ath_hw *ah, struct ath9k_channel *chan)
-- {
--- struct ar5416AniState *aniState;
--+ struct ar5416AniState *aniState = &ah->ani;
-- struct ath_common *common = ath9k_hw_common(ah);
-- u32 ofdmPhyErrRate, cckPhyErrRate;
--
--- if (!ah->curchan)
--- return;
---
--- aniState = &ah->ani;
-- if (!ath9k_hw_ani_read_counters(ah))
-- return;
--
-diff --git a/package/kernel/mac80211/patches/306-ath9k-do-not-reset-while-BB-panic-0x4000409-on-ar956.patch b/package/kernel/mac80211/patches/306-ath9k-do-not-reset-while-BB-panic-0x4000409-on-ar956.patch
-deleted file mode 100644
-index cf8194aa334c7b85e26404ec3a104dff5431d4e9..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/306-ath9k-do-not-reset-while-BB-panic-0x4000409-on-ar956.patch
-+++ /dev/null
-@@ -1,31 +0,0 @@
--From: Miaoqing Pan <miaoqing@codeaurora.org>
--Date: Fri, 15 Jan 2016 18:17:19 +0800
--Subject: [PATCH] ath9k: do not reset while BB panic(0x4000409) on ar9561
--
--BB panic(0x4000409) observed while AP enabling/disabling
--bursting.
--
--Signed-off-by: Miaoqing Pan <miaoqing@codeaurora.org>
-----
--
----- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
--+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
--@@ -2071,7 +2071,8 @@ void ar9003_hw_attach_phy_ops(struct ath
-- * to be disabled.
-- *
-- * 0x04000409: Packet stuck on receive.
--- * Full chip reset is required for all chips except AR9340.
--+ * Full chip reset is required for all chips except
--+ * AR9340, AR9531 and AR9561.
-- */
--
-- /*
--@@ -2100,7 +2101,7 @@ bool ar9003_hw_bb_watchdog_check(struct
-- case 0x04000b09:
-- return true;
-- case 0x04000409:
--- if (AR_SREV_9340(ah) || AR_SREV_9531(ah))
--+ if (AR_SREV_9340(ah) || AR_SREV_9531(ah) || AR_SREV_9561(ah))
-- return false;
-- else
-- return true;
-diff --git a/package/kernel/mac80211/patches/306-mac80211-add-hdrlen-to-ieee80211_tx_data.patch b/package/kernel/mac80211/patches/306-mac80211-add-hdrlen-to-ieee80211_tx_data.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..4a8f14394640020ae7b32aa3e295cfb9494896df
---- /dev/null
-+++ b/package/kernel/mac80211/patches/306-mac80211-add-hdrlen-to-ieee80211_tx_data.patch
-@@ -0,0 +1,203 @@
-+From: Janusz Dziedzic <janusz.dziedzic@tieto.com>
-+Date: Fri, 19 Feb 2016 11:01:49 +0100
-+Subject: [PATCH] mac80211: add hdrlen to ieee80211_tx_data
-+
-+Add hdrlen to ieee80211_tx_data and use this
-+when wep/ccmd/tkip. This is preparation for
-+aligned4 code.
-+
-+Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
-+---
-+
-+--- a/net/mac80211/ieee80211_i.h
-++++ b/net/mac80211/ieee80211_i.h
-+@@ -173,6 +173,7 @@ struct ieee80211_tx_data {
-+ struct ieee80211_tx_rate rate;
-+
-+ unsigned int flags;
-++ unsigned int hdrlen;
-+ };
-+
-+
-+--- a/net/mac80211/tx.c
-++++ b/net/mac80211/tx.c
-+@@ -922,7 +922,7 @@ ieee80211_tx_h_fragment(struct ieee80211
-+ struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
-+ struct ieee80211_hdr *hdr = (void *)skb->data;
-+ int frag_threshold = tx->local->hw.wiphy->frag_threshold;
-+- int hdrlen;
-++ int hdrlen = tx->hdrlen;
-+ int fragnum;
-+
-+ /* no matter what happens, tx->skb moves to tx->skbs */
-+@@ -943,8 +943,6 @@ ieee80211_tx_h_fragment(struct ieee80211
-+ if (WARN_ON(info->flags & IEEE80211_TX_CTL_AMPDU))
-+ return TX_DROP;
-+
-+- hdrlen = ieee80211_hdrlen(hdr->frame_control);
-+-
-+ /* internal error, why isn't DONTFRAG set? */
-+ if (WARN_ON(skb->len + FCS_LEN <= frag_threshold))
-+ return TX_DROP;
-+@@ -1176,6 +1174,8 @@ ieee80211_tx_prepare(struct ieee80211_su
-+
-+ hdr = (struct ieee80211_hdr *) skb->data;
-+
-++ tx->hdrlen = ieee80211_hdrlen(hdr->frame_control);
-++
-+ if (likely(sta)) {
-+ if (!IS_ERR(sta))
-+ tx->sta = sta;
-+--- a/net/mac80211/util.c
-++++ b/net/mac80211/util.c
-+@@ -1226,6 +1226,7 @@ void ieee80211_send_auth(struct ieee8021
-+ struct ieee80211_local *local = sdata->local;
-+ struct sk_buff *skb;
-+ struct ieee80211_mgmt *mgmt;
-++ unsigned int hdrlen;
-+ int err;
-+
-+ /* 24 + 6 = header + auth_algo + auth_transaction + status_code */
-+@@ -1250,8 +1251,10 @@ void ieee80211_send_auth(struct ieee8021
-+ memcpy(skb_put(skb, extra_len), extra, extra_len);
-+
-+ if (auth_alg == WLAN_AUTH_SHARED_KEY && transaction == 3) {
-++ hdrlen = ieee80211_hdrlen(mgmt->frame_control);
-+ mgmt->frame_control |= cpu_to_le16(IEEE80211_FCTL_PROTECTED);
-+- err = ieee80211_wep_encrypt(local, skb, key, key_len, key_idx);
-++ err = ieee80211_wep_encrypt(local, skb, hdrlen, key,
-++ key_len, key_idx);
-+ WARN_ON(err);
-+ }
-+
-+--- a/net/mac80211/wep.c
-++++ b/net/mac80211/wep.c
-+@@ -89,11 +89,11 @@ static void ieee80211_wep_get_iv(struct
-+
-+ static u8 *ieee80211_wep_add_iv(struct ieee80211_local *local,
-+ struct sk_buff *skb,
-++ unsigned int hdrlen,
-+ int keylen, int keyidx)
-+ {
-+ struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
-+ struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
-+- unsigned int hdrlen;
-+ u8 *newhdr;
-+
-+ hdr->frame_control |= cpu_to_le16(IEEE80211_FCTL_PROTECTED);
-+@@ -101,7 +101,6 @@ static u8 *ieee80211_wep_add_iv(struct i
-+ if (WARN_ON(skb_headroom(skb) < IEEE80211_WEP_IV_LEN))
-+ return NULL;
-+
-+- hdrlen = ieee80211_hdrlen(hdr->frame_control);
-+ newhdr = skb_push(skb, IEEE80211_WEP_IV_LEN);
-+ memmove(newhdr, newhdr + IEEE80211_WEP_IV_LEN, hdrlen);
-+
-+@@ -160,6 +159,7 @@ int ieee80211_wep_encrypt_data(struct cr
-+ */
-+ int ieee80211_wep_encrypt(struct ieee80211_local *local,
-+ struct sk_buff *skb,
-++ unsigned int hdrlen,
-+ const u8 *key, int keylen, int keyidx)
-+ {
-+ u8 *iv;
-+@@ -169,7 +169,7 @@ int ieee80211_wep_encrypt(struct ieee802
-+ if (WARN_ON(skb_tailroom(skb) < IEEE80211_WEP_ICV_LEN))
-+ return -1;
-+
-+- iv = ieee80211_wep_add_iv(local, skb, keylen, keyidx);
-++ iv = ieee80211_wep_add_iv(local, skb, hdrlen, keylen, keyidx);
-+ if (!iv)
-+ return -1;
-+
-+@@ -306,13 +306,14 @@ static int wep_encrypt_skb(struct ieee80
-+ struct ieee80211_key_conf *hw_key = info->control.hw_key;
-+
-+ if (!hw_key) {
-+- if (ieee80211_wep_encrypt(tx->local, skb, tx->key->conf.key,
-++ if (ieee80211_wep_encrypt(tx->local, skb, tx->hdrlen,
-++ tx->key->conf.key,
-+ tx->key->conf.keylen,
-+ tx->key->conf.keyidx))
-+ return -1;
-+ } else if ((hw_key->flags & IEEE80211_KEY_FLAG_GENERATE_IV) ||
-+ (hw_key->flags & IEEE80211_KEY_FLAG_PUT_IV_SPACE)) {
-+- if (!ieee80211_wep_add_iv(tx->local, skb,
-++ if (!ieee80211_wep_add_iv(tx->local, skb, tx->hdrlen,
-+ tx->key->conf.keylen,
-+ tx->key->conf.keyidx))
-+ return -1;
-+--- a/net/mac80211/wep.h
-++++ b/net/mac80211/wep.h
-+@@ -22,6 +22,7 @@ int ieee80211_wep_encrypt_data(struct cr
-+ size_t klen, u8 *data, size_t data_len);
-+ int ieee80211_wep_encrypt(struct ieee80211_local *local,
-+ struct sk_buff *skb,
-++ unsigned int hdrlen,
-+ const u8 *key, int keylen, int keyidx);
-+ int ieee80211_wep_decrypt_data(struct crypto_cipher *tfm, u8 *rc4key,
-+ size_t klen, u8 *data, size_t data_len);
-+--- a/net/mac80211/wpa.c
-++++ b/net/mac80211/wpa.c
-+@@ -43,7 +43,7 @@ ieee80211_tx_h_michael_mic_add(struct ie
-+ skb->len < 24 || !ieee80211_is_data_present(hdr->frame_control))
-+ return TX_CONTINUE;
-+
-+- hdrlen = ieee80211_hdrlen(hdr->frame_control);
-++ hdrlen = tx->hdrlen;
-+ if (skb->len < hdrlen)
-+ return TX_DROP;
-+
-+@@ -186,7 +186,6 @@ mic_fail_no_key:
-+
-+ static int tkip_encrypt_skb(struct ieee80211_tx_data *tx, struct sk_buff *skb)
-+ {
-+- struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
-+ struct ieee80211_key *key = tx->key;
-+ struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
-+ unsigned int hdrlen;
-+@@ -201,7 +200,7 @@ static int tkip_encrypt_skb(struct ieee8
-+ return 0;
-+ }
-+
-+- hdrlen = ieee80211_hdrlen(hdr->frame_control);
-++ hdrlen = tx->hdrlen;
-+ len = skb->len - hdrlen;
-+
-+ if (info->control.hw_key)
-+@@ -418,7 +417,7 @@ static int ccmp_encrypt_skb(struct ieee8
-+ return 0;
-+ }
-+
-+- hdrlen = ieee80211_hdrlen(hdr->frame_control);
-++ hdrlen = tx->hdrlen;
-+ len = skb->len - hdrlen;
-+
-+ if (info->control.hw_key)
-+@@ -651,7 +650,7 @@ static int gcmp_encrypt_skb(struct ieee8
-+ return 0;
-+ }
-+
-+- hdrlen = ieee80211_hdrlen(hdr->frame_control);
-++ hdrlen = tx->hdrlen;
-+ len = skb->len - hdrlen;
-+
-+ if (info->control.hw_key)
-+@@ -791,7 +790,6 @@ static ieee80211_tx_result
-+ ieee80211_crypto_cs_encrypt(struct ieee80211_tx_data *tx,
-+ struct sk_buff *skb)
-+ {
-+- struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
-+ struct ieee80211_key *key = tx->key;
-+ struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
-+ int hdrlen;
-+@@ -807,8 +805,7 @@ ieee80211_crypto_cs_encrypt(struct ieee8
-+ pskb_expand_head(skb, iv_len, 0, GFP_ATOMIC)))
-+ return TX_DROP;
-+
-+- hdrlen = ieee80211_hdrlen(hdr->frame_control);
-+-
-++ hdrlen = tx->hdrlen;
-+ pos = skb_push(skb, iv_len);
-+ memmove(pos, pos + iv_len, hdrlen);
-+
-diff --git a/package/kernel/mac80211/patches/307-ath9k-fix-inconsistent-use-of-tab-and-space-in-inden.patch b/package/kernel/mac80211/patches/307-ath9k-fix-inconsistent-use-of-tab-and-space-in-inden.patch
-deleted file mode 100644
-index 80b781ca54dc8c217ffe5fa304bf2bc515cf1c90..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/307-ath9k-fix-inconsistent-use-of-tab-and-space-in-inden.patch
-+++ /dev/null
-@@ -1,27 +0,0 @@
--From: Miaoqing Pan <miaoqing@codeaurora.org>
--Date: Fri, 15 Jan 2016 18:17:20 +0800
--Subject: [PATCH] ath9k: fix inconsistent use of tab and space in
-- indentation
--
--Minor changes for indenting.
--
--Signed-off-by: Miaoqing Pan <miaoqing@codeaurora.org>
-----
--
----- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
--+++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
--@@ -5485,11 +5485,11 @@ unsigned int ar9003_get_paprd_scale_fact
-- AR9300_PAPRD_SCALE_1);
-- else {
-- if (chan->channel >= 5700)
--- return MS(le32_to_cpu(eep->modalHeader5G.papdRateMaskHt20),
--- AR9300_PAPRD_SCALE_1);
--+ return MS(le32_to_cpu(eep->modalHeader5G.papdRateMaskHt20),
--+ AR9300_PAPRD_SCALE_1);
-- else if (chan->channel >= 5400)
-- return MS(le32_to_cpu(eep->modalHeader5G.papdRateMaskHt40),
--- AR9300_PAPRD_SCALE_2);
--+ AR9300_PAPRD_SCALE_2);
-- else
-- return MS(le32_to_cpu(eep->modalHeader5G.papdRateMaskHt40),
-- AR9300_PAPRD_SCALE_1);
-diff --git a/package/kernel/mac80211/patches/307-mac80211-add-NEED_ALIGNED4_SKBS-hw-flag.patch b/package/kernel/mac80211/patches/307-mac80211-add-NEED_ALIGNED4_SKBS-hw-flag.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..eeb881e03064fc7b0fdbcb5dbb5ffc2600c9754e
---- /dev/null
-+++ b/package/kernel/mac80211/patches/307-mac80211-add-NEED_ALIGNED4_SKBS-hw-flag.patch
-@@ -0,0 +1,235 @@
-+From: Janusz Dziedzic <janusz.dziedzic@tieto.com>
-+Date: Fri, 19 Feb 2016 11:01:50 +0100
-+Subject: [PATCH] mac80211: add NEED_ALIGNED4_SKBS hw flag
-+
-+HW/driver should set NEED_ALIGNED4_SKBS flag in case
-+require aligned skbs to four-byte boundaries.
-+This affect only TX direction.
-+
-+Padding is added after ieee80211_hdr, before IV/LLC.
-+
-+Before we have to do memmove(hdrlen) twice in the
-+dirver. Once before we pass this to HW and next
-+in tx completion (to be sure monitor will report
-+this tx frame correctly).
-+
-+With this patch we can skip this memmove() and save CPU.
-+
-+Currently this was tested with ath9k, both hw/sw crypt for
-+wep/tkip/ccmp.
-+
-+Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
-+---
-+
-+--- a/include/net/mac80211.h
-++++ b/include/net/mac80211.h
-+@@ -2014,6 +2014,9 @@ struct ieee80211_txq {
-+ * @IEEE80211_HW_TX_FRAG_LIST: Hardware (or driver) supports sending frag_list
-+ * skbs, needed for zero-copy software A-MSDU.
-+ *
-++ * @IEEE80211_HW_NEEDS_ALIGNED4_SKBS: Driver need aligned skbs to four-byte.
-++ * Padding will be added after ieee80211_hdr, before IV/LLC.
-++ *
-+ * @NUM_IEEE80211_HW_FLAGS: number of hardware flags, used for sizing arrays
-+ */
-+ enum ieee80211_hw_flags {
-+@@ -2054,6 +2057,7 @@ enum ieee80211_hw_flags {
-+ IEEE80211_HW_USES_RSS,
-+ IEEE80211_HW_TX_AMSDU,
-+ IEEE80211_HW_TX_FRAG_LIST,
-++ IEEE80211_HW_NEEDS_ALIGNED4_SKBS,
-+
-+ /* keep last, obviously */
-+ NUM_IEEE80211_HW_FLAGS
-+--- a/net/mac80211/debugfs.c
-++++ b/net/mac80211/debugfs.c
-+@@ -302,6 +302,7 @@ static const char *hw_flag_names[] = {
-+ FLAG(USES_RSS),
-+ FLAG(TX_AMSDU),
-+ FLAG(TX_FRAG_LIST),
-++ FLAG(NEEDS_ALIGNED4_SKBS),
-+ #undef FLAG
-+ };
-+
-+--- a/net/mac80211/ieee80211_i.h
-++++ b/net/mac80211/ieee80211_i.h
-+@@ -1497,6 +1497,29 @@ ieee80211_have_rx_timestamp(struct ieee8
-+ return false;
-+ }
-+
-++static inline unsigned int
-++ieee80211_hdr_padsize(struct ieee80211_hw *hw, unsigned int hdrlen)
-++{
-++ /*
-++ * While hdrlen is already aligned to two-byte boundaries,
-++ * simple check with & 2 will return correct padsize.
-++ */
-++ if (ieee80211_hw_check(hw, NEEDS_ALIGNED4_SKBS))
-++ return hdrlen & 2;
-++ return 0;
-++}
-++
-++static inline unsigned int
-++ieee80211_padded_hdrlen(struct ieee80211_hw *hw, __le16 fc)
-++{
-++ unsigned int hdrlen;
-++
-++ hdrlen = ieee80211_hdrlen(fc);
-++ hdrlen += ieee80211_hdr_padsize(hw, hdrlen);
-++
-++ return hdrlen;
-++}
-++
-+ u64 ieee80211_calculate_rx_timestamp(struct ieee80211_local *local,
-+ struct ieee80211_rx_status *status,
-+ unsigned int mpdu_len,
-+--- a/net/mac80211/sta_info.h
-++++ b/net/mac80211/sta_info.h
-+@@ -279,7 +279,7 @@ struct ieee80211_fast_tx {
-+ u8 hdr_len;
-+ u8 sa_offs, da_offs, pn_offs;
-+ u8 band;
-+- u8 hdr[30 + 2 + IEEE80211_FAST_XMIT_MAX_IV +
-++ u8 hdr[30 + 2 + 2 + IEEE80211_FAST_XMIT_MAX_IV +
-+ sizeof(rfc1042_header)] __aligned(2);
-+
-+ struct rcu_head rcu_head;
-+--- a/net/mac80211/status.c
-++++ b/net/mac80211/status.c
-+@@ -683,9 +683,22 @@ void ieee80211_tx_monitor(struct ieee802
-+ struct sk_buff *skb2;
-+ struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
-+ struct ieee80211_sub_if_data *sdata;
-++ struct ieee80211_hdr *hdr = (void *)skb->data;
-+ struct net_device *prev_dev = NULL;
-++ unsigned int hdrlen, padsize;
-+ int rtap_len;
-+
-++ /* Remove padding if was added */
-++ if (ieee80211_hw_check(&local->hw, NEEDS_ALIGNED4_SKBS)) {
-++ hdrlen = ieee80211_hdrlen(hdr->frame_control);
-++ padsize = ieee80211_hdr_padsize(&local->hw, hdrlen);
-++
-++ if (padsize && skb->len > hdrlen + padsize) {
-++ memmove(skb->data + padsize, skb->data, hdrlen);
-++ skb_pull(skb, padsize);
-++ }
-++ }
-++
-+ /* send frame to monitor interfaces now */
-+ rtap_len = ieee80211_tx_radiotap_len(info);
-+ if (WARN_ON_ONCE(skb_headroom(skb) < rtap_len)) {
-+--- a/net/mac80211/tkip.c
-++++ b/net/mac80211/tkip.c
-+@@ -201,10 +201,12 @@ void ieee80211_get_tkip_p2k(struct ieee8
-+ {
-+ struct ieee80211_key *key = (struct ieee80211_key *)
-+ container_of(keyconf, struct ieee80211_key, conf);
-++ struct ieee80211_hw *hw = &key->local->hw;
-+ const u8 *tk = &key->conf.key[NL80211_TKIP_DATA_OFFSET_ENCR_KEY];
-+ struct tkip_ctx *ctx = &key->u.tkip.tx;
-+ struct ieee80211_hdr *hdr = (struct ieee80211_hdr *)skb->data;
-+- const u8 *data = (u8 *)hdr + ieee80211_hdrlen(hdr->frame_control);
-++ const u8 *data = (u8 *)hdr + ieee80211_padded_hdrlen(hw,
-++ hdr->frame_control);
-+ u32 iv32 = get_unaligned_le32(&data[4]);
-+ u16 iv16 = data[2] | (data[0] << 8);
-+
-+--- a/net/mac80211/tx.c
-++++ b/net/mac80211/tx.c
-+@@ -1173,8 +1173,7 @@ ieee80211_tx_prepare(struct ieee80211_su
-+ info->flags &= ~IEEE80211_TX_INTFL_NEED_TXPROCESSING;
-+
-+ hdr = (struct ieee80211_hdr *) skb->data;
-+-
-+- tx->hdrlen = ieee80211_hdrlen(hdr->frame_control);
-++ tx->hdrlen = ieee80211_padded_hdrlen(&local->hw, hdr->frame_control);
-+
-+ if (likely(sta)) {
-+ if (!IS_ERR(sta))
-+@@ -2108,7 +2107,7 @@ netdev_tx_t ieee80211_monitor_start_xmit
-+ goto fail;
-+
-+ hdr = (struct ieee80211_hdr *)(skb->data + len_rthdr);
-+- hdrlen = ieee80211_hdrlen(hdr->frame_control);
-++ hdrlen = ieee80211_padded_hdrlen(&local->hw, hdr->frame_control);
-+
-+ if (skb->len < len_rthdr + hdrlen)
-+ goto fail;
-+@@ -2334,7 +2333,7 @@ static struct sk_buff *ieee80211_build_h
-+ struct ieee80211_chanctx_conf *chanctx_conf;
-+ struct ieee80211_sub_if_data *ap_sdata;
-+ enum nl80211_band band;
-+- int ret;
-++ int padsize, ret;
-+
-+ if (IS_ERR(sta))
-+ sta = NULL;
-+@@ -2554,6 +2553,9 @@ static struct sk_buff *ieee80211_build_h
-+ hdrlen += 2;
-+ }
-+
-++ /* Check aligned4 skb required */
-++ padsize = ieee80211_hdr_padsize(&sdata->local->hw, hdrlen);
-++
-+ /*
-+ * Drop unicast frames to unauthorised stations unless they are
-+ * EAPOL frames from the local station.
-+@@ -2640,6 +2642,7 @@ static struct sk_buff *ieee80211_build_h
-+ h_pos -= skip_header_bytes;
-+
-+ head_need = hdrlen + encaps_len + meshhdrlen - skb_headroom(skb);
-++ head_need += padsize;
-+
-+ /*
-+ * So we need to modify the skb header and hence need a copy of
-+@@ -2678,6 +2681,9 @@ static struct sk_buff *ieee80211_build_h
-+ }
-+ #endif
-+
-++ if (padsize)
-++ memset(skb_push(skb, padsize), 0, padsize);
-++
-+ if (ieee80211_is_data_qos(fc)) {
-+ __le16 *qos_control;
-+
-+@@ -2691,8 +2697,8 @@ static struct sk_buff *ieee80211_build_h
-+ } else
-+ memcpy(skb_push(skb, hdrlen), &hdr, hdrlen);
-+
-+- nh_pos += hdrlen;
-+- h_pos += hdrlen;
-++ nh_pos += hdrlen + padsize;
-++ h_pos += hdrlen + padsize;
-+
-+ /* Update skb pointers to various headers since this modified frame
-+ * is going to go through Linux networking code that may potentially
-+@@ -2861,6 +2867,9 @@ void ieee80211_check_fast_xmit(struct st
-+ fc |= cpu_to_le16(IEEE80211_STYPE_QOS_DATA);
-+ }
-+
-++ /* Check aligned4 skb required */
-++ build.hdr_len += ieee80211_hdr_padsize(&local->hw, build.hdr_len);
-++
-+ /* We store the key here so there's no point in using rcu_dereference()
-+ * but that's fine because the code that changes the pointers will call
-+ * this function after doing so. For a single CPU that would be enough,
-+--- a/net/mac80211/util.c
-++++ b/net/mac80211/util.c
-+@@ -1224,6 +1224,7 @@ void ieee80211_send_auth(struct ieee8021
-+ u32 tx_flags)
-+ {
-+ struct ieee80211_local *local = sdata->local;
-++ struct ieee80211_hw *hw = &local->hw;
-+ struct sk_buff *skb;
-+ struct ieee80211_mgmt *mgmt;
-+ unsigned int hdrlen;
-+@@ -1251,7 +1252,7 @@ void ieee80211_send_auth(struct ieee8021
-+ memcpy(skb_put(skb, extra_len), extra, extra_len);
-+
-+ if (auth_alg == WLAN_AUTH_SHARED_KEY && transaction == 3) {
-+- hdrlen = ieee80211_hdrlen(mgmt->frame_control);
-++ hdrlen = ieee80211_padded_hdrlen(hw, mgmt->frame_control);
-+ mgmt->frame_control |= cpu_to_le16(IEEE80211_FCTL_PROTECTED);
-+ err = ieee80211_wep_encrypt(local, skb, hdrlen, key,
-+ key_len, key_idx);
-diff --git a/package/kernel/mac80211/patches/308-ath10k-Fix-sending-NULL-Qos-NULL-data-frames-for-QCA.patch b/package/kernel/mac80211/patches/308-ath10k-Fix-sending-NULL-Qos-NULL-data-frames-for-QCA.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..8590aadabe8d622a9691e13c17af23bd5d91886c
---- /dev/null
-+++ b/package/kernel/mac80211/patches/308-ath10k-Fix-sending-NULL-Qos-NULL-data-frames-for-QCA.patch
-@@ -0,0 +1,72 @@
-+From: Mohammed Shafi Shajakhan <mohammed@qti.qualcomm.com>
-+Date: Thu, 23 Jun 2016 22:10:01 +0530
-+Subject: [PATCH] ath10k: Fix sending NULL/ Qos NULL data frames for
-+ QCA99X0 and later
-+
-+For chipsets like QCA99X0, IPQ4019 and later we are not getting proper
-+NULL func status (always acked/successs !!) when hostapd does a
-+PROBE_CLIENT via nullfunc frames when the station is powered off
-+abruptly (inactive timer probes client via null func after the inactive
-+time reaches beyond the threshold). Fix this by disabling the workaround
-+(getting the ACK status of NULL func frames by sending via HTT mgmt-tx
-+ path) introduced by the change ("ath10k: fix beacon loss handling ")
-+for QCA99X0 and later chipsets. The normal tx path provides the proper
-+ACK status for NULL data frames. As of now disable this workaround for
-+chipsets QCA99X0 and later, once the 10.1 firmware is obselete we can
-+completely get rid of this workaround for all the chipsets
-+
-+Signed-off-by: Tamizh chelvam <c_traja@qti.qualcomm.com>
-+Signed-off-by: Mohammed Shafi Shajakhan <mohammed@qti.qualcomm.com>
-+---
-+
-+--- a/drivers/net/wireless/ath/ath10k/core.c
-++++ b/drivers/net/wireless/ath/ath10k/core.c
-+@@ -181,6 +181,7 @@ static const struct ath10k_hw_params ath
-+ .board = QCA99X0_HW_2_0_BOARD_DATA_FILE,
-+ .board_size = QCA99X0_BOARD_DATA_SZ,
-+ .board_ext_size = QCA99X0_BOARD_EXT_DATA_SZ,
-++ .disable_null_func_workaround = true,
-+ },
-+ },
-+ {
-+@@ -204,6 +205,7 @@ static const struct ath10k_hw_params ath
-+ .board = QCA9984_HW_1_0_BOARD_DATA_FILE,
-+ .board_size = QCA99X0_BOARD_DATA_SZ,
-+ .board_ext_size = QCA99X0_BOARD_EXT_DATA_SZ,
-++ .disable_null_func_workaround = true,
-+ },
-+ },
-+ {
-+@@ -262,6 +264,7 @@ static const struct ath10k_hw_params ath
-+ .board = QCA4019_HW_1_0_BOARD_DATA_FILE,
-+ .board_size = QCA4019_BOARD_DATA_SZ,
-+ .board_ext_size = QCA4019_BOARD_EXT_DATA_SZ,
-++ .disable_null_func_workaround = true,
-+ },
-+ },
-+ };
-+--- a/drivers/net/wireless/ath/ath10k/core.h
-++++ b/drivers/net/wireless/ath/ath10k/core.h
-+@@ -750,6 +750,12 @@ struct ath10k {
-+ const char *board;
-+ size_t board_size;
-+ size_t board_ext_size;
-++ /* Workaround of sending NULL data frames via
-++ * HTT mgmt TX and getting the proper ACK status does
-++ * not works for chipsets QCA99X0 and later, while
-++ * Tx data path reports the ACK status properly.
-++ */
-++ bool disable_null_func_workaround;
-+ } fw;
-+ } hw_params;
-+
-+--- a/drivers/net/wireless/ath/ath10k/mac.c
-++++ b/drivers/net/wireless/ath/ath10k/mac.c
-+@@ -3253,6 +3253,7 @@ ath10k_mac_tx_h_get_txmode(struct ath10k
-+ * mode though because AP don't sleep.
-+ */
-+ if (ar->htt.target_version_major < 3 &&
-++ !ar->hw_params.fw.disable_null_func_workaround &&
-+ (ieee80211_is_nullfunc(fc) || ieee80211_is_qos_nullfunc(fc)) &&
-+ !test_bit(ATH10K_FW_FEATURE_HAS_WMI_MGMT_TX,
-+ ar->running_fw->fw_file.fw_features))
-diff --git a/package/kernel/mac80211/patches/308-ath9k-fix-data-bus-error-on-ar9300-and-ar9580.patch b/package/kernel/mac80211/patches/308-ath9k-fix-data-bus-error-on-ar9300-and-ar9580.patch
-deleted file mode 100644
-index d4088664bf68166ecf5c25a9ac727578805da176..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/308-ath9k-fix-data-bus-error-on-ar9300-and-ar9580.patch
-+++ /dev/null
-@@ -1,65 +0,0 @@
--From: Miaoqing Pan <miaoqing@codeaurora.org>
--Date: Fri, 15 Jan 2016 18:17:21 +0800
--Subject: [PATCH] ath9k: fix data bus error on ar9300 and ar9580
--
--One crash issue be found on ar9300: RTC_RC reg read leads crash, leading
--the data bus error, due to RTC_RC reg write not happen properly.
--
--Warm Reset trigger in continuous beacon stuck for one of the customer for
--other chip, noticed the MAC was stuck in RTC reset. After analysis noticed
--DMA did not complete when RTC was put in reset.
--
--So, before resetting the MAC need to make sure there are no pending DMA
--transactions because this reset does not reset all parts of the chip.
--
--The 12th and 11th bit of MAC _DMA_CFG register used to do that.
-- 12 cfg_halt_ack 0x0
-- 0 DMA has not yet halted
-- 1 DMA has halted
-- 11 cfg_halt_req 0x0
-- 0 DMA logic operates normally
-- 1 Request DMA logic to stop so software can reset the MAC
--
--The Bit [12] of this register indicates when the halt has taken effect or
--not. the DMA halt IS NOT recoverable; once software sets bit [11] to
--request a DMA halt, software must wait for bit [12] to be set and reset
--the MAC.
--
--So, the same thing we implemented for ar9580 chip.
--
--Signed-off-by: Miaoqing Pan <miaoqing@codeaurora.org>
-----
--
----- a/drivers/net/wireless/ath/ath9k/hw.c
--+++ b/drivers/net/wireless/ath/ath9k/hw.c
--@@ -1368,6 +1368,16 @@ static bool ath9k_hw_set_reset(struct at
-- if (ath9k_hw_mci_is_enabled(ah))
-- ar9003_mci_check_gpm_offset(ah);
--
--+ /* DMA HALT added to resolve ar9300 and ar9580 bus error during
--+ * RTC_RC reg read
--+ */
--+ if (AR_SREV_9300(ah) || AR_SREV_9580(ah)) {
--+ REG_SET_BIT(ah, AR_CFG, AR_CFG_HALT_REQ);
--+ ath9k_hw_wait(ah, AR_CFG, AR_CFG_HALT_ACK, AR_CFG_HALT_ACK,
--+ 20 * AH_WAIT_TIMEOUT);
--+ REG_CLR_BIT(ah, AR_CFG, AR_CFG_HALT_REQ);
--+ }
--+
-- REG_WRITE(ah, AR_RTC_RC, rst_flags);
--
-- REGWRITE_BUFFER_FLUSH(ah);
----- a/drivers/net/wireless/ath/ath9k/reg.h
--+++ b/drivers/net/wireless/ath/ath9k/reg.h
--@@ -34,8 +34,10 @@
-- #define AR_CFG_SWRG 0x00000010
-- #define AR_CFG_AP_ADHOC_INDICATION 0x00000020
-- #define AR_CFG_PHOK 0x00000100
---#define AR_CFG_CLK_GATE_DIS 0x00000400
-- #define AR_CFG_EEBS 0x00000200
--+#define AR_CFG_CLK_GATE_DIS 0x00000400
--+#define AR_CFG_HALT_REQ 0x00000800
--+#define AR_CFG_HALT_ACK 0x00001000
-- #define AR_CFG_PCI_MASTER_REQ_Q_THRESH 0x00060000
-- #define AR_CFG_PCI_MASTER_REQ_Q_THRESH_S 17
--
-diff --git a/package/kernel/mac80211/patches/309-01-brcmfmac-add-missing-include.patch b/package/kernel/mac80211/patches/309-01-brcmfmac-add-missing-include.patch
-deleted file mode 100644
-index d9511c8d5f5c8051bf2ed9c1cd408911c0ba02d9..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/309-01-brcmfmac-add-missing-include.patch
-+++ /dev/null
-@@ -1,19 +0,0 @@
--From: Felix Fietkau <nbd@openwrt.org>
--Date: Fri, 15 Jan 2016 15:59:45 +0100
--Subject: [PATCH] brcmfmac: add missing include
--
--linux/module.h is required for defining module parameters
--
--Signed-off-by: Felix Fietkau <nbd@openwrt.org>
-----
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
--@@ -17,6 +17,7 @@
-- #include <linux/kernel.h>
-- #include <linux/string.h>
-- #include <linux/netdevice.h>
--+#include <linux/module.h>
-- #include <brcmu_wifi.h>
-- #include <brcmu_utils.h>
-- #include "core.h"
-diff --git a/package/kernel/mac80211/patches/309-02-brcmfmac-fix-sdio-sg-table-alloc-crash.patch b/package/kernel/mac80211/patches/309-02-brcmfmac-fix-sdio-sg-table-alloc-crash.patch
-deleted file mode 100644
-index 711e019e2b6836c6907a614fc3a3b1c17693f2cf..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/309-02-brcmfmac-fix-sdio-sg-table-alloc-crash.patch
-+++ /dev/null
-@@ -1,118 +0,0 @@
--From: Hante Meuleman <meuleman@broadcom.com>
--Date: Tue, 19 Jan 2016 12:39:24 +0100
--Subject: [PATCH] brcmfmac: fix sdio sg table alloc crash
--
--With commit 7d34b0560567 ("brcmfmac: Move all module parameters to
--one place") a bug was introduced causing a null pointer exception.
--This patch fixes the bug by initializing the sg table till after
--the settings have been initialized.
--
--Fixes: 7d34b0560567 ("brcmfmac: Move all module parameters to one place")
--Reported-by: Marc Zyngier <marc.zyngier@arm.com>
--Tested-by: Marc Zyngier <marc.zyngier@arm.com>
--Reviewed-by: Arend Van Spriel <arend@broadcom.com>
--Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
--Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
--Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
--Signed-off-by: Arend van Spriel <arend@broadcom.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
--@@ -879,11 +879,24 @@ int brcmf_sdiod_abort(struct brcmf_sdio_
-- return 0;
-- }
--
---static void brcmf_sdiod_sgtable_alloc(struct brcmf_sdio_dev *sdiodev)
--+void brcmf_sdiod_sgtable_alloc(struct brcmf_sdio_dev *sdiodev)
-- {
--+ struct sdio_func *func;
--+ struct mmc_host *host;
--+ uint max_blocks;
-- uint nents;
-- int err;
--
--+ func = sdiodev->func[2];
--+ host = func->card->host;
--+ sdiodev->sg_support = host->max_segs > 1;
--+ max_blocks = min_t(uint, host->max_blk_count, 511u);
--+ sdiodev->max_request_size = min_t(uint, host->max_req_size,
--+ max_blocks * func->cur_blksize);
--+ sdiodev->max_segment_count = min_t(uint, host->max_segs,
--+ SG_MAX_SINGLE_ALLOC);
--+ sdiodev->max_segment_size = host->max_seg_size;
--+
-- if (!sdiodev->sg_support)
-- return;
--
--@@ -1021,9 +1034,6 @@ static void brcmf_sdiod_host_fixup(struc
--
-- static int brcmf_sdiod_probe(struct brcmf_sdio_dev *sdiodev)
-- {
--- struct sdio_func *func;
--- struct mmc_host *host;
--- uint max_blocks;
-- int ret = 0;
--
-- sdiodev->num_funcs = 2;
--@@ -1054,26 +1064,6 @@ static int brcmf_sdiod_probe(struct brcm
-- goto out;
-- }
--
--- /*
--- * determine host related variables after brcmf_sdiod_probe()
--- * as func->cur_blksize is properly set and F2 init has been
--- * completed successfully.
--- */
--- func = sdiodev->func[2];
--- host = func->card->host;
--- sdiodev->sg_support = host->max_segs > 1;
--- max_blocks = min_t(uint, host->max_blk_count, 511u);
--- sdiodev->max_request_size = min_t(uint, host->max_req_size,
--- max_blocks * func->cur_blksize);
--- sdiodev->max_segment_count = min_t(uint, host->max_segs,
--- SG_MAX_SINGLE_ALLOC);
--- sdiodev->max_segment_size = host->max_seg_size;
---
--- /* allocate scatter-gather table. sg support
--- * will be disabled upon allocation failure.
--- */
--- brcmf_sdiod_sgtable_alloc(sdiodev);
---
-- ret = brcmf_sdiod_freezer_attach(sdiodev);
-- if (ret)
-- goto out;
--@@ -1084,7 +1074,7 @@ static int brcmf_sdiod_probe(struct brcm
-- ret = -ENODEV;
-- goto out;
-- }
--- brcmf_sdiod_host_fixup(host);
--+ brcmf_sdiod_host_fixup(sdiodev->func[2]->card->host);
-- out:
-- if (ret)
-- brcmf_sdiod_remove(sdiodev);
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
--@@ -4114,6 +4114,11 @@ struct brcmf_sdio *brcmf_sdio_probe(stru
-- goto fail;
-- }
--
--+ /* allocate scatter-gather table. sg support
--+ * will be disabled upon allocation failure.
--+ */
--+ brcmf_sdiod_sgtable_alloc(bus->sdiodev);
--+
-- /* Query the F2 block size, set roundup accordingly */
-- bus->blocksize = bus->sdiodev->func[2]->cur_blksize;
-- bus->roundup = min(max_roundup, bus->blocksize);
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h
--@@ -342,6 +342,7 @@ int brcmf_sdiod_ramrw(struct brcmf_sdio_
--
-- /* Issue an abort to the specified function */
-- int brcmf_sdiod_abort(struct brcmf_sdio_dev *sdiodev, uint fn);
--+void brcmf_sdiod_sgtable_alloc(struct brcmf_sdio_dev *sdiodev);
-- void brcmf_sdiod_change_state(struct brcmf_sdio_dev *sdiodev,
-- enum brcmf_sdiod_state state);
-- #ifdef CONFIG_PM_SLEEP
-diff --git a/package/kernel/mac80211/patches/309-cfg80211-fix-proto-in-ieee80211_data_to_8023-for-fra.patch b/package/kernel/mac80211/patches/309-cfg80211-fix-proto-in-ieee80211_data_to_8023-for-fra.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..41c27cac4129547e1e6df0f4ed96d61279c13a44
---- /dev/null
-+++ b/package/kernel/mac80211/patches/309-cfg80211-fix-proto-in-ieee80211_data_to_8023-for-fra.patch
-@@ -0,0 +1,37 @@
-+From: Felix Fietkau <nbd@nbd.name>
-+Date: Wed, 29 Jun 2016 10:02:32 +0200
-+Subject: [PATCH] cfg80211: fix proto in ieee80211_data_to_8023 for frames
-+ without LLC header
-+
-+The PDU length of incoming LLC frames is set to the total skb payload size
-+in __ieee80211_data_to_8023() of net/wireless/util.c which incorrectly
-+includes the length of the IEEE 802.11 header.
-+
-+The resulting LLC frame header has a too large PDU length, causing the
-+llc_fixup_skb() function of net/llc/llc_input.c to reject the incoming
-+skb, effectively breaking STP.
-+
-+Solve the problem by properly substracting the IEEE 802.11 frame header size
-+from the PDU length, allowing the LLC processor to pick up the incoming
-+control messages.
-+
-+Special thanks to Gerry Rozema for tracking down the regression and proposing
-+a suitable patch.
-+
-+Fixes: 2d1c304cb2d5 ("cfg80211: add function for 802.3 conversion with separate output buffer")
-+Cc: stable@vger.kernel.org
-+Reported-by: Gerry Rozema <gerryr@rozeware.com>
-+Signed-off-by: Felix Fietkau <nbd@nbd.name>
-+---
-+
-+--- a/net/wireless/util.c
-++++ b/net/wireless/util.c
-+@@ -509,7 +509,7 @@ static int __ieee80211_data_to_8023(stru
-+ * replace EtherType */
-+ hdrlen += ETH_ALEN + 2;
-+ else
-+- tmp.h_proto = htons(skb->len);
-++ tmp.h_proto = htons(skb->len - hdrlen);
-+
-+ pskb_pull(skb, hdrlen);
-+
-diff --git a/package/kernel/mac80211/patches/310-ath9k_hw-ignore-eeprom-magic-mismatch-on-flash-based.patch b/package/kernel/mac80211/patches/310-ath9k_hw-ignore-eeprom-magic-mismatch-on-flash-based.patch
-deleted file mode 100644
-index 287d6e13bd4a1dd4132cc2020a626e6bc60083fd..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/310-ath9k_hw-ignore-eeprom-magic-mismatch-on-flash-based.patch
-+++ /dev/null
-@@ -1,38 +0,0 @@
--From: Felix Fietkau <nbd@openwrt.org>
--Date: Thu, 21 Jan 2016 16:28:44 +0100
--Subject: [PATCH] ath9k_hw: ignore eeprom magic mismatch on flash based devices
--
--Many AR913x based devices (maybe others too) do not have a valid EEPROM
--magic in their calibration data partition.
--
--Fixes: 6fa658fd5ab2 ("ath9k: Simplify and fix eeprom endianness swapping")
--Signed-off-by: Felix Fietkau <nbd@openwrt.org>
-----
--
----- a/drivers/net/wireless/ath/ath9k/eeprom.c
--+++ b/drivers/net/wireless/ath/ath9k/eeprom.c
--@@ -150,18 +150,18 @@ int ath9k_hw_nvram_swap_data(struct ath_
-- return -EIO;
-- }
--
--- if (magic == AR5416_EEPROM_MAGIC) {
--- *swap_needed = false;
--- } else if (swab16(magic) == AR5416_EEPROM_MAGIC) {
--+ *swap_needed = false;
--+ if (swab16(magic) == AR5416_EEPROM_MAGIC) {
-- if (ah->ah_flags & AH_NO_EEP_SWAP) {
-- ath_info(common,
-- "Ignoring endianness difference in EEPROM magic bytes.\n");
---
--- *swap_needed = false;
-- } else {
-- *swap_needed = true;
-- }
--- } else {
--+ } else if (magic != AR5416_EEPROM_MAGIC) {
--+ if (ath9k_hw_use_flash(ah))
--+ return 0;
--+
-- ath_err(common,
-- "Invalid EEPROM Magic (0x%04x).\n", magic);
-- return -EINVAL;
-diff --git a/package/kernel/mac80211/patches/310-mac80211-minstrel-Enable-STBC-and-LDPC-for-VHT-Rates.patch b/package/kernel/mac80211/patches/310-mac80211-minstrel-Enable-STBC-and-LDPC-for-VHT-Rates.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..25929c98136c33e4e18be47c1a4c1f8c756220ba
---- /dev/null
-+++ b/package/kernel/mac80211/patches/310-mac80211-minstrel-Enable-STBC-and-LDPC-for-VHT-Rates.patch
-@@ -0,0 +1,81 @@
-+From: Chaitanya T K <chaitanya.mgit@gmail.com>
-+Date: Mon, 27 Jun 2016 15:23:26 +0530
-+Subject: [PATCH] mac80211: minstrel: Enable STBC and LDPC for VHT Rates
-+
-+If peer support reception of STBC and LDPC, enable them for better
-+performance.
-+
-+Signed-off-by: Chaitanya TK <chaitanya.mgit@gmail.com>
-+---
-+
-+--- a/include/linux/ieee80211.h
-++++ b/include/linux/ieee80211.h
-+@@ -1550,6 +1550,7 @@ struct ieee80211_vht_operation {
-+ #define IEEE80211_VHT_CAP_RXSTBC_3 0x00000300
-+ #define IEEE80211_VHT_CAP_RXSTBC_4 0x00000400
-+ #define IEEE80211_VHT_CAP_RXSTBC_MASK 0x00000700
-++#define IEEE80211_VHT_CAP_RXSTBC_SHIFT 8
-+ #define IEEE80211_VHT_CAP_SU_BEAMFORMER_CAPABLE 0x00000800
-+ #define IEEE80211_VHT_CAP_SU_BEAMFORMEE_CAPABLE 0x00001000
-+ #define IEEE80211_VHT_CAP_BEAMFORMEE_STS_SHIFT 13
-+--- a/net/mac80211/rc80211_minstrel_ht.c
-++++ b/net/mac80211/rc80211_minstrel_ht.c
-+@@ -1166,13 +1166,14 @@ minstrel_ht_update_caps(void *priv, stru
-+ struct minstrel_ht_sta_priv *msp = priv_sta;
-+ struct minstrel_ht_sta *mi = &msp->ht;
-+ struct ieee80211_mcs_info *mcs = &sta->ht_cap.mcs;
-+- u16 sta_cap = sta->ht_cap.cap;
-++ u16 ht_cap = sta->ht_cap.cap;
-+ struct ieee80211_sta_vht_cap *vht_cap = &sta->vht_cap;
-+ int use_vht;
-+ int n_supported = 0;
-+ int ack_dur;
-+ int stbc;
-+ int i;
-++ bool ldpc = false;
-+
-+ /* fall back to the old minstrel for legacy stations */
-+ if (!sta->ht_cap.ht_supported)
-+@@ -1210,16 +1211,24 @@ minstrel_ht_update_caps(void *priv, stru
-+ }
-+ mi->sample_tries = 4;
-+
-+- /* TODO tx_flags for vht - ATM the RC API is not fine-grained enough */
-+ if (!use_vht) {
-+- stbc = (sta_cap & IEEE80211_HT_CAP_RX_STBC) >>
-++ stbc = (ht_cap & IEEE80211_HT_CAP_RX_STBC) >>
-+ IEEE80211_HT_CAP_RX_STBC_SHIFT;
-+- mi->tx_flags |= stbc << IEEE80211_TX_CTL_STBC_SHIFT;
-+
-+- if (sta_cap & IEEE80211_HT_CAP_LDPC_CODING)
-+- mi->tx_flags |= IEEE80211_TX_CTL_LDPC;
-++ if (ht_cap & IEEE80211_HT_CAP_LDPC_CODING)
-++ ldpc = true;
-++ } else {
-++ stbc = (vht_cap->cap & IEEE80211_VHT_CAP_RXSTBC_MASK) >>
-++ IEEE80211_VHT_CAP_RXSTBC_SHIFT;
-++
-++ if (vht_cap->cap & IEEE80211_VHT_CAP_RXLDPC)
-++ ldpc = true;
-+ }
-+
-++ mi->tx_flags |= stbc << IEEE80211_TX_CTL_STBC_SHIFT;
-++ if (ldpc)
-++ mi->tx_flags |= IEEE80211_TX_CTL_LDPC;
-++
-+ for (i = 0; i < ARRAY_SIZE(mi->groups); i++) {
-+ u32 gflags = minstrel_mcs_groups[i].flags;
-+ int bw, nss;
-+@@ -1232,10 +1241,10 @@ minstrel_ht_update_caps(void *priv, stru
-+
-+ if (gflags & IEEE80211_TX_RC_SHORT_GI) {
-+ if (gflags & IEEE80211_TX_RC_40_MHZ_WIDTH) {
-+- if (!(sta_cap & IEEE80211_HT_CAP_SGI_40))
-++ if (!(ht_cap & IEEE80211_HT_CAP_SGI_40))
-+ continue;
-+ } else {
-+- if (!(sta_cap & IEEE80211_HT_CAP_SGI_20))
-++ if (!(ht_cap & IEEE80211_HT_CAP_SGI_20))
-+ continue;
-+ }
-+ }
-diff --git a/package/kernel/mac80211/patches/311-ath10k-disable-wake_tx_queue-for-older-devices.patch b/package/kernel/mac80211/patches/311-ath10k-disable-wake_tx_queue-for-older-devices.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..4cf26a631f4404b7b3a0c18ab8186203f405a50a
---- /dev/null
-+++ b/package/kernel/mac80211/patches/311-ath10k-disable-wake_tx_queue-for-older-devices.patch
-@@ -0,0 +1,73 @@
-+From: Michal Kazior <michal.kazior@tieto.com>
-+Date: Tue, 17 May 2016 14:47:01 +0200
-+Subject: [PATCH] ath10k: disable wake_tx_queue for older devices
-+
-+Some setups suffer performance regressions with
-+current wake_tx_queue implementation.
-+
-+Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
-+---
-+
-+--- a/drivers/net/wireless/ath/ath10k/core.h
-++++ b/drivers/net/wireless/ath/ath10k/core.h
-+@@ -667,6 +667,7 @@ struct ath10k_fw_components {
-+ struct ath10k {
-+ struct ath_common ath_common;
-+ struct ieee80211_hw *hw;
-++ struct ieee80211_ops *ops;
-+ struct device *dev;
-+ u8 mac_addr[ETH_ALEN];
-+
-+--- a/drivers/net/wireless/ath/ath10k/mac.c
-++++ b/drivers/net/wireless/ath/ath10k/mac.c
-+@@ -7497,21 +7497,32 @@ static const struct ieee80211_channel at
-+ struct ath10k *ath10k_mac_create(size_t priv_size)
-+ {
-+ struct ieee80211_hw *hw;
-++ struct ieee80211_ops *ops;
-+ struct ath10k *ar;
-+
-+- hw = ieee80211_alloc_hw(sizeof(struct ath10k) + priv_size, &ath10k_ops);
-+- if (!hw)
-++ ops = kmemdup(&ath10k_ops, sizeof(ath10k_ops), GFP_KERNEL);
-++ if (!ops)
-++ return NULL;
-++
-++ hw = ieee80211_alloc_hw(sizeof(struct ath10k) + priv_size, ops);
-++ if (!hw) {
-++ kfree(ops);
-+ return NULL;
-++ }
-+
-+ ar = hw->priv;
-+ ar->hw = hw;
-++ ar->ops = ops;
-+
-+ return ar;
-+ }
-+
-+ void ath10k_mac_destroy(struct ath10k *ar)
-+ {
-++ struct ieee80211_ops *ops = ar->ops;
-++
-+ ieee80211_free_hw(ar->hw);
-++ kfree(ops);
-+ }
-+
-+ static const struct ieee80211_iface_limit ath10k_if_limits[] = {
-+@@ -7945,6 +7956,15 @@ int ath10k_mac_register(struct ath10k *a
-+ ath10k_warn(ar, "failed to initialise DFS pattern detector\n");
-+ }
-+
-++ /* Current wake_tx_queue implementation imposes a significant
-++ * performance penalty in some setups. The tx scheduling code needs
-++ * more work anyway so disable the wake_tx_queue unless firmware
-++ * supports the pull-push mechanism.
-++ */
-++ if (!test_bit(ATH10K_FW_FEATURE_PEER_FLOW_CONTROL,
-++ ar->running_fw->fw_file.fw_features))
-++ ar->ops->wake_tx_queue = NULL;
-++
-+ ret = ath_regd_init(&ar->ath_common.regulatory, ar->hw->wiphy,
-+ ath10k_reg_notifier);
-+ if (ret) {
-diff --git a/package/kernel/mac80211/patches/311-ath9k-do-not-limit-the-number-of-DFS-interfaces-to-1.patch b/package/kernel/mac80211/patches/311-ath9k-do-not-limit-the-number-of-DFS-interfaces-to-1.patch
-deleted file mode 100644
-index 070efa98e834e0dfe2334fc0eb9bc433e0f037e8..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/311-ath9k-do-not-limit-the-number-of-DFS-interfaces-to-1.patch
-+++ /dev/null
-@@ -1,55 +0,0 @@
--From: Felix Fietkau <nbd@openwrt.org>
--Date: Fri, 22 Jan 2016 01:05:56 +0100
--Subject: [PATCH] ath9k: do not limit the number of DFS interfaces to 1
--
--Signed-off-by: Felix Fietkau <nbd@openwrt.org>
-----
--
----- a/drivers/net/wireless/ath/ath9k/init.c
--+++ b/drivers/net/wireless/ath/ath9k/init.c
--@@ -751,14 +751,6 @@ static const struct ieee80211_iface_comb
--
-- #endif /* CPTCFG_ATH9K_CHANNEL_CONTEXT */
--
---static const struct ieee80211_iface_limit if_dfs_limits[] = {
--- { .max = 1, .types = BIT(NL80211_IFTYPE_AP) |
---#ifdef CPTCFG_MAC80211_MESH
--- BIT(NL80211_IFTYPE_MESH_POINT) |
---#endif
--- BIT(NL80211_IFTYPE_ADHOC) },
---};
---
-- static const struct ieee80211_iface_combination if_comb[] = {
-- {
-- .limits = if_limits,
--@@ -766,6 +758,11 @@ static const struct ieee80211_iface_comb
-- .max_interfaces = 2048,
-- .num_different_channels = 1,
-- .beacon_int_infra_match = true,
--+#ifdef CPTCFG_ATH9K_DFS_CERTIFIED
--+ .radar_detect_widths = BIT(NL80211_CHAN_WIDTH_20_NOHT) |
--+ BIT(NL80211_CHAN_WIDTH_20) |
--+ BIT(NL80211_CHAN_WIDTH_40),
--+#endif
-- },
-- {
-- .limits = wds_limits,
--@@ -774,18 +771,6 @@ static const struct ieee80211_iface_comb
-- .num_different_channels = 1,
-- .beacon_int_infra_match = true,
-- },
---#ifdef CPTCFG_ATH9K_DFS_CERTIFIED
--- {
--- .limits = if_dfs_limits,
--- .n_limits = ARRAY_SIZE(if_dfs_limits),
--- .max_interfaces = 1,
--- .num_different_channels = 1,
--- .beacon_int_infra_match = true,
--- .radar_detect_widths = BIT(NL80211_CHAN_WIDTH_20_NOHT) |
--- BIT(NL80211_CHAN_WIDTH_20) |
--- BIT(NL80211_CHAN_WIDTH_40),
--- }
---#endif
-- };
--
-- #ifdef CPTCFG_ATH9K_CHANNEL_CONTEXT
-diff --git a/package/kernel/mac80211/patches/312-ath9k-Correct-TSF-adjustment-to-align-the-beacon-tim.patch b/package/kernel/mac80211/patches/312-ath9k-Correct-TSF-adjustment-to-align-the-beacon-tim.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..df43105cb8233828bef396d500b391731c5c580a
---- /dev/null
-+++ b/package/kernel/mac80211/patches/312-ath9k-Correct-TSF-adjustment-to-align-the-beacon-tim.patch
-@@ -0,0 +1,45 @@
-+From: Benjamin Berg <benjamin.berg@open-mesh.com>
-+Date: Mon, 4 Jul 2016 14:37:20 +0200
-+Subject: [PATCH] ath9k: Correct TSF adjustment to align the beacon time
-+ correctly
-+
-+Beacons were not send out at (timestamp % beacon_time == 0) for interfaces
-+other than the primary one. To send out beacons with the correct timestamp
-+according to 10.1.3.2 of the 802.11 standard the tsf_adjustment has to be
-+set to the negative time difference instead of positive. This way the
-+later beacons get corrected to have a lower (and similar) timestamp with
-+regard to the beacon from slot 0.
-+
-+I am not aware about any issues that have been caused by this.
-+
-+Signed-off-by: Benjamin Berg <benjamin.berg@open-mesh.com>
-+---
-+
-+--- a/drivers/net/wireless/ath/ath9k/beacon.c
-++++ b/drivers/net/wireless/ath/ath9k/beacon.c
-+@@ -279,17 +279,21 @@ static void ath9k_set_tsfadjust(struct a
-+ struct ath_common *common = ath9k_hw_common(sc->sc_ah);
-+ struct ath_vif *avp = (void *)vif->drv_priv;
-+ struct ath_beacon_config *cur_conf = &avp->chanctx->beacon;
-+- u32 tsfadjust;
-++ s64 tsfadjust;
-+
-+ if (avp->av_bslot == 0)
-+ return;
-+
-++ /* tsf_adjust is added to the TSF value. We send out the beacon late,
-++ * so need to adjust the TSF starting point to be later in time (i.e.
-++ * the theoretical first beacon has a TSF of 0 after correction).
-++ */
-+ tsfadjust = cur_conf->beacon_interval * avp->av_bslot;
-+- tsfadjust = TU_TO_USEC(tsfadjust) / ATH_BCBUF;
-++ tsfadjust = -TU_TO_USEC(tsfadjust) / ATH_BCBUF;
-+ avp->tsf_adjust = cpu_to_le64(tsfadjust);
-+
-+- ath_dbg(common, CONFIG, "tsfadjust is: %llu for bslot: %d\n",
-+- (unsigned long long)tsfadjust, avp->av_bslot);
-++ ath_dbg(common, CONFIG, "tsfadjust is: %lld for bslot: %d\n",
-++ (signed long long)tsfadjust, avp->av_bslot);
-+ }
-+
-+ bool ath9k_csa_is_finished(struct ath_softc *sc, struct ieee80211_vif *vif)
-diff --git a/package/kernel/mac80211/patches/312-mac80211-fix-txq-queue-related-crashes.patch b/package/kernel/mac80211/patches/312-mac80211-fix-txq-queue-related-crashes.patch
-deleted file mode 100644
-index 61cafc7625a8f8df5b67558a875794f5d20dbb99..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/312-mac80211-fix-txq-queue-related-crashes.patch
-+++ /dev/null
-@@ -1,27 +0,0 @@
--From: Michal Kazior <michal.kazior@tieto.com>
--Date: Thu, 21 Jan 2016 14:23:07 +0100
--Subject: [PATCH] mac80211: fix txq queue related crashes
--
--The driver can access the queue simultanously
--while mac80211 tears down the interface. Without
--spinlock protection this could lead to corrupting
--sk_buff_head and subsequently to an invalid
--pointer dereference.
--
--Fixes: ba8c3d6f16a1 ("mac80211: add an intermediate software queue implementation")
--Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
-----
--
----- a/net/mac80211/iface.c
--+++ b/net/mac80211/iface.c
--@@ -977,7 +977,10 @@ static void ieee80211_do_stop(struct iee
-- if (sdata->vif.txq) {
-- struct txq_info *txqi = to_txq_info(sdata->vif.txq);
--
--+ spin_lock_bh(&txqi->queue.lock);
-- ieee80211_purge_tx_queue(&local->hw, &txqi->queue);
--+ spin_unlock_bh(&txqi->queue.lock);
--+
-- atomic_set(&sdata->txqs_len[txqi->txq.ac], 0);
-- }
--
-diff --git a/package/kernel/mac80211/patches/313-ath9k-Handle-channel-context-in-get_-set_-reset_tsf.patch b/package/kernel/mac80211/patches/313-ath9k-Handle-channel-context-in-get_-set_-reset_tsf.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..ef0afbea9c60f69b6a55be1ce1f2dcd4c0d43928
---- /dev/null
-+++ b/package/kernel/mac80211/patches/313-ath9k-Handle-channel-context-in-get_-set_-reset_tsf.patch
-@@ -0,0 +1,70 @@
-+From: Benjamin Berg <benjamin.berg@open-mesh.com>
-+Date: Mon, 4 Jul 2016 14:37:21 +0200
-+Subject: [PATCH] ath9k: Handle channel context in get_/set_/reset_tsf
-+
-+The ath9k TSF handling routines need to be aware of the channel context that
-+is being modified. With this change the TSF related values that are stored
-+in each channel context will be correctly tracked and the harware will only
-+be updated if the modified context is currently the active one.
-+
-+Without this change the TSF modifications done using these routines would
-+for example be lost during a hardware reset as done by ath_complete_reset.
-+
-+Signed-off-by: Benjamin Berg <benjamin.berg@open-mesh.com>
-+---
-+
-+--- a/drivers/net/wireless/ath/ath9k/main.c
-++++ b/drivers/net/wireless/ath/ath9k/main.c
-+@@ -1823,11 +1823,18 @@ static void ath9k_bss_info_changed(struc
-+ static u64 ath9k_get_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
-+ {
-+ struct ath_softc *sc = hw->priv;
-++ struct ath_vif *avp = (void *)vif->drv_priv;
-+ u64 tsf;
-+
-+ mutex_lock(&sc->mutex);
-+ ath9k_ps_wakeup(sc);
-+- tsf = ath9k_hw_gettsf64(sc->sc_ah);
-++ /* Get current TSF either from HW or kernel time. */
-++ if (sc->cur_chan == avp->chanctx) {
-++ tsf = ath9k_hw_gettsf64(sc->sc_ah);
-++ } else {
-++ tsf = sc->cur_chan->tsf_val +
-++ ath9k_hw_get_tsf_offset(&sc->cur_chan->tsf_ts, NULL);
-++ }
-+ ath9k_ps_restore(sc);
-+ mutex_unlock(&sc->mutex);
-+
-+@@ -1839,10 +1846,14 @@ static void ath9k_set_tsf(struct ieee802
-+ u64 tsf)
-+ {
-+ struct ath_softc *sc = hw->priv;
-++ struct ath_vif *avp = (void *)vif->drv_priv;
-+
-+ mutex_lock(&sc->mutex);
-+ ath9k_ps_wakeup(sc);
-+- ath9k_hw_settsf64(sc->sc_ah, tsf);
-++ getrawmonotonic(&avp->chanctx->tsf_ts);
-++ if (sc->cur_chan == avp->chanctx)
-++ ath9k_hw_settsf64(sc->sc_ah, tsf);
-++ avp->chanctx->tsf_val = tsf;
-+ ath9k_ps_restore(sc);
-+ mutex_unlock(&sc->mutex);
-+ }
-+@@ -1850,11 +1861,15 @@ static void ath9k_set_tsf(struct ieee802
-+ static void ath9k_reset_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif)
-+ {
-+ struct ath_softc *sc = hw->priv;
-++ struct ath_vif *avp = (void *)vif->drv_priv;
-+
-+ mutex_lock(&sc->mutex);
-+
-+ ath9k_ps_wakeup(sc);
-+- ath9k_hw_reset_tsf(sc->sc_ah);
-++ getrawmonotonic(&avp->chanctx->tsf_ts);
-++ if (sc->cur_chan == avp->chanctx)
-++ ath9k_hw_reset_tsf(sc->sc_ah);
-++ avp->chanctx->tsf_val = 0;
-+ ath9k_ps_restore(sc);
-+
-+ mutex_unlock(&sc->mutex);
-diff --git a/package/kernel/mac80211/patches/313-mac80211-fix-unnecessary-frame-drops-in-mesh-fwding.patch b/package/kernel/mac80211/patches/313-mac80211-fix-unnecessary-frame-drops-in-mesh-fwding.patch
-deleted file mode 100644
-index 844d43bfc7875b937d8c67aba60f1204bcb7020a..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/313-mac80211-fix-unnecessary-frame-drops-in-mesh-fwding.patch
-+++ /dev/null
-@@ -1,57 +0,0 @@
--From: Michal Kazior <michal.kazior@tieto.com>
--Date: Mon, 25 Jan 2016 14:43:24 +0100
--Subject: [PATCH] mac80211: fix unnecessary frame drops in mesh fwding
--
--The ieee80211_queue_stopped() expects hw queue
--number but it was given raw WMM AC number instead.
--
--This could cause frame drops and problems with
--traffic in some cases - most notably if driver
--doesn't map AC numbers to queue numbers 1:1 and
--uses ieee80211_stop_queues() and
--ieee80211_wake_queue() only without ever calling
--ieee80211_wake_queues().
--
--On ath10k it was possible to hit this problem in
--the following case:
--
-- 1. wlan0 uses queue 0
-- (ath10k maps queues per vif)
-- 2. offchannel uses queue 15
-- 3. queues 1-14 are unused
-- 4. ieee80211_stop_queues()
-- 5. ieee80211_wake_queue(q=0)
-- 6. ieee80211_wake_queue(q=15)
-- (other queues are not woken up because both
-- driver and mac80211 know other queues are
-- unused)
-- 7. ieee80211_rx_h_mesh_fwding()
-- 8. ieee80211_select_queue_80211() returns 2
-- 9. ieee80211_queue_stopped(q=2) returns true
-- 10. frame is dropped (oops!)
--
--Fixes: d3c1597b8d1b ("mac80211: fix forwarded mesh frame queue mapping")
--Signed-off-by: Michal Kazior <michal.kazior@tieto.com>
-----
--
----- a/net/mac80211/rx.c
--+++ b/net/mac80211/rx.c
--@@ -2235,7 +2235,7 @@ ieee80211_rx_h_mesh_fwding(struct ieee80
-- struct ieee80211_local *local = rx->local;
-- struct ieee80211_sub_if_data *sdata = rx->sdata;
-- struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh;
--- u16 q, hdrlen;
--+ u16 ac, q, hdrlen;
--
-- hdr = (struct ieee80211_hdr *) skb->data;
-- hdrlen = ieee80211_hdrlen(hdr->frame_control);
--@@ -2304,7 +2304,8 @@ ieee80211_rx_h_mesh_fwding(struct ieee80
-- ether_addr_equal(sdata->vif.addr, hdr->addr3))
-- return RX_CONTINUE;
--
--- q = ieee80211_select_queue_80211(sdata, skb, hdr);
--+ ac = ieee80211_select_queue_80211(sdata, skb, hdr);
--+ q = sdata->vif.hw_queue[ac];
-- if (ieee80211_queue_stopped(&local->hw, q)) {
-- IEEE80211_IFSTA_MESH_CTR_INC(ifmsh, dropped_frames_congestion);
-- return RX_DROP_MONITOR;
-diff --git a/package/kernel/mac80211/patches/314-ath9k-Use-tsf-offset-helper-in-ath9k_hw_reset.patch b/package/kernel/mac80211/patches/314-ath9k-Use-tsf-offset-helper-in-ath9k_hw_reset.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..e725a8bd6099ad12d0151b90241489f063a5196d
---- /dev/null
-+++ b/package/kernel/mac80211/patches/314-ath9k-Use-tsf-offset-helper-in-ath9k_hw_reset.patch
-@@ -0,0 +1,65 @@
-+From: Benjamin Berg <benjamin.berg@open-mesh.com>
-+Date: Mon, 4 Jul 2016 14:37:22 +0200
-+Subject: [PATCH] ath9k: Use tsf offset helper in ath9k_hw_reset
-+
-+These changes make ath9k_hw_reset more consistent with other places that
-+handle the TSF value by using the same helper routine.
-+
-+A slight improvement is to not assume that a fixed time of 1.5ms has
-+passed for the initval writes when compared to the first write attempt.
-+Instead the TSF value is re-calculated which will yield a higher accuracy
-+of the restored TSF timer.
-+
-+Signed-off-by: Benjamin Berg <benjamin.berg@open-mesh.com>
-+---
-+
-+--- a/drivers/net/wireless/ath/ath9k/hw.c
-++++ b/drivers/net/wireless/ath/ath9k/hw.c
-+@@ -1832,8 +1832,9 @@ int ath9k_hw_reset(struct ath_hw *ah, st
-+ u32 saveLedState;
-+ u32 saveDefAntenna;
-+ u32 macStaId1;
-++ struct timespec tsf_ts;
-++ u32 tsf_offset;
-+ u64 tsf = 0;
-+- s64 usec = 0;
-+ int r;
-+ bool start_mci_reset = false;
-+ bool save_fullsleep = ah->chip_fullsleep;
-+@@ -1877,8 +1878,8 @@ int ath9k_hw_reset(struct ath_hw *ah, st
-+ macStaId1 = REG_READ(ah, AR_STA_ID1) & AR_STA_ID1_BASE_RATE_11B;
-+
-+ /* Save TSF before chip reset, a cold reset clears it */
-++ getrawmonotonic(&tsf_ts);
-+ tsf = ath9k_hw_gettsf64(ah);
-+- usec = ktime_to_us(ktime_get_raw());
-+
-+ saveLedState = REG_READ(ah, AR_CFG_LED) &
-+ (AR_CFG_LED_ASSOC_CTL | AR_CFG_LED_MODE_SEL |
-+@@ -1911,8 +1912,8 @@ int ath9k_hw_reset(struct ath_hw *ah, st
-+ }
-+
-+ /* Restore TSF */
-+- usec = ktime_to_us(ktime_get_raw()) - usec;
-+- ath9k_hw_settsf64(ah, tsf + usec);
-++ tsf_offset = ath9k_hw_get_tsf_offset(&tsf_ts, NULL);
-++ ath9k_hw_settsf64(ah, tsf + tsf_offset);
-+
-+ if (AR_SREV_9280_20_OR_LATER(ah))
-+ REG_SET_BIT(ah, AR_GPIO_INPUT_EN_VAL, AR_GPIO_JTAG_DISABLE);
-+@@ -1932,12 +1933,11 @@ int ath9k_hw_reset(struct ath_hw *ah, st
-+ /*
-+ * Some AR91xx SoC devices frequently fail to accept TSF writes
-+ * right after the chip reset. When that happens, write a new
-+- * value after the initvals have been applied, with an offset
-+- * based on measured time difference
-++ * value after the initvals have been applied.
-+ */
-+ if (AR_SREV_9100(ah) && (ath9k_hw_gettsf64(ah) < tsf)) {
-+- tsf += 1500;
-+- ath9k_hw_settsf64(ah, tsf);
-++ tsf_offset = ath9k_hw_get_tsf_offset(&tsf_ts, NULL);
-++ ath9k_hw_settsf64(ah, tsf + tsf_offset);
-+ }
-+
-+ ath9k_hw_init_mfp(ah);
-diff --git a/package/kernel/mac80211/patches/314-mac80211-Requeue-work-after-scan-complete-for-all-VI.patch b/package/kernel/mac80211/patches/314-mac80211-Requeue-work-after-scan-complete-for-all-VI.patch
-deleted file mode 100644
-index 5b3efbdc5aff65de96b959fbc250f7ddde0c5459..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/314-mac80211-Requeue-work-after-scan-complete-for-all-VI.patch
-+++ /dev/null
-@@ -1,103 +0,0 @@
--From: Sachin Kulkarni <Sachin.Kulkarni@imgtec.com>
--Date: Tue, 12 Jan 2016 14:30:19 +0530
--Subject: [PATCH] mac80211: Requeue work after scan complete for all VIF
-- types.
--
--During a sw scan ieee80211_iface_work ignores work items for all vifs.
--However after the scan complete work is requeued only for STA, ADHOC
--and MESH iftypes.
--
--This occasionally results in event processing getting delayed/not
--processed for iftype AP when it coexists with a STA. This can result
--in data halt and eventually disconnection on the AP interface.
--
--Signed-off-by: Sachin Kulkarni <Sachin.Kulkarni@imgtec.com>
--Cc: linux-wireless@vger.kernel.org
--Cc: johannes@sipsolutions.net
-----
--
----- a/net/mac80211/ibss.c
--+++ b/net/mac80211/ibss.c
--@@ -1731,7 +1731,6 @@ void ieee80211_ibss_notify_scan_complete
-- if (sdata->vif.type != NL80211_IFTYPE_ADHOC)
-- continue;
-- sdata->u.ibss.last_scan_completed = jiffies;
--- ieee80211_queue_work(&local->hw, &sdata->work);
-- }
-- mutex_unlock(&local->iflist_mtx);
-- }
----- a/net/mac80211/mesh.c
--+++ b/net/mac80211/mesh.c
--@@ -1369,17 +1369,6 @@ out:
-- sdata_unlock(sdata);
-- }
--
---void ieee80211_mesh_notify_scan_completed(struct ieee80211_local *local)
---{
--- struct ieee80211_sub_if_data *sdata;
---
--- rcu_read_lock();
--- list_for_each_entry_rcu(sdata, &local->interfaces, list)
--- if (ieee80211_vif_is_mesh(&sdata->vif) &&
--- ieee80211_sdata_running(sdata))
--- ieee80211_queue_work(&local->hw, &sdata->work);
--- rcu_read_unlock();
---}
--
-- void ieee80211_mesh_init_sdata(struct ieee80211_sub_if_data *sdata)
-- {
----- a/net/mac80211/mesh.h
--+++ b/net/mac80211/mesh.h
--@@ -362,14 +362,10 @@ static inline bool mesh_path_sel_is_hwmp
-- return sdata->u.mesh.mesh_pp_id == IEEE80211_PATH_PROTOCOL_HWMP;
-- }
--
---void ieee80211_mesh_notify_scan_completed(struct ieee80211_local *local);
---
-- void mesh_path_flush_by_iface(struct ieee80211_sub_if_data *sdata);
-- void mesh_sync_adjust_tbtt(struct ieee80211_sub_if_data *sdata);
-- void ieee80211s_stop(void);
-- #else
---static inline void
---ieee80211_mesh_notify_scan_completed(struct ieee80211_local *local) {}
-- static inline bool mesh_path_sel_is_hwmp(struct ieee80211_sub_if_data *sdata)
-- { return false; }
-- static inline void mesh_path_flush_by_iface(struct ieee80211_sub_if_data *sdata)
----- a/net/mac80211/mlme.c
--+++ b/net/mac80211/mlme.c
--@@ -3978,8 +3978,6 @@ static void ieee80211_restart_sta_timer(
-- if (!ieee80211_hw_check(&sdata->local->hw, CONNECTION_MONITOR))
-- ieee80211_queue_work(&sdata->local->hw,
-- &sdata->u.mgd.monitor_work);
--- /* and do all the other regular work too */
--- ieee80211_queue_work(&sdata->local->hw, &sdata->work);
-- }
-- }
--
----- a/net/mac80211/scan.c
--+++ b/net/mac80211/scan.c
--@@ -314,6 +314,7 @@ static void __ieee80211_scan_completed(s
-- bool was_scanning = local->scanning;
-- struct cfg80211_scan_request *scan_req;
-- struct ieee80211_sub_if_data *scan_sdata;
--+ struct ieee80211_sub_if_data *sdata;
--
-- lockdep_assert_held(&local->mtx);
--
--@@ -373,7 +374,15 @@ static void __ieee80211_scan_completed(s
--
-- ieee80211_mlme_notify_scan_completed(local);
-- ieee80211_ibss_notify_scan_completed(local);
--- ieee80211_mesh_notify_scan_completed(local);
--+
--+ /* Requeue all the work that might have been ignored while
--+ * the scan was in progress
--+ */
--+ list_for_each_entry_rcu(sdata, &local->interfaces, list) {
--+ if (ieee80211_sdata_running(sdata))
--+ ieee80211_queue_work(&sdata->local->hw, &sdata->work);
--+ }
--+
-- if (was_scanning)
-- ieee80211_start_next_roc(local);
-- }
-diff --git a/package/kernel/mac80211/patches/315-ath9k-Expose-tsf_adjustment-in-mac80211-tsf-getters-.patch b/package/kernel/mac80211/patches/315-ath9k-Expose-tsf_adjustment-in-mac80211-tsf-getters-.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..c95ab7e644c4c932b619ae9b09a16a91347fc8da
---- /dev/null
-+++ b/package/kernel/mac80211/patches/315-ath9k-Expose-tsf_adjustment-in-mac80211-tsf-getters-.patch
-@@ -0,0 +1,32 @@
-+From: Benjamin Berg <benjamin.berg@open-mesh.com>
-+Date: Mon, 4 Jul 2016 14:37:23 +0200
-+Subject: [PATCH] ath9k: Expose tsf_adjustment in mac80211 tsf getters and
-+ setters.
-+
-+The ath9k driver modifies the TSF for VIFs for the purpose of sending
-+beacons in a staggered fashion. This patch exposes this VIF specific
-+adjustment of the TSF value to mac80211. Without the change the TSF
-+routines handle the hardware TSF value instead of the actual TSF value as
-+seen on the air.
-+
-+Signed-off-by: Benjamin Berg <benjamin.berg@open-mesh.com>
-+---
-+
-+--- a/drivers/net/wireless/ath/ath9k/main.c
-++++ b/drivers/net/wireless/ath/ath9k/main.c
-+@@ -1835,6 +1835,7 @@ static u64 ath9k_get_tsf(struct ieee8021
-+ tsf = sc->cur_chan->tsf_val +
-+ ath9k_hw_get_tsf_offset(&sc->cur_chan->tsf_ts, NULL);
-+ }
-++ tsf += le64_to_cpu(avp->tsf_adjust);
-+ ath9k_ps_restore(sc);
-+ mutex_unlock(&sc->mutex);
-+
-+@@ -1850,6 +1851,7 @@ static void ath9k_set_tsf(struct ieee802
-+
-+ mutex_lock(&sc->mutex);
-+ ath9k_ps_wakeup(sc);
-++ tsf -= le64_to_cpu(avp->tsf_adjust);
-+ getrawmonotonic(&avp->chanctx->tsf_ts);
-+ if (sc->cur_chan == avp->chanctx)
-+ ath9k_hw_settsf64(sc->sc_ah, tsf);
-diff --git a/package/kernel/mac80211/patches/315-mac80211-fix-ibss-scan-parameters.patch b/package/kernel/mac80211/patches/315-mac80211-fix-ibss-scan-parameters.patch
-deleted file mode 100644
-index 52fecb96b002de8ed650e2155f846cbcc9ba0900..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/315-mac80211-fix-ibss-scan-parameters.patch
-+++ /dev/null
-@@ -1,57 +0,0 @@
--From: Sara Sharon <sara.sharon@intel.com>
--Date: Mon, 25 Jan 2016 15:46:35 +0200
--Subject: [PATCH] mac80211: fix ibss scan parameters
--
--When joining IBSS a full scan should be initiated in order to search
--for existing cell, unless the fixed_channel parameter was set.
--A default channel to create the IBSS on if no cell was found is
--provided as well.
--However - a scan is initiated only on the default channel provided
--regardless of whether ifibss->fixed_channel is set or not, with the
--obvious result of the cell not joining existing IBSS cell that is
--on another channel.
--
--Fixes: 76bed0f43b27 ("mac80211: IBSS fix scan request")
--Signed-off-by: Sara Sharon <sara.sharon@intel.com>
--Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
-----
--
----- a/net/mac80211/ibss.c
--+++ b/net/mac80211/ibss.c
--@@ -7,6 +7,7 @@
-- * Copyright 2007, Michael Wu <flamingice@sourmilk.net>
-- * Copyright 2009, Johannes Berg <johannes@sipsolutions.net>
-- * Copyright 2013-2014 Intel Mobile Communications GmbH
--+ * Copyright(c) 2016 Intel Deutschland GmbH
-- *
-- * This program is free software; you can redistribute it and/or modify
-- * it under the terms of the GNU General Public License version 2 as
--@@ -1483,14 +1484,21 @@ static void ieee80211_sta_find_ibss(stru
--
-- sdata_info(sdata, "Trigger new scan to find an IBSS to join\n");
--
--- num = ieee80211_ibss_setup_scan_channels(local->hw.wiphy,
--- &ifibss->chandef,
--- channels,
--- ARRAY_SIZE(channels));
-- scan_width = cfg80211_chandef_to_scan_width(&ifibss->chandef);
--- ieee80211_request_ibss_scan(sdata, ifibss->ssid,
--- ifibss->ssid_len, channels, num,
--- scan_width);
--+
--+ if (ifibss->fixed_channel) {
--+ num = ieee80211_ibss_setup_scan_channels(local->hw.wiphy,
--+ &ifibss->chandef,
--+ channels,
--+ ARRAY_SIZE(channels));
--+ ieee80211_request_ibss_scan(sdata, ifibss->ssid,
--+ ifibss->ssid_len, channels,
--+ num, scan_width);
--+ } else {
--+ ieee80211_request_ibss_scan(sdata, ifibss->ssid,
--+ ifibss->ssid_len, NULL,
--+ 0, scan_width);
--+ }
-- } else {
-- int interval = IEEE80211_SCAN_INTERVAL;
--
-diff --git a/package/kernel/mac80211/patches/316-ath9k-Remove-some-defined-constants-to-decrease-verb.patch b/package/kernel/mac80211/patches/316-ath9k-Remove-some-defined-constants-to-decrease-verb.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..36aaa1030ea87569202cd109bb59479cbb0b64e5
---- /dev/null
-+++ b/package/kernel/mac80211/patches/316-ath9k-Remove-some-defined-constants-to-decrease-verb.patch
-@@ -0,0 +1,137 @@
-+From: Benjamin Berg <benjamin.berg@open-mesh.com>
-+Date: Mon, 4 Jul 2016 14:37:24 +0200
-+Subject: [PATCH] ath9k: Remove some #defined constants to decrease
-+ verbosity
-+
-+The removed ATH9K_SLOT_TIME_X constants simply map the value in microseconds
-+to the same integer. These constants were not used consistently, so fix the
-+inconsistency issue by replacing all occurances with the integer equivalent.
-+
-+Signed-off-by: Benjamin Berg <benjamin.berg@open-mesh.com>
-+---
-+
-+--- a/drivers/net/wireless/ath/ath9k/beacon.c
-++++ b/drivers/net/wireless/ath/ath9k/beacon.c
-+@@ -50,7 +50,7 @@ static void ath9k_beaconq_config(struct
-+ txq = sc->tx.txq_map[IEEE80211_AC_BE];
-+ ath9k_hw_get_txq_props(ah, txq->axq_qnum, &qi_be);
-+ qi.tqi_aifs = qi_be.tqi_aifs;
-+- if (ah->slottime == ATH9K_SLOT_TIME_20)
-++ if (ah->slottime == 20)
-+ qi.tqi_cwmin = 2*qi_be.tqi_cwmin;
-+ else
-+ qi.tqi_cwmin = 4*qi_be.tqi_cwmin;
-+--- a/drivers/net/wireless/ath/ath9k/dynack.c
-++++ b/drivers/net/wireless/ath/ath9k/dynack.c
-+@@ -280,7 +280,7 @@ EXPORT_SYMBOL(ath_dynack_sample_ack_ts);
-+ void ath_dynack_node_init(struct ath_hw *ah, struct ath_node *an)
-+ {
-+ /* ackto = slottime + sifs + air delay */
-+- u32 ackto = ATH9K_SLOT_TIME_9 + 16 + 64;
-++ u32 ackto = 9 + 16 + 64;
-+ struct ath_dynack *da = &ah->dynack;
-+
-+ an->ackto = ackto;
-+@@ -315,7 +315,7 @@ EXPORT_SYMBOL(ath_dynack_node_deinit);
-+ void ath_dynack_reset(struct ath_hw *ah)
-+ {
-+ /* ackto = slottime + sifs + air delay */
-+- u32 ackto = ATH9K_SLOT_TIME_9 + 16 + 64;
-++ u32 ackto = 9 + 16 + 64;
-+ struct ath_dynack *da = &ah->dynack;
-+
-+ da->lto = jiffies;
-+--- a/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c
-++++ b/drivers/net/wireless/ath/ath9k/htc_drv_beacon.c
-+@@ -45,7 +45,7 @@ void ath9k_htc_beaconq_config(struct ath
-+ * Long slot time : 2x cwmin
-+ * Short slot time : 4x cwmin
-+ */
-+- if (ah->slottime == ATH9K_SLOT_TIME_20)
-++ if (ah->slottime == 20)
-+ qi.tqi_cwmin = 2*qi_be.tqi_cwmin;
-+ else
-+ qi.tqi_cwmin = 4*qi_be.tqi_cwmin;
-+--- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c
-++++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
-+@@ -678,7 +678,7 @@ static int ath9k_init_priv(struct ath9k_
-+
-+ for (i = 0; i < ATH9K_HTC_MAX_BCN_VIF; i++)
-+ priv->beacon.bslot[i] = NULL;
-+- priv->beacon.slottime = ATH9K_SLOT_TIME_9;
-++ priv->beacon.slottime = 9;
-+
-+ ath9k_cmn_init_channels_rates(common);
-+ ath9k_cmn_init_crypto(ah);
-+--- a/drivers/net/wireless/ath/ath9k/hw.c
-++++ b/drivers/net/wireless/ath/ath9k/hw.c
-+@@ -454,7 +454,7 @@ static void ath9k_hw_init_defaults(struc
-+ if (AR_SREV_9100(ah))
-+ ah->sta_id1_defaults |= AR_STA_ID1_AR9100_BA_FIX;
-+
-+- ah->slottime = ATH9K_SLOT_TIME_9;
-++ ah->slottime = 9;
-+ ah->globaltxtimeout = (u32) -1;
-+ ah->power_mode = ATH9K_PM_UNDEFINED;
-+ ah->htc_reset_init = true;
-+--- a/drivers/net/wireless/ath/ath9k/init.c
-++++ b/drivers/net/wireless/ath/ath9k/init.c
-+@@ -372,7 +372,7 @@ static void ath9k_init_misc(struct ath_s
-+
-+ common->last_rssi = ATH_RSSI_DUMMY_MARKER;
-+ memcpy(common->bssidmask, ath_bcast_mac, ETH_ALEN);
-+- sc->beacon.slottime = ATH9K_SLOT_TIME_9;
-++ sc->beacon.slottime = 9;
-+
-+ for (i = 0; i < ARRAY_SIZE(sc->beacon.bslot); i++)
-+ sc->beacon.bslot[i] = NULL;
-+--- a/drivers/net/wireless/ath/ath9k/mac.h
-++++ b/drivers/net/wireless/ath/ath9k/mac.h
-+@@ -65,10 +65,6 @@
-+ #define INIT_SSH_RETRY 32
-+ #define INIT_SLG_RETRY 32
-+
-+-#define ATH9K_SLOT_TIME_6 6
-+-#define ATH9K_SLOT_TIME_9 9
-+-#define ATH9K_SLOT_TIME_20 20
-+-
-+ #define ATH9K_TXERR_XRETRY 0x01
-+ #define ATH9K_TXERR_FILT 0x02
-+ #define ATH9K_TXERR_FIFO 0x04
-+--- a/drivers/net/wireless/ath/ath9k/main.c
-++++ b/drivers/net/wireless/ath/ath9k/main.c
-+@@ -926,7 +926,7 @@ static void ath9k_vif_iter(struct ath9k_
-+ }
-+
-+ if (!vif->bss_conf.use_short_slot)
-+- iter_data->slottime = ATH9K_SLOT_TIME_20;
-++ iter_data->slottime = 20;
-+
-+ switch (vif->type) {
-+ case NL80211_IFTYPE_AP:
-+@@ -999,7 +999,7 @@ void ath9k_calculate_iter_data(struct at
-+ */
-+ memset(iter_data, 0, sizeof(*iter_data));
-+ eth_broadcast_addr(iter_data->mask);
-+- iter_data->slottime = ATH9K_SLOT_TIME_9;
-++ iter_data->slottime = 9;
-+
-+ list_for_each_entry(avp, &ctx->vifs, list)
-+ ath9k_vif_iter(iter_data, avp->vif->addr, avp->vif);
-+@@ -1061,7 +1061,7 @@ static void ath9k_set_offchannel_state(s
-+ ah->opmode = vif->type;
-+ ah->imask &= ~ATH9K_INT_SWBA;
-+ ah->imask &= ~ATH9K_INT_TSFOOR;
-+- ah->slottime = ATH9K_SLOT_TIME_9;
-++ ah->slottime = 9;
-+
-+ ath_hw_setbssidmask(common);
-+ ath9k_hw_setopmode(ah);
-+@@ -1788,6 +1788,7 @@ static void ath9k_bss_info_changed(struc
-+ slottime = 9;
-+ else
-+ slottime = 20;
-++
-+ if (vif->type == NL80211_IFTYPE_AP) {
-+ /*
-+ * Defer update, so that connected stations can adjust
-diff --git a/package/kernel/mac80211/patches/316-net-mac80211-agg-rx.c-fix-use-of-uninitialised-value.patch b/package/kernel/mac80211/patches/316-net-mac80211-agg-rx.c-fix-use-of-uninitialised-value.patch
-deleted file mode 100644
-index e78df366003ee0d1cb5402e7c0760d96c45a40d7..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/316-net-mac80211-agg-rx.c-fix-use-of-uninitialised-value.patch
-+++ /dev/null
-@@ -1,50 +0,0 @@
--From: Chris Bainbridge <chris.bainbridge@gmail.com>
--Date: Wed, 27 Jan 2016 15:46:18 +0000
--Subject: [PATCH] net/mac80211/agg-rx.c: fix use of uninitialised values
--
--Use kzalloc instead of kmalloc for struct tid_ampdu_rx. Fixes:
--
--[ 7.976605] UBSAN: Undefined behaviour in net/mac80211/rx.c:932:29
--[ 7.976608] load of value 2 is not a valid value for type '_Bool'
--[ 7.976611] CPU: 3 PID: 1134 Comm: kworker/u16:7 Not tainted 4.5.0-rc1+ #265
--[ 7.976613] Hardware name: Apple Inc. MacBookPro10,2/Mac-AFD8A9D944EA4843, BIOS MBP102.88Z.0106.B0A.1509130955 09/13/2015
--[ 7.976616] Workqueue: phy0 rt2x00usb_work_rxdone
--[ 7.976619] 0000000000000004 ffff880254a7ba50 ffffffff8181d866 0000000000000007
--[ 7.976622] ffff880254a7ba78 ffff880254a7ba68 ffffffff8188422d ffffffff8379b500
--[ 7.976626] ffff880254a7bab8 ffffffff81884747 0000000000000202 0000000348620032
--[ 7.976629] Call Trace:
--[ 7.976633] [<ffffffff8181d866>] dump_stack+0x45/0x5f
--[ 7.976637] [<ffffffff8188422d>] ubsan_epilogue+0xd/0x40
--[ 7.976642] [<ffffffff81884747>] __ubsan_handle_load_invalid_value+0x67/0x70
--[ 7.976646] [<ffffffff82227b4d>] ieee80211_sta_reorder_release.isra.16+0x5ed/0x730
--[ 7.976650] [<ffffffff8222ca14>] ieee80211_prepare_and_rx_handle+0xd04/0x1c00
--[ 7.976654] [<ffffffff81cb27ce>] ? usb_hcd_map_urb_for_dma+0x65e/0x960
--[ 7.976659] [<ffffffff8222db03>] __ieee80211_rx_handle_packet+0x1f3/0x750
--[ 7.976663] [<ffffffff8222e4a7>] ieee80211_rx_napi+0x447/0x990
--[ 7.976667] [<ffffffff81c5fb85>] rt2x00lib_rxdone+0x305/0xbd0
--[ 7.976670] [<ffffffff811ac23f>] ? dequeue_task_fair+0x64f/0x1de0
--[ 7.976674] [<ffffffff811a1516>] ? sched_clock_cpu+0xe6/0x150
--[ 7.976678] [<ffffffff81c6c45c>] rt2x00usb_work_rxdone+0x7c/0x140
--[ 7.976682] [<ffffffff8117aef6>] process_one_work+0x226/0x860
--[ 7.976686] [<ffffffff8117b58c>] worker_thread+0x5c/0x680
--[ 7.976690] [<ffffffff8117b530>] ? process_one_work+0x860/0x860
--[ 7.976693] [<ffffffff81184f86>] kthread+0xf6/0x150
--[ 7.976697] [<ffffffff81184e90>] ? kthread_worker_fn+0x310/0x310
--[ 7.976700] [<ffffffff822a94df>] ret_from_fork+0x3f/0x70
--[ 7.976703] [<ffffffff81184e90>] ? kthread_worker_fn+0x310/0x310
--
--Link: https://lkml.org/lkml/2016/1/26/230
--Signed-off-by: Chris Bainbridge <chris.bainbridge@gmail.com>
-----
--
----- a/net/mac80211/agg-rx.c
--+++ b/net/mac80211/agg-rx.c
--@@ -327,7 +327,7 @@ void __ieee80211_start_rx_ba_session(str
-- }
--
-- /* prepare A-MPDU MLME for Rx aggregation */
--- tid_agg_rx = kmalloc(sizeof(struct tid_ampdu_rx), GFP_KERNEL);
--+ tid_agg_rx = kzalloc(sizeof(struct tid_ampdu_rx), GFP_KERNEL);
-- if (!tid_agg_rx)
-- goto end;
--
-diff --git a/package/kernel/mac80211/patches/317-ath9k-Fix-beacon-configuration-for-addition-removal-.patch b/package/kernel/mac80211/patches/317-ath9k-Fix-beacon-configuration-for-addition-removal-.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..360dfbfafb9b2c98e4b679aa45db5c7a2e747a3b
---- /dev/null
-+++ b/package/kernel/mac80211/patches/317-ath9k-Fix-beacon-configuration-for-addition-removal-.patch
-@@ -0,0 +1,544 @@
-+From: Benjamin Berg <benjamin.berg@open-mesh.com>
-+Date: Mon, 4 Jul 2016 14:37:25 +0200
-+Subject: [PATCH] ath9k: Fix beacon configuration for addition/removal of
-+ interfaces
-+
-+This patch fixes some issues with interface reconfiguration. It could
-+for example happen that an AP interface in beacon slot 0 was removed
-+leaving an IBSS station in one of the other slots. When this happens
-+the driver never sends out the beacon as it only tries to send a beacon
-+from slot 0.
-+
-+Appart from that the tracking of required changes to the beacon config is
-+relatively complicated and prone to errors.
-+
-+The approach taken here is to solve reconfiguration issues is to
-+reconfigure the beacons when any interface changes. This means that
-+the complexity of deciding whether an interface change may modify the
-+beacon configuration is gone. It also means that the beacon config will
-+be reliably updated when an interface is removed.
-+
-+The issue that a single non-AP interface might not be in beacon
-+slot 0 and wouldn't be send out is solved by moving it into the
-+first slot. The TSF value in hardware is adjusted accordingly so
-+that the timestamp of the beacons stay consistent.
-+
-+Signed-off-by: Benjamin Berg <benjamin.berg@open-mesh.com>
-+---
-+
-+--- a/drivers/net/wireless/ath/ath9k/ath9k.h
-++++ b/drivers/net/wireless/ath/ath9k/ath9k.h
-+@@ -637,6 +637,8 @@ struct ath9k_vif_iter_data {
-+ int nwds; /* number of WDS vifs */
-+ int nadhocs; /* number of adhoc vifs */
-+ int nocbs; /* number of OCB vifs */
-++ int nbcnvifs; /* number of beaconing vifs */
-++ struct ieee80211_vif *primary_beacon_vif;
-+ struct ieee80211_vif *primary_sta;
-+ };
-+
-+@@ -685,10 +687,11 @@ struct ath_beacon {
-+ };
-+
-+ void ath9k_beacon_tasklet(unsigned long data);
-+-void ath9k_beacon_config(struct ath_softc *sc, struct ieee80211_vif *vif,
-+- u32 changed);
-++void ath9k_beacon_config(struct ath_softc *sc, struct ieee80211_vif *main_vif,
-++ bool beacons);
-+ void ath9k_beacon_assign_slot(struct ath_softc *sc, struct ieee80211_vif *vif);
-+ void ath9k_beacon_remove_slot(struct ath_softc *sc, struct ieee80211_vif *vif);
-++void ath9k_beacon_ensure_primary_slot(struct ath_softc *sc);
-+ void ath9k_set_beacon(struct ath_softc *sc);
-+ bool ath9k_csa_is_finished(struct ath_softc *sc, struct ieee80211_vif *vif);
-+ void ath9k_csa_update(struct ath_softc *sc);
-+--- a/drivers/net/wireless/ath/ath9k/beacon.c
-++++ b/drivers/net/wireless/ath/ath9k/beacon.c
-+@@ -209,7 +209,6 @@ void ath9k_beacon_assign_slot(struct ath
-+ }
-+
-+ sc->beacon.bslot[avp->av_bslot] = vif;
-+- sc->nbcnvifs++;
-+
-+ ath_dbg(common, CONFIG, "Added interface at beacon slot: %d\n",
-+ avp->av_bslot);
-+@@ -220,15 +219,12 @@ void ath9k_beacon_remove_slot(struct ath
-+ struct ath_common *common = ath9k_hw_common(sc->sc_ah);
-+ struct ath_vif *avp = (void *)vif->drv_priv;
-+ struct ath_buf *bf = avp->av_bcbuf;
-+- struct ath_beacon_config *cur_conf = &sc->cur_chan->beacon;
-+
-+ ath_dbg(common, CONFIG, "Removing interface at beacon slot: %d\n",
-+ avp->av_bslot);
-+
-+ tasklet_disable(&sc->bcon_tasklet);
-+
-+- cur_conf->enable_beacon &= ~BIT(avp->av_bslot);
-+-
-+ if (bf && bf->bf_mpdu) {
-+ struct sk_buff *skb = bf->bf_mpdu;
-+ dma_unmap_single(sc->dev, bf->bf_buf_addr,
-+@@ -240,12 +236,73 @@ void ath9k_beacon_remove_slot(struct ath
-+
-+ avp->av_bcbuf = NULL;
-+ sc->beacon.bslot[avp->av_bslot] = NULL;
-+- sc->nbcnvifs--;
-+ list_add_tail(&bf->list, &sc->beacon.bbuf);
-+
-+ tasklet_enable(&sc->bcon_tasklet);
-+ }
-+
-++void ath9k_beacon_ensure_primary_slot(struct ath_softc *sc)
-++{
-++ struct ath_common *common = ath9k_hw_common(sc->sc_ah);
-++ struct ieee80211_vif *vif;
-++ struct ath_vif *avp;
-++ s64 tsfadjust;
-++ u32 offset;
-++ int first_slot = ATH_BCBUF;
-++ int slot;
-++
-++ tasklet_disable(&sc->bcon_tasklet);
-++
-++ /* Find first taken slot. */
-++ for (slot = 0; slot < ATH_BCBUF; slot++) {
-++ if (sc->beacon.bslot[slot]) {
-++ first_slot = slot;
-++ break;
-++ }
-++ }
-++ if (first_slot == 0)
-++ goto out;
-++
-++ /* Re-enumarate all slots, moving them forward. */
-++ for (slot = 0; slot < ATH_BCBUF; slot++) {
-++ if (slot + first_slot < ATH_BCBUF) {
-++ vif = sc->beacon.bslot[slot + first_slot];
-++ sc->beacon.bslot[slot] = vif;
-++
-++ if (vif) {
-++ avp = (void *)vif->drv_priv;
-++ avp->av_bslot = slot;
-++ }
-++ } else {
-++ sc->beacon.bslot[slot] = NULL;
-++ }
-++ }
-++
-++ vif = sc->beacon.bslot[0];
-++ if (WARN_ON(!vif))
-++ goto out;
-++
-++ /* Get the tsf_adjust value for the new first slot. */
-++ avp = (void *)vif->drv_priv;
-++ tsfadjust = le64_to_cpu(avp->tsf_adjust);
-++
-++ ath_dbg(common, CONFIG,
-++ "Adjusting global TSF after beacon slot reassignment: %lld\n",
-++ (signed long long)tsfadjust);
-++
-++ /* Modify TSF as required and update the HW. */
-++ avp->chanctx->tsf_val += tsfadjust;
-++ if (sc->cur_chan == avp->chanctx) {
-++ offset = ath9k_hw_get_tsf_offset(&avp->chanctx->tsf_ts, NULL);
-++ ath9k_hw_settsf64(sc->sc_ah, avp->chanctx->tsf_val + offset);
-++ }
-++
-++ /* The slots tsf_adjust will be updated by ath9k_beacon_config later. */
-++
-++out:
-++ tasklet_enable(&sc->bcon_tasklet);
-++}
-++
-+ static int ath9k_beacon_choose_slot(struct ath_softc *sc)
-+ {
-+ struct ath_common *common = ath9k_hw_common(sc->sc_ah);
-+@@ -274,26 +331,33 @@ static int ath9k_beacon_choose_slot(stru
-+ return slot;
-+ }
-+
-+-static void ath9k_set_tsfadjust(struct ath_softc *sc, struct ieee80211_vif *vif)
-++static void ath9k_set_tsfadjust(struct ath_softc *sc,
-++ struct ath_beacon_config *cur_conf)
-+ {
-+ struct ath_common *common = ath9k_hw_common(sc->sc_ah);
-+- struct ath_vif *avp = (void *)vif->drv_priv;
-+- struct ath_beacon_config *cur_conf = &avp->chanctx->beacon;
-+ s64 tsfadjust;
-++ int slot;
-+
-+- if (avp->av_bslot == 0)
-+- return;
-++ for (slot = 0; slot < ATH_BCBUF; slot++) {
-++ struct ath_vif *avp;
-+
-+- /* tsf_adjust is added to the TSF value. We send out the beacon late,
-+- * so need to adjust the TSF starting point to be later in time (i.e.
-+- * the theoretical first beacon has a TSF of 0 after correction).
-+- */
-+- tsfadjust = cur_conf->beacon_interval * avp->av_bslot;
-+- tsfadjust = -TU_TO_USEC(tsfadjust) / ATH_BCBUF;
-+- avp->tsf_adjust = cpu_to_le64(tsfadjust);
-++ if (!sc->beacon.bslot[slot])
-++ continue;
-+
-+- ath_dbg(common, CONFIG, "tsfadjust is: %lld for bslot: %d\n",
-+- (signed long long)tsfadjust, avp->av_bslot);
-++ avp = (void *)sc->beacon.bslot[slot]->drv_priv;
-++
-++ /* tsf_adjust is added to the TSF value. We send out the
-++ * beacon late, so need to adjust the TSF starting point to be
-++ * later in time (i.e. the theoretical first beacon has a TSF
-++ * of 0 after correction).
-++ */
-++ tsfadjust = cur_conf->beacon_interval * avp->av_bslot;
-++ tsfadjust = -TU_TO_USEC(tsfadjust) / ATH_BCBUF;
-++ avp->tsf_adjust = cpu_to_le64(tsfadjust);
-++
-++ ath_dbg(common, CONFIG, "tsfadjust is: %lld for bslot: %d\n",
-++ (signed long long)tsfadjust, avp->av_bslot);
-++ }
-+ }
-+
-+ bool ath9k_csa_is_finished(struct ath_softc *sc, struct ieee80211_vif *vif)
-+@@ -447,20 +511,28 @@ void ath9k_beacon_tasklet(unsigned long
-+ * Both nexttbtt and intval have to be in usecs.
-+ */
-+ static void ath9k_beacon_init(struct ath_softc *sc, u32 nexttbtt,
-+- u32 intval, bool reset_tsf)
-++ u32 intval)
-+ {
-+ struct ath_hw *ah = sc->sc_ah;
-+
-+ ath9k_hw_disable_interrupts(ah);
-+- if (reset_tsf)
-+- ath9k_hw_reset_tsf(ah);
-+ ath9k_beaconq_config(sc);
-+ ath9k_hw_beaconinit(ah, nexttbtt, intval);
-++ ah->imask |= ATH9K_INT_SWBA;
-+ sc->beacon.bmisscnt = 0;
-+ ath9k_hw_set_interrupts(ah);
-+ ath9k_hw_enable_interrupts(ah);
-+ }
-+
-++static void ath9k_beacon_stop(struct ath_softc *sc)
-++{
-++ ath9k_hw_disable_interrupts(sc->sc_ah);
-++ sc->sc_ah->imask &= ~(ATH9K_INT_SWBA | ATH9K_INT_BMISS);
-++ sc->beacon.bmisscnt = 0;
-++ ath9k_hw_set_interrupts(sc->sc_ah);
-++ ath9k_hw_enable_interrupts(sc->sc_ah);
-++}
-++
-+ /*
-+ * For multi-bss ap support beacons are either staggered evenly over N slots or
-+ * burst together. For the former arrange for the SWBA to be delivered for each
-+@@ -472,7 +544,7 @@ static void ath9k_beacon_config_ap(struc
-+ struct ath_hw *ah = sc->sc_ah;
-+
-+ ath9k_cmn_beacon_config_ap(ah, conf, ATH_BCBUF);
-+- ath9k_beacon_init(sc, conf->nexttbtt, conf->intval, false);
-++ ath9k_beacon_init(sc, conf->nexttbtt, conf->intval);
-+ }
-+
-+ static void ath9k_beacon_config_sta(struct ath_hw *ah,
-+@@ -501,7 +573,7 @@ static void ath9k_beacon_config_adhoc(st
-+
-+ ath9k_cmn_beacon_config_adhoc(ah, conf);
-+
-+- ath9k_beacon_init(sc, conf->nexttbtt, conf->intval, conf->ibss_creator);
-++ ath9k_beacon_init(sc, conf->nexttbtt, conf->intval);
-+
-+ /*
-+ * Set the global 'beacon has been configured' flag for the
-+@@ -511,44 +583,6 @@ static void ath9k_beacon_config_adhoc(st
-+ set_bit(ATH_OP_BEACONS, &common->op_flags);
-+ }
-+
-+-static bool ath9k_allow_beacon_config(struct ath_softc *sc,
-+- struct ieee80211_vif *vif)
-+-{
-+- struct ath_common *common = ath9k_hw_common(sc->sc_ah);
-+- struct ath_vif *avp = (void *)vif->drv_priv;
-+-
-+- if (ath9k_is_chanctx_enabled()) {
-+- /*
-+- * If the VIF is not present in the current channel context,
-+- * then we can't do the usual opmode checks. Allow the
-+- * beacon config for the VIF to be updated in this case and
-+- * return immediately.
-+- */
-+- if (sc->cur_chan != avp->chanctx)
-+- return true;
-+- }
-+-
-+- if (sc->sc_ah->opmode == NL80211_IFTYPE_AP) {
-+- if (vif->type != NL80211_IFTYPE_AP) {
-+- ath_dbg(common, CONFIG,
-+- "An AP interface is already present !\n");
-+- return false;
-+- }
-+- }
-+-
-+- if (sc->sc_ah->opmode == NL80211_IFTYPE_STATION) {
-+- if ((vif->type == NL80211_IFTYPE_STATION) &&
-+- test_bit(ATH_OP_BEACONS, &common->op_flags) &&
-+- vif != sc->cur_chan->primary_sta) {
-+- ath_dbg(common, CONFIG,
-+- "Beacon already configured for a station interface\n");
-+- return false;
-+- }
-+- }
-+-
-+- return true;
-+-}
-+-
-+ static void ath9k_cache_beacon_config(struct ath_softc *sc,
-+ struct ath_chanctx *ctx,
-+ struct ieee80211_bss_conf *bss_conf)
-+@@ -584,87 +618,79 @@ static void ath9k_cache_beacon_config(st
-+ if (cur_conf->dtim_period == 0)
-+ cur_conf->dtim_period = 1;
-+
-++ ath9k_set_tsfadjust(sc, cur_conf);
-+ }
-+
-+-void ath9k_beacon_config(struct ath_softc *sc, struct ieee80211_vif *vif,
-+- u32 changed)
-++void ath9k_beacon_config(struct ath_softc *sc, struct ieee80211_vif *main_vif,
-++ bool beacons)
-+ {
-+- struct ieee80211_bss_conf *bss_conf = &vif->bss_conf;
-+- struct ath_hw *ah = sc->sc_ah;
-+- struct ath_common *common = ath9k_hw_common(ah);
-+- struct ath_vif *avp = (void *)vif->drv_priv;
-+- struct ath_chanctx *ctx = avp->chanctx;
-++ struct ath_hw *ah = sc->sc_ah;
-++ struct ath_common *common = ath9k_hw_common(ah);
-++ struct ath_vif *avp;
-++ struct ath_chanctx *ctx;
-+ struct ath_beacon_config *cur_conf;
-+ unsigned long flags;
-++ bool enabled;
-+ bool skip_beacon = false;
-+
-+- if (!ctx)
-++ if (!beacons) {
-++ clear_bit(ATH_OP_BEACONS, &common->op_flags);
-++ ath9k_beacon_stop(sc);
-+ return;
-++ }
-+
-+- cur_conf = &avp->chanctx->beacon;
-+- if (vif->type == NL80211_IFTYPE_AP)
-+- ath9k_set_tsfadjust(sc, vif);
-+-
-+- if (!ath9k_allow_beacon_config(sc, vif))
-++ if (WARN_ON(!main_vif))
-+ return;
-+
-+- if (vif->type == NL80211_IFTYPE_STATION) {
-+- ath9k_cache_beacon_config(sc, ctx, bss_conf);
-+- if (ctx != sc->cur_chan)
-+- return;
-++ avp = (void *)main_vif->drv_priv;
-++ ctx = avp->chanctx;
-++ cur_conf = &ctx->beacon;
-++ enabled = cur_conf->enable_beacon;
-++ cur_conf->enable_beacon = beacons;
-++
-++ if (sc->sc_ah->opmode == NL80211_IFTYPE_STATION) {
-++ ath9k_cache_beacon_config(sc, ctx, &main_vif->bss_conf);
-+
-+ ath9k_set_beacon(sc);
-+ set_bit(ATH_OP_BEACONS, &common->op_flags);
-+ return;
-+ }
-+
-+- /*
-+- * Take care of multiple interfaces when
-+- * enabling/disabling SWBA.
-+- */
-+- if (changed & BSS_CHANGED_BEACON_ENABLED) {
-+- bool enabled = cur_conf->enable_beacon;
-+-
-+- if (!bss_conf->enable_beacon) {
-+- cur_conf->enable_beacon &= ~BIT(avp->av_bslot);
-+- } else {
-+- cur_conf->enable_beacon |= BIT(avp->av_bslot);
-+- if (!enabled)
-+- ath9k_cache_beacon_config(sc, ctx, bss_conf);
-+- }
-+- }
-+-
-+- if (ctx != sc->cur_chan)
-+- return;
-++ /* Update the beacon configuration. */
-++ ath9k_cache_beacon_config(sc, ctx, &main_vif->bss_conf);
-+
-+ /*
-+ * Configure the HW beacon registers only when we have a valid
-+ * beacon interval.
-+ */
-+ if (cur_conf->beacon_interval) {
-+- /*
-+- * If we are joining an existing IBSS network, start beaconing
-+- * only after a TSF-sync has taken place. Ensure that this
-+- * happens by setting the appropriate flags.
-++ /* Special case to sync the TSF when joining an existing IBSS.
-++ * This is only done if no AP interface is active.
-++ * Note that mac80211 always resets the TSF when creating a new
-++ * IBSS interface.
-+ */
-+- if ((changed & BSS_CHANGED_IBSS) && !bss_conf->ibss_creator &&
-+- bss_conf->enable_beacon) {
-++ if (sc->sc_ah->opmode == NL80211_IFTYPE_ADHOC &&
-++ !enabled && beacons && !main_vif->bss_conf.ibss_creator) {
-+ spin_lock_irqsave(&sc->sc_pm_lock, flags);
-+ sc->ps_flags |= PS_BEACON_SYNC | PS_WAIT_FOR_BEACON;
-+ spin_unlock_irqrestore(&sc->sc_pm_lock, flags);
-+ skip_beacon = true;
-+- } else {
-+- ath9k_set_beacon(sc);
-+ }
-+
-+ /*
-+ * Do not set the ATH_OP_BEACONS flag for IBSS joiner mode
-+ * here, it is done in ath9k_beacon_config_adhoc().
-+ */
-+- if (cur_conf->enable_beacon && !skip_beacon)
-++ if (beacons && !skip_beacon) {
-+ set_bit(ATH_OP_BEACONS, &common->op_flags);
-+- else
-++ ath9k_set_beacon(sc);
-++ } else {
-+ clear_bit(ATH_OP_BEACONS, &common->op_flags);
-++ ath9k_beacon_stop(sc);
-++ }
-++ } else {
-++ clear_bit(ATH_OP_BEACONS, &common->op_flags);
-++ ath9k_beacon_stop(sc);
-+ }
-+ }
-+
-+--- a/drivers/net/wireless/ath/ath9k/common.h
-++++ b/drivers/net/wireless/ath/ath9k/common.h
-+@@ -50,6 +50,7 @@
-+ #define IEEE80211_MS_TO_TU(x) (((x) * 1000) / 1024)
-+
-+ struct ath_beacon_config {
-++ struct ieee80211_vif *main_vif;
-+ int beacon_interval;
-+ u16 dtim_period;
-+ u16 bmiss_timeout;
-+--- a/drivers/net/wireless/ath/ath9k/main.c
-++++ b/drivers/net/wireless/ath/ath9k/main.c
-+@@ -910,6 +910,22 @@ static bool ath9k_uses_beacons(int type)
-+ }
-+ }
-+
-++static void ath9k_vif_iter_set_beacon(struct ath9k_vif_iter_data *iter_data,
-++ struct ieee80211_vif *vif)
-++{
-++ /* Use the first (configured) interface, but prefering AP interfaces. */
-++ if (!iter_data->primary_beacon_vif) {
-++ iter_data->primary_beacon_vif = vif;
-++ } else {
-++ if (iter_data->primary_beacon_vif->type != NL80211_IFTYPE_AP &&
-++ vif->type == NL80211_IFTYPE_AP)
-++ iter_data->primary_beacon_vif = vif;
-++ }
-++
-++ iter_data->beacons = true;
-++ iter_data->nbcnvifs += 1;
-++}
-++
-+ static void ath9k_vif_iter(struct ath9k_vif_iter_data *iter_data,
-+ u8 *mac, struct ieee80211_vif *vif)
-+ {
-+@@ -931,6 +947,8 @@ static void ath9k_vif_iter(struct ath9k_
-+ switch (vif->type) {
-+ case NL80211_IFTYPE_AP:
-+ iter_data->naps++;
-++ if (vif->bss_conf.enable_beacon)
-++ ath9k_vif_iter_set_beacon(iter_data, vif);
-+ break;
-+ case NL80211_IFTYPE_STATION:
-+ iter_data->nstations++;
-+@@ -943,12 +961,12 @@ static void ath9k_vif_iter(struct ath9k_
-+ case NL80211_IFTYPE_ADHOC:
-+ iter_data->nadhocs++;
-+ if (vif->bss_conf.enable_beacon)
-+- iter_data->beacons = true;
-++ ath9k_vif_iter_set_beacon(iter_data, vif);
-+ break;
-+ case NL80211_IFTYPE_MESH_POINT:
-+ iter_data->nmeshes++;
-+ if (vif->bss_conf.enable_beacon)
-+- iter_data->beacons = true;
-++ ath9k_vif_iter_set_beacon(iter_data, vif);
-+ break;
-+ case NL80211_IFTYPE_WDS:
-+ iter_data->nwds++;
-+@@ -1081,7 +1099,6 @@ void ath9k_calculate_summary_state(struc
-+ struct ath_hw *ah = sc->sc_ah;
-+ struct ath_common *common = ath9k_hw_common(ah);
-+ struct ath9k_vif_iter_data iter_data;
-+- struct ath_beacon_config *cur_conf;
-+
-+ ath_chanctx_check_active(sc, ctx);
-+
-+@@ -1103,13 +1120,12 @@ void ath9k_calculate_summary_state(struc
-+ ath_hw_setbssidmask(common);
-+
-+ if (iter_data.naps > 0) {
-+- cur_conf = &ctx->beacon;
-+ ath9k_hw_set_tsfadjust(ah, true);
-+ ah->opmode = NL80211_IFTYPE_AP;
-+- if (cur_conf->enable_beacon)
-+- iter_data.beacons = true;
-+ } else {
-+ ath9k_hw_set_tsfadjust(ah, false);
-++ if (iter_data.beacons)
-++ ath9k_beacon_ensure_primary_slot(sc);
-+
-+ if (iter_data.nmeshes)
-+ ah->opmode = NL80211_IFTYPE_MESH_POINT;
-+@@ -1134,7 +1150,6 @@ void ath9k_calculate_summary_state(struc
-+ ctx->switch_after_beacon = true;
-+ }
-+
-+- ah->imask &= ~ATH9K_INT_SWBA;
-+ if (ah->opmode == NL80211_IFTYPE_STATION) {
-+ bool changed = (iter_data.primary_sta != ctx->primary_sta);
-+
-+@@ -1151,16 +1166,12 @@ void ath9k_calculate_summary_state(struc
-+ if (ath9k_hw_mci_is_enabled(sc->sc_ah))
-+ ath9k_mci_update_wlan_channels(sc, true);
-+ }
-+- } else if (iter_data.beacons) {
-+- ah->imask |= ATH9K_INT_SWBA;
-+ }
-++ sc->nbcnvifs = iter_data.nbcnvifs;
-++ ath9k_beacon_config(sc, iter_data.primary_beacon_vif,
-++ iter_data.beacons);
-+ ath9k_hw_set_interrupts(ah);
-+
-+- if (iter_data.beacons)
-+- set_bit(ATH_OP_BEACONS, &common->op_flags);
-+- else
-+- clear_bit(ATH_OP_BEACONS, &common->op_flags);
-+-
-+ if (ah->slottime != iter_data.slottime) {
-+ ah->slottime = iter_data.slottime;
-+ ath9k_hw_init_global_settings(ah);
-+@@ -1777,9 +1788,7 @@ static void ath9k_bss_info_changed(struc
-+ if ((changed & BSS_CHANGED_BEACON_ENABLED) ||
-+ (changed & BSS_CHANGED_BEACON_INT) ||
-+ (changed & BSS_CHANGED_BEACON_INFO)) {
-+- ath9k_beacon_config(sc, vif, changed);
-+- if (changed & BSS_CHANGED_BEACON_ENABLED)
-+- ath9k_calculate_summary_state(sc, avp->chanctx);
-++ ath9k_calculate_summary_state(sc, avp->chanctx);
-+ }
-+
-+ if ((avp->chanctx == sc->cur_chan) &&
-diff --git a/package/kernel/mac80211/patches/317-mac80211-minstrel_ht-fix-out-of-bound-in-minstrel_ht.patch b/package/kernel/mac80211/patches/317-mac80211-minstrel_ht-fix-out-of-bound-in-minstrel_ht.patch
-deleted file mode 100644
-index 5bf53b918c4936c09f65ea8a02f9ac7e93cf686a..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/317-mac80211-minstrel_ht-fix-out-of-bound-in-minstrel_ht.patch
-+++ /dev/null
-@@ -1,45 +0,0 @@
--From: Konstantin Khlebnikov <koct9i@gmail.com>
--Date: Fri, 29 Jan 2016 11:35:12 +0300
--Subject: [PATCH] mac80211: minstrel_ht: fix out-of-bound in
-- minstrel_ht_set_best_prob_rate
--
--Patch fixes this splat
--
--BUG: KASAN: slab-out-of-bounds in minstrel_ht_update_stats.isra.7+0x6e1/0x9e0
--[mac80211] at addr ffff8800cee640f4 Read of size 4 by task swapper/3/0
--
--Signed-off-by: Konstantin Khlebnikov <koct9i@gmail.com>
--Link: http://lkml.kernel.org/r/CALYGNiNyJhSaVnE35qS6UCGaSb2Dx1_i5HcRavuOX14oTz2P+w@mail.gmail.com
-----
--
----- a/net/mac80211/rc80211_minstrel_ht.c
--+++ b/net/mac80211/rc80211_minstrel_ht.c
--@@ -414,15 +414,16 @@ minstrel_ht_set_best_prob_rate(struct mi
-- (max_tp_group != MINSTREL_CCK_GROUP))
-- return;
--
--+ max_gpr_group = mg->max_group_prob_rate / MCS_GROUP_RATES;
--+ max_gpr_idx = mg->max_group_prob_rate % MCS_GROUP_RATES;
--+ max_gpr_prob = mi->groups[max_gpr_group].rates[max_gpr_idx].prob_ewma;
--+
-- if (mrs->prob_ewma > MINSTREL_FRAC(75, 100)) {
-- cur_tp_avg = minstrel_ht_get_tp_avg(mi, cur_group, cur_idx,
-- mrs->prob_ewma);
-- if (cur_tp_avg > tmp_tp_avg)
-- mi->max_prob_rate = index;
--
--- max_gpr_group = mg->max_group_prob_rate / MCS_GROUP_RATES;
--- max_gpr_idx = mg->max_group_prob_rate % MCS_GROUP_RATES;
--- max_gpr_prob = mi->groups[max_gpr_group].rates[max_gpr_idx].prob_ewma;
-- max_gpr_tp_avg = minstrel_ht_get_tp_avg(mi, max_gpr_group,
-- max_gpr_idx,
-- max_gpr_prob);
--@@ -431,7 +432,7 @@ minstrel_ht_set_best_prob_rate(struct mi
-- } else {
-- if (mrs->prob_ewma > tmp_prob)
-- mi->max_prob_rate = index;
--- if (mrs->prob_ewma > mg->rates[mg->max_group_prob_rate].prob_ewma)
--+ if (mrs->prob_ewma > max_gpr_prob)
-- mg->max_group_prob_rate = index;
-- }
-- }
-diff --git a/package/kernel/mac80211/patches/318-brcmfmac-slightly-simplify-building-interface-combin.patch b/package/kernel/mac80211/patches/318-brcmfmac-slightly-simplify-building-interface-combin.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..d946ecce19bf4e21355cc2563a58a02575d45f77
---- /dev/null
-+++ b/package/kernel/mac80211/patches/318-brcmfmac-slightly-simplify-building-interface-combin.patch
-@@ -0,0 +1,108 @@
-+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
-+Date: Tue, 7 Jun 2016 21:10:18 +0200
-+Subject: [PATCH] brcmfmac: slightly simplify building interface combinations
-+MIME-Version: 1.0
-+Content-Type: text/plain; charset=UTF-8
-+Content-Transfer-Encoding: 8bit
-+
-+This change reorders some operations in brcmf_setup_ifmodes in hope to
-+make it simpler:
-+1) It allocates arrays right before filling them. This way it's easier
-+ to follow requested array length as it's immediately followed by
-+ code filling it. It's easier to check e.g. why we need 4 entries for
-+ P2P. Other than that it deduplicates some checks (e.g. for P2P).
-+2) It reorders code to first prepare limits and then define a new combo.
-+ Previously this was mixed (e.g. we were setting num of channels
-+ before preparing limits).
-+3) It modifies mbss code to use i variable just like other combos do.
-+
-+Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
-+Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com>
-+Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-+---
-+
-+--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
-++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
-+@@ -6284,29 +6284,15 @@ static int brcmf_setup_ifmodes(struct wi
-+ if (!combo)
-+ goto err;
-+
-+- c0_limits = kcalloc(p2p ? 3 : 2, sizeof(*c0_limits), GFP_KERNEL);
-+- if (!c0_limits)
-+- goto err;
-+-
-+- if (p2p) {
-+- p2p_limits = kcalloc(4, sizeof(*p2p_limits), GFP_KERNEL);
-+- if (!p2p_limits)
-+- goto err;
-+- }
-+-
-+- if (mbss) {
-+- mbss_limits = kcalloc(1, sizeof(*mbss_limits), GFP_KERNEL);
-+- if (!mbss_limits)
-+- goto err;
-+- }
-+-
-+ wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) |
-+ BIT(NL80211_IFTYPE_ADHOC) |
-+ BIT(NL80211_IFTYPE_AP);
-+
-+ c = 0;
-+ i = 0;
-+- combo[c].num_different_channels = 1;
-++ c0_limits = kcalloc(p2p ? 3 : 2, sizeof(*c0_limits), GFP_KERNEL);
-++ if (!c0_limits)
-++ goto err;
-+ c0_limits[i].max = 1;
-+ c0_limits[i++].types = BIT(NL80211_IFTYPE_STATION);
-+ if (p2p) {
-+@@ -6324,6 +6310,7 @@ static int brcmf_setup_ifmodes(struct wi
-+ c0_limits[i].max = 1;
-+ c0_limits[i++].types = BIT(NL80211_IFTYPE_AP);
-+ }
-++ combo[c].num_different_channels = 1;
-+ combo[c].max_interfaces = i;
-+ combo[c].n_limits = i;
-+ combo[c].limits = c0_limits;
-+@@ -6331,7 +6318,9 @@ static int brcmf_setup_ifmodes(struct wi
-+ if (p2p) {
-+ c++;
-+ i = 0;
-+- combo[c].num_different_channels = 1;
-++ p2p_limits = kcalloc(4, sizeof(*p2p_limits), GFP_KERNEL);
-++ if (!p2p_limits)
-++ goto err;
-+ p2p_limits[i].max = 1;
-+ p2p_limits[i++].types = BIT(NL80211_IFTYPE_STATION);
-+ p2p_limits[i].max = 1;
-+@@ -6340,6 +6329,7 @@ static int brcmf_setup_ifmodes(struct wi
-+ p2p_limits[i++].types = BIT(NL80211_IFTYPE_P2P_CLIENT);
-+ p2p_limits[i].max = 1;
-+ p2p_limits[i++].types = BIT(NL80211_IFTYPE_P2P_DEVICE);
-++ combo[c].num_different_channels = 1;
-+ combo[c].max_interfaces = i;
-+ combo[c].n_limits = i;
-+ combo[c].limits = p2p_limits;
-+@@ -6347,14 +6337,19 @@ static int brcmf_setup_ifmodes(struct wi
-+
-+ if (mbss) {
-+ c++;
-++ i = 0;
-++ mbss_limits = kcalloc(1, sizeof(*mbss_limits), GFP_KERNEL);
-++ if (!mbss_limits)
-++ goto err;
-++ mbss_limits[i].max = 4;
-++ mbss_limits[i++].types = BIT(NL80211_IFTYPE_AP);
-+ combo[c].beacon_int_infra_match = true;
-+ combo[c].num_different_channels = 1;
-+- mbss_limits[0].max = 4;
-+- mbss_limits[0].types = BIT(NL80211_IFTYPE_AP);
-+ combo[c].max_interfaces = 4;
-+- combo[c].n_limits = 1;
-++ combo[c].n_limits = i;
-+ combo[c].limits = mbss_limits;
-+ }
-++
-+ wiphy->n_iface_combinations = n_combos;
-+ wiphy->iface_combinations = combo;
-+ return 0;
-diff --git a/package/kernel/mac80211/patches/318-mac80211-move-A-MSDU-skb_linearize-call-to-ieee80211.patch b/package/kernel/mac80211/patches/318-mac80211-move-A-MSDU-skb_linearize-call-to-ieee80211.patch
-deleted file mode 100644
-index 655dc4bfa934ca34ac108e54a93626e7d73eeb6e..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/318-mac80211-move-A-MSDU-skb_linearize-call-to-ieee80211.patch
-+++ /dev/null
-@@ -1,35 +0,0 @@
--From: Felix Fietkau <nbd@openwrt.org>
--Date: Tue, 2 Feb 2016 14:39:08 +0100
--Subject: [PATCH] mac80211: move A-MSDU skb_linearize call to
-- ieee80211_amsdu_to_8023s
--
--Prepararation for zero-copy A-MSDU support with page fragment SKBs
--
--Signed-off-by: Felix Fietkau <nbd@openwrt.org>
--Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-----
--
----- a/net/mac80211/rx.c
--+++ b/net/mac80211/rx.c
--@@ -2203,9 +2203,6 @@ ieee80211_rx_h_amsdu(struct ieee80211_rx
-- skb->dev = dev;
-- __skb_queue_head_init(&frame_list);
--
--- if (skb_linearize(skb))
--- return RX_DROP_UNUSABLE;
---
-- ieee80211_amsdu_to_8023s(skb, &frame_list, dev->dev_addr,
-- rx->sdata->vif.type,
-- rx->local->hw.extra_tx_headroom, true);
----- a/net/wireless/util.c
--+++ b/net/wireless/util.c
--@@ -657,6 +657,9 @@ void ieee80211_amsdu_to_8023s(struct sk_
-- int remaining, err;
-- u8 dst[ETH_ALEN], src[ETH_ALEN];
--
--+ if (skb_linearize(skb))
--+ goto out;
--+
-- if (has_80211_header) {
-- err = ieee80211_data_to_8023(skb, addr, iftype);
-- if (err)
-diff --git a/package/kernel/mac80211/patches/319-0001-brcmfmac-fix-lockup-when-removing-P2P-interface-afte.patch b/package/kernel/mac80211/patches/319-0001-brcmfmac-fix-lockup-when-removing-P2P-interface-afte.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..073d012dea37ebfc34ffac98797c5eebc48a6c6d
---- /dev/null
-+++ b/package/kernel/mac80211/patches/319-0001-brcmfmac-fix-lockup-when-removing-P2P-interface-afte.patch
-@@ -0,0 +1,154 @@
-+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
-+Date: Fri, 17 Jun 2016 12:29:21 +0200
-+Subject: [PATCH] brcmfmac: fix lockup when removing P2P interface after
-+ event timeout
-+MIME-Version: 1.0
-+Content-Type: text/plain; charset=UTF-8
-+Content-Transfer-Encoding: 8bit
-+
-+Removing P2P interface is handled by sending a proper request to the
-+firmware. On success firmware triggers an event and driver's handler
-+removes a matching interface.
-+
-+However on event timeout we remove interface directly from the cfg80211
-+callback. Current code doesn't handle this case correctly as it always
-+assumes rtnl to be unlocked.
-+
-+Fix it by adding an extra rtnl_locked parameter to functions and calling
-+unregister_netdevice when needed.
-+
-+Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
-+Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-+---
-+
-+--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
-++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
-+@@ -548,12 +548,16 @@ fail:
-+ return -EBADE;
-+ }
-+
-+-static void brcmf_net_detach(struct net_device *ndev)
-++static void brcmf_net_detach(struct net_device *ndev, bool rtnl_locked)
-+ {
-+- if (ndev->reg_state == NETREG_REGISTERED)
-+- unregister_netdev(ndev);
-+- else
-++ if (ndev->reg_state == NETREG_REGISTERED) {
-++ if (rtnl_locked)
-++ unregister_netdevice(ndev);
-++ else
-++ unregister_netdev(ndev);
-++ } else {
-+ brcmf_cfg80211_free_netdev(ndev);
-++ }
-+ }
-+
-+ void brcmf_net_setcarrier(struct brcmf_if *ifp, bool on)
-+@@ -651,7 +655,7 @@ struct brcmf_if *brcmf_add_if(struct brc
-+ brcmf_err("ERROR: netdev:%s already exists\n",
-+ ifp->ndev->name);
-+ netif_stop_queue(ifp->ndev);
-+- brcmf_net_detach(ifp->ndev);
-++ brcmf_net_detach(ifp->ndev, false);
-+ drvr->iflist[bsscfgidx] = NULL;
-+ } else {
-+ brcmf_dbg(INFO, "netdev:%s ignore IF event\n",
-+@@ -699,7 +703,8 @@ struct brcmf_if *brcmf_add_if(struct brc
-+ return ifp;
-+ }
-+
-+-static void brcmf_del_if(struct brcmf_pub *drvr, s32 bsscfgidx)
-++static void brcmf_del_if(struct brcmf_pub *drvr, s32 bsscfgidx,
-++ bool rtnl_locked)
-+ {
-+ struct brcmf_if *ifp;
-+
-+@@ -729,7 +734,7 @@ static void brcmf_del_if(struct brcmf_pu
-+ cancel_work_sync(&ifp->multicast_work);
-+ cancel_work_sync(&ifp->ndoffload_work);
-+ }
-+- brcmf_net_detach(ifp->ndev);
-++ brcmf_net_detach(ifp->ndev, rtnl_locked);
-+ } else {
-+ /* Only p2p device interfaces which get dynamically created
-+ * end up here. In this case the p2p module should be informed
-+@@ -743,14 +748,14 @@ static void brcmf_del_if(struct brcmf_pu
-+ }
-+ }
-+
-+-void brcmf_remove_interface(struct brcmf_if *ifp)
-++void brcmf_remove_interface(struct brcmf_if *ifp, bool rtnl_locked)
-+ {
-+ if (!ifp || WARN_ON(ifp->drvr->iflist[ifp->bsscfgidx] != ifp))
-+ return;
-+ brcmf_dbg(TRACE, "Enter, bsscfgidx=%d, ifidx=%d\n", ifp->bsscfgidx,
-+ ifp->ifidx);
-+ brcmf_fws_del_interface(ifp);
-+- brcmf_del_if(ifp->drvr, ifp->bsscfgidx);
-++ brcmf_del_if(ifp->drvr, ifp->bsscfgidx, rtnl_locked);
-+ }
-+
-+ #ifdef CONFIG_INET
-+@@ -1057,9 +1062,9 @@ fail:
-+ brcmf_fws_deinit(drvr);
-+ }
-+ if (ifp)
-+- brcmf_net_detach(ifp->ndev);
-++ brcmf_net_detach(ifp->ndev, false);
-+ if (p2p_ifp)
-+- brcmf_net_detach(p2p_ifp->ndev);
-++ brcmf_net_detach(p2p_ifp->ndev, false);
-+ drvr->iflist[0] = NULL;
-+ drvr->iflist[1] = NULL;
-+ if (drvr->settings->ignore_probe_fail)
-+@@ -1128,7 +1133,7 @@ void brcmf_detach(struct device *dev)
-+
-+ /* make sure primary interface removed last */
-+ for (i = BRCMF_MAX_IFS-1; i > -1; i--)
-+- brcmf_remove_interface(drvr->iflist[i]);
-++ brcmf_remove_interface(drvr->iflist[i], false);
-+
-+ brcmf_cfg80211_detach(drvr->config);
-+
-+--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h
-++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h
-+@@ -216,7 +216,7 @@ struct brcmf_if *brcmf_get_ifp(struct br
-+ int brcmf_net_attach(struct brcmf_if *ifp, bool rtnl_locked);
-+ struct brcmf_if *brcmf_add_if(struct brcmf_pub *drvr, s32 bsscfgidx, s32 ifidx,
-+ bool is_p2pdev, char *name, u8 *mac_addr);
-+-void brcmf_remove_interface(struct brcmf_if *ifp);
-++void brcmf_remove_interface(struct brcmf_if *ifp, bool rtnl_locked);
-+ void brcmf_txflowblock_if(struct brcmf_if *ifp,
-+ enum brcmf_netif_stop_reason reason, bool state);
-+ void brcmf_txfinalize(struct brcmf_if *ifp, struct sk_buff *txp, bool success);
-+--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c
-++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c
-+@@ -183,7 +183,7 @@ static void brcmf_fweh_handle_if_event(s
-+ err = brcmf_fweh_call_event_handler(ifp, emsg->event_code, emsg, data);
-+
-+ if (ifp && ifevent->action == BRCMF_E_IF_DEL)
-+- brcmf_remove_interface(ifp);
-++ brcmf_remove_interface(ifp, false);
-+ }
-+
-+ /**
-+--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
-++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
-+@@ -2289,7 +2289,7 @@ int brcmf_p2p_del_vif(struct wiphy *wiph
-+ err = 0;
-+ }
-+ if (err)
-+- brcmf_remove_interface(vif->ifp);
-++ brcmf_remove_interface(vif->ifp, true);
-+
-+ brcmf_cfg80211_arm_vif_event(cfg, NULL);
-+ if (vif->wdev.iftype != NL80211_IFTYPE_P2P_DEVICE)
-+@@ -2395,7 +2395,7 @@ void brcmf_p2p_detach(struct brcmf_p2p_i
-+ if (vif != NULL) {
-+ brcmf_p2p_cancel_remain_on_channel(vif->ifp);
-+ brcmf_p2p_deinit_discovery(p2p);
-+- brcmf_remove_interface(vif->ifp);
-++ brcmf_remove_interface(vif->ifp, false);
-+ }
-+ /* just set it all to zero */
-+ memset(p2p, 0, sizeof(*p2p));
-diff --git a/package/kernel/mac80211/patches/319-0002-brcmfmac-use-const-char-for-interface-name-in-brcmf_.patch b/package/kernel/mac80211/patches/319-0002-brcmfmac-use-const-char-for-interface-name-in-brcmf_.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..6d3f3c640cc5667adbbf828eab28995e1fc5d88c
---- /dev/null
-+++ b/package/kernel/mac80211/patches/319-0002-brcmfmac-use-const-char-for-interface-name-in-brcmf_.patch
-@@ -0,0 +1,40 @@
-+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
-+Date: Fri, 17 Jun 2016 12:48:44 +0200
-+Subject: [PATCH] brcmfmac: use const char * for interface name in
-+ brcmf_add_if
-+MIME-Version: 1.0
-+Content-Type: text/plain; charset=UTF-8
-+Content-Transfer-Encoding: 8bit
-+
-+This function can work just fine with const pointer, it only calls
-+alloc_netdev which take const as well. Moreover it makes this function
-+more flexible as some cfg80211 callback may provide const char * as
-+well, e.g. add_virtual_intf. This will be needed for more advanced
-+interface management.
-+
-+Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
-+Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-+---
-+
-+--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
-++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
-+@@ -638,7 +638,7 @@ fail:
-+ }
-+
-+ struct brcmf_if *brcmf_add_if(struct brcmf_pub *drvr, s32 bsscfgidx, s32 ifidx,
-+- bool is_p2pdev, char *name, u8 *mac_addr)
-++ bool is_p2pdev, const char *name, u8 *mac_addr)
-+ {
-+ struct brcmf_if *ifp;
-+ struct net_device *ndev;
-+--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h
-++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h
-+@@ -215,7 +215,7 @@ char *brcmf_ifname(struct brcmf_if *ifp)
-+ struct brcmf_if *brcmf_get_ifp(struct brcmf_pub *drvr, int ifidx);
-+ int brcmf_net_attach(struct brcmf_if *ifp, bool rtnl_locked);
-+ struct brcmf_if *brcmf_add_if(struct brcmf_pub *drvr, s32 bsscfgidx, s32 ifidx,
-+- bool is_p2pdev, char *name, u8 *mac_addr);
-++ bool is_p2pdev, const char *name, u8 *mac_addr);
-+ void brcmf_remove_interface(struct brcmf_if *ifp, bool rtnl_locked);
-+ void brcmf_txflowblock_if(struct brcmf_if *ifp,
-+ enum brcmf_netif_stop_reason reason, bool state);
-diff --git a/package/kernel/mac80211/patches/319-0003-brcmfmac-include-also-core.h-header-in-cfg80211.h.patch b/package/kernel/mac80211/patches/319-0003-brcmfmac-include-also-core.h-header-in-cfg80211.h.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..eeda76661c30388ede4fd96a340af84e7f27d3b2
---- /dev/null
-+++ b/package/kernel/mac80211/patches/319-0003-brcmfmac-include-also-core.h-header-in-cfg80211.h.patch
-@@ -0,0 +1,33 @@
-+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
-+Date: Sat, 18 Jun 2016 18:49:38 +0200
-+Subject: [PATCH] brcmfmac: include also core.h header in cfg80211.h
-+MIME-Version: 1.0
-+Content-Type: text/plain; charset=UTF-8
-+Content-Transfer-Encoding: 8bit
-+
-+This header provides two inline functions using struct brcmf_if so we
-+need core.h to avoid:
-+
-+drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h: In function ‘ndev_to_prof’:
-+drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h:368:13: error: dereferencing pointer to incomplete type
-+ return &ifp->vif->profile;
-+ ^
-+drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h: In function ‘ndev_to_vif’:
-+drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h:374:12: error: dereferencing pointer to incomplete type
-+ return ifp->vif;
-+ ^
-+
-+Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
-+Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-+---
-+
-+--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h
-++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h
-+@@ -20,6 +20,7 @@
-+ /* for brcmu_d11inf */
-+ #include <brcmu_d11.h>
-+
-++#include "core.h"
-+ #include "fwil_types.h"
-+ #include "p2p.h"
-+
-diff --git a/package/kernel/mac80211/patches/319-0004-brcmfmac-add-missing-break-when-deleting-P2P_DEVICE.patch b/package/kernel/mac80211/patches/319-0004-brcmfmac-add-missing-break-when-deleting-P2P_DEVICE.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..3819248b0fe94da017e99fba61931703036ad15c
---- /dev/null
-+++ b/package/kernel/mac80211/patches/319-0004-brcmfmac-add-missing-break-when-deleting-P2P_DEVICE.patch
-@@ -0,0 +1,27 @@
-+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
-+Date: Sun, 19 Jun 2016 01:55:57 +0200
-+Subject: [PATCH] brcmfmac: add missing break when deleting P2P_DEVICE
-+MIME-Version: 1.0
-+Content-Type: text/plain; charset=UTF-8
-+Content-Transfer-Encoding: 8bit
-+
-+We obviously don't want to fall through in that switch. With this change
-+1) We wait for event (triggered by p2p_disc) as expected
-+2) We remove interface manually on timeout
-+3) We return 0 on success instead of -ENOTSUPP
-+
-+Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
-+Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-+---
-+
-+--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
-++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
-+@@ -2263,6 +2263,8 @@ int brcmf_p2p_del_vif(struct wiphy *wiph
-+ return 0;
-+ brcmf_p2p_cancel_remain_on_channel(vif->ifp);
-+ brcmf_p2p_deinit_discovery(p2p);
-++ break;
-++
-+ default:
-+ return -ENOTSUPP;
-+ }
-diff --git a/package/kernel/mac80211/patches/319-0005-brcmfmac-delete-interface-directly-in-code-that-sent.patch b/package/kernel/mac80211/patches/319-0005-brcmfmac-delete-interface-directly-in-code-that-sent.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..12d7eb48877d8f9d9e2eb64c7cfd887c3d1634ae
---- /dev/null
-+++ b/package/kernel/mac80211/patches/319-0005-brcmfmac-delete-interface-directly-in-code-that-sent.patch
-@@ -0,0 +1,75 @@
-+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
-+Date: Wed, 29 Jun 2016 21:54:26 +0200
-+Subject: [PATCH] brcmfmac: delete interface directly in code that sent fw
-+ request
-+MIME-Version: 1.0
-+Content-Type: text/plain; charset=UTF-8
-+Content-Transfer-Encoding: 8bit
-+
-+So far when receiving event about in-firmware-interface removal our
-+event worker was notifying listener and afterwards it was removing Linux
-+interface.
-+
-+First of all it was resulting in slightly unexpected order. The listener
-+(del_virtual_intf callback) was (usually) returning with success before
-+we even called unregister_netdev(ice).
-+
-+Please note this couldn't be simply fixed by changing order of calls in
-+brcmf_fweh_handle_if_event as unregistering interface earlier could free
-+struct brcmf_if.
-+
-+Another problem of current implementation are possible lockups. Focus on
-+the time slot between calling event handler and removing Linux
-+interface. During that time original caller may leave (unlocking rtnl
-+semaphore) *and* another call to the same code may be done (locking it
-+again). If that happens our event handler will stuck at removing Linux
-+interface, it won't handle another event and will block process holding
-+rtnl lock.
-+
-+This can be simply solved by unregistering interface in a proper
-+callback, right after receiving confirmation event from firmware. This
-+only required modifying worker to don't unregister on its own if there
-+is someone waiting for the event.
-+
-+Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
-+Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-+---
-+
-+--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c
-++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c
-+@@ -18,6 +18,7 @@
-+ #include "brcmu_wifi.h"
-+ #include "brcmu_utils.h"
-+
-++#include "cfg80211.h"
-+ #include "core.h"
-+ #include "debug.h"
-+ #include "tracepoint.h"
-+@@ -182,8 +183,13 @@ static void brcmf_fweh_handle_if_event(s
-+
-+ err = brcmf_fweh_call_event_handler(ifp, emsg->event_code, emsg, data);
-+
-+- if (ifp && ifevent->action == BRCMF_E_IF_DEL)
-+- brcmf_remove_interface(ifp, false);
-++ if (ifp && ifevent->action == BRCMF_E_IF_DEL) {
-++ bool armed = brcmf_cfg80211_vif_event_armed(drvr->config);
-++
-++ /* Default handling in case no-one waits for this event */
-++ if (!armed)
-++ brcmf_remove_interface(ifp, false);
-++ }
-+ }
-+
-+ /**
-+--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
-++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
-+@@ -2290,8 +2290,7 @@ int brcmf_p2p_del_vif(struct wiphy *wiph
-+ else
-+ err = 0;
-+ }
-+- if (err)
-+- brcmf_remove_interface(vif->ifp, true);
-++ brcmf_remove_interface(vif->ifp, true);
-+
-+ brcmf_cfg80211_arm_vif_event(cfg, NULL);
-+ if (vif->wdev.iftype != NL80211_IFTYPE_P2P_DEVICE)
-diff --git a/package/kernel/mac80211/patches/319-0006-brcmfmac-support-removing-AP-interfaces-with-interfa.patch b/package/kernel/mac80211/patches/319-0006-brcmfmac-support-removing-AP-interfaces-with-interfa.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..2f7165eade7c6ffba2b1ed23e71b66e54d6a430b
---- /dev/null
-+++ b/package/kernel/mac80211/patches/319-0006-brcmfmac-support-removing-AP-interfaces-with-interfa.patch
-@@ -0,0 +1,84 @@
-+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
-+Date: Wed, 29 Jun 2016 21:54:27 +0200
-+Subject: [PATCH] brcmfmac: support removing AP interfaces with
-+ "interface_remove"
-+MIME-Version: 1.0
-+Content-Type: text/plain; charset=UTF-8
-+Content-Transfer-Encoding: 8bit
-+
-+New firmwares (e.g. 10.10.69.36 for BCM4366) support "interface_remove"
-+for removing interfaces. Try to use this method on cfg80211 request. In
-+case of older firmwares (e.g. 7.35.177.56 for BCM43602 as I tested) this
-+will just result in firmware rejecting command and this won't change any
-+behavior.
-+
-+Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
-+Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-+---
-+
-+--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
-++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
-+@@ -785,12 +785,48 @@ s32 brcmf_notify_escan_complete(struct b
-+ return err;
-+ }
-+
-++static int brcmf_cfg80211_del_ap_iface(struct wiphy *wiphy,
-++ struct wireless_dev *wdev)
-++{
-++ struct brcmf_cfg80211_info *cfg = wiphy_priv(wiphy);
-++ struct net_device *ndev = wdev->netdev;
-++ struct brcmf_if *ifp = netdev_priv(ndev);
-++ int ret;
-++ int err;
-++
-++ brcmf_cfg80211_arm_vif_event(cfg, ifp->vif);
-++
-++ err = brcmf_fil_bsscfg_data_set(ifp, "interface_remove", NULL, 0);
-++ if (err) {
-++ brcmf_err("interface_remove failed %d\n", err);
-++ goto err_unarm;
-++ }
-++
-++ /* wait for firmware event */
-++ ret = brcmf_cfg80211_wait_vif_event(cfg, BRCMF_E_IF_DEL,
-++ BRCMF_VIF_EVENT_TIMEOUT);
-++ if (!ret) {
-++ brcmf_err("timeout occurred\n");
-++ err = -EIO;
-++ goto err_unarm;
-++ }
-++
-++ brcmf_remove_interface(ifp, true);
-++
-++err_unarm:
-++ brcmf_cfg80211_arm_vif_event(cfg, NULL);
-++ return err;
-++}
-++
-+ static
-+ int brcmf_cfg80211_del_iface(struct wiphy *wiphy, struct wireless_dev *wdev)
-+ {
-+ struct brcmf_cfg80211_info *cfg = wiphy_priv(wiphy);
-+ struct net_device *ndev = wdev->netdev;
-+
-++ if (ndev && ndev == cfg_to_ndev(cfg))
-++ return -ENOTSUPP;
-++
-+ /* vif event pending in firmware */
-+ if (brcmf_cfg80211_vif_event_armed(cfg))
-+ return -EBUSY;
-+@@ -807,12 +843,13 @@ int brcmf_cfg80211_del_iface(struct wiph
-+ switch (wdev->iftype) {
-+ case NL80211_IFTYPE_ADHOC:
-+ case NL80211_IFTYPE_STATION:
-+- case NL80211_IFTYPE_AP:
-+ case NL80211_IFTYPE_AP_VLAN:
-+ case NL80211_IFTYPE_WDS:
-+ case NL80211_IFTYPE_MONITOR:
-+ case NL80211_IFTYPE_MESH_POINT:
-+ return -EOPNOTSUPP;
-++ case NL80211_IFTYPE_AP:
-++ return brcmf_cfg80211_del_ap_iface(wiphy, wdev);
-+ case NL80211_IFTYPE_P2P_CLIENT:
-+ case NL80211_IFTYPE_P2P_GO:
-+ case NL80211_IFTYPE_P2P_DEVICE:
-diff --git a/package/kernel/mac80211/patches/319-cfg80211-add-function-for-802.3-conversion-with-sepa.patch b/package/kernel/mac80211/patches/319-cfg80211-add-function-for-802.3-conversion-with-sepa.patch
-deleted file mode 100644
-index b646ab36dd204205735338c394a71f3bb58bd46a..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/319-cfg80211-add-function-for-802.3-conversion-with-sepa.patch
-+++ /dev/null
-@@ -1,186 +0,0 @@
--From: Felix Fietkau <nbd@openwrt.org>
--Date: Tue, 2 Feb 2016 14:39:09 +0100
--Subject: [PATCH] cfg80211: add function for 802.3 conversion with separate
-- output buffer
--
--Use skb_copy_bits in preparation for allowing fragmented skbs
--
--Signed-off-by: Felix Fietkau <nbd@openwrt.org>
--Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-----
--
----- a/net/wireless/util.c
--+++ b/net/wireless/util.c
--@@ -393,9 +393,9 @@ unsigned int ieee80211_get_hdrlen_from_s
-- }
-- EXPORT_SYMBOL(ieee80211_get_hdrlen_from_skb);
--
---unsigned int ieee80211_get_mesh_hdrlen(struct ieee80211s_hdr *meshhdr)
--+static unsigned int __ieee80211_get_mesh_hdrlen(u8 flags)
-- {
--- int ae = meshhdr->flags & MESH_FLAGS_AE;
--+ int ae = flags & MESH_FLAGS_AE;
-- /* 802.11-2012, 8.2.4.7.3 */
-- switch (ae) {
-- default:
--@@ -407,21 +407,31 @@ unsigned int ieee80211_get_mesh_hdrlen(s
-- return 18;
-- }
-- }
--+
--+unsigned int ieee80211_get_mesh_hdrlen(struct ieee80211s_hdr *meshhdr)
--+{
--+ return __ieee80211_get_mesh_hdrlen(meshhdr->flags);
--+}
-- EXPORT_SYMBOL(ieee80211_get_mesh_hdrlen);
--
---int ieee80211_data_to_8023(struct sk_buff *skb, const u8 *addr,
--- enum nl80211_iftype iftype)
--+static int __ieee80211_data_to_8023(struct sk_buff *skb, struct ethhdr *ehdr,
--+ const u8 *addr, enum nl80211_iftype iftype)
-- {
-- struct ieee80211_hdr *hdr = (struct ieee80211_hdr *) skb->data;
--- u16 hdrlen, ethertype;
--- u8 *payload;
--- u8 dst[ETH_ALEN];
--- u8 src[ETH_ALEN] __aligned(2);
--+ struct {
--+ u8 hdr[ETH_ALEN] __aligned(2);
--+ __be16 proto;
--+ } payload;
--+ struct ethhdr tmp;
--+ u16 hdrlen;
--+ u8 mesh_flags = 0;
--
-- if (unlikely(!ieee80211_is_data_present(hdr->frame_control)))
-- return -1;
--
-- hdrlen = ieee80211_hdrlen(hdr->frame_control);
--+ if (skb->len < hdrlen + 8)
--+ return -1;
--
-- /* convert IEEE 802.11 header + possible LLC headers into Ethernet
-- * header
--@@ -432,8 +442,11 @@ int ieee80211_data_to_8023(struct sk_buf
-- * 1 0 BSSID SA DA n/a
-- * 1 1 RA TA DA SA
-- */
--- memcpy(dst, ieee80211_get_DA(hdr), ETH_ALEN);
--- memcpy(src, ieee80211_get_SA(hdr), ETH_ALEN);
--+ memcpy(tmp.h_dest, ieee80211_get_DA(hdr), ETH_ALEN);
--+ memcpy(tmp.h_source, ieee80211_get_SA(hdr), ETH_ALEN);
--+
--+ if (iftype == NL80211_IFTYPE_MESH_POINT)
--+ skb_copy_bits(skb, hdrlen, &mesh_flags, 1);
--
-- switch (hdr->frame_control &
-- cpu_to_le16(IEEE80211_FCTL_TODS | IEEE80211_FCTL_FROMDS)) {
--@@ -450,44 +463,31 @@ int ieee80211_data_to_8023(struct sk_buf
-- iftype != NL80211_IFTYPE_STATION))
-- return -1;
-- if (iftype == NL80211_IFTYPE_MESH_POINT) {
--- struct ieee80211s_hdr *meshdr =
--- (struct ieee80211s_hdr *) (skb->data + hdrlen);
--- /* make sure meshdr->flags is on the linear part */
--- if (!pskb_may_pull(skb, hdrlen + 1))
--- return -1;
--- if (meshdr->flags & MESH_FLAGS_AE_A4)
--+ if (mesh_flags & MESH_FLAGS_AE_A4)
-- return -1;
--- if (meshdr->flags & MESH_FLAGS_AE_A5_A6) {
--+ if (mesh_flags & MESH_FLAGS_AE_A5_A6) {
-- skb_copy_bits(skb, hdrlen +
-- offsetof(struct ieee80211s_hdr, eaddr1),
--- dst, ETH_ALEN);
--- skb_copy_bits(skb, hdrlen +
--- offsetof(struct ieee80211s_hdr, eaddr2),
--- src, ETH_ALEN);
--+ tmp.h_dest, 2 * ETH_ALEN);
-- }
--- hdrlen += ieee80211_get_mesh_hdrlen(meshdr);
--+ hdrlen += __ieee80211_get_mesh_hdrlen(mesh_flags);
-- }
-- break;
-- case cpu_to_le16(IEEE80211_FCTL_FROMDS):
-- if ((iftype != NL80211_IFTYPE_STATION &&
-- iftype != NL80211_IFTYPE_P2P_CLIENT &&
-- iftype != NL80211_IFTYPE_MESH_POINT) ||
--- (is_multicast_ether_addr(dst) &&
--- ether_addr_equal(src, addr)))
--+ (is_multicast_ether_addr(tmp.h_dest) &&
--+ ether_addr_equal(tmp.h_source, addr)))
-- return -1;
-- if (iftype == NL80211_IFTYPE_MESH_POINT) {
--- struct ieee80211s_hdr *meshdr =
--- (struct ieee80211s_hdr *) (skb->data + hdrlen);
--- /* make sure meshdr->flags is on the linear part */
--- if (!pskb_may_pull(skb, hdrlen + 1))
--- return -1;
--- if (meshdr->flags & MESH_FLAGS_AE_A5_A6)
--+ if (mesh_flags & MESH_FLAGS_AE_A5_A6)
-- return -1;
--- if (meshdr->flags & MESH_FLAGS_AE_A4)
--+ if (mesh_flags & MESH_FLAGS_AE_A4)
-- skb_copy_bits(skb, hdrlen +
-- offsetof(struct ieee80211s_hdr, eaddr1),
--- src, ETH_ALEN);
--- hdrlen += ieee80211_get_mesh_hdrlen(meshdr);
--+ tmp.h_source, ETH_ALEN);
--+ hdrlen += __ieee80211_get_mesh_hdrlen(mesh_flags);
-- }
-- break;
-- case cpu_to_le16(0):
--@@ -498,33 +498,33 @@ int ieee80211_data_to_8023(struct sk_buf
-- break;
-- }
--
--- if (!pskb_may_pull(skb, hdrlen + 8))
--- return -1;
---
--- payload = skb->data + hdrlen;
--- ethertype = (payload[6] << 8) | payload[7];
--+ skb_copy_bits(skb, hdrlen, &payload, sizeof(payload));
--+ tmp.h_proto = payload.proto;
--
--- if (likely((ether_addr_equal(payload, rfc1042_header) &&
--- ethertype != ETH_P_AARP && ethertype != ETH_P_IPX) ||
--- ether_addr_equal(payload, bridge_tunnel_header))) {
--+ if (likely((ether_addr_equal(payload.hdr, rfc1042_header) &&
--+ tmp.h_proto != htons(ETH_P_AARP) &&
--+ tmp.h_proto != htons(ETH_P_IPX)) ||
--+ ether_addr_equal(payload.hdr, bridge_tunnel_header)))
-- /* remove RFC1042 or Bridge-Tunnel encapsulation and
-- * replace EtherType */
--- skb_pull(skb, hdrlen + 6);
--- memcpy(skb_push(skb, ETH_ALEN), src, ETH_ALEN);
--- memcpy(skb_push(skb, ETH_ALEN), dst, ETH_ALEN);
--- } else {
--- struct ethhdr *ehdr;
--- __be16 len;
--+ hdrlen += ETH_ALEN + 2;
--+ else
--+ tmp.h_proto = htons(skb->len);
--
--- skb_pull(skb, hdrlen);
--- len = htons(skb->len);
--+ pskb_pull(skb, hdrlen);
--+
--+ if (!ehdr)
-- ehdr = (struct ethhdr *) skb_push(skb, sizeof(struct ethhdr));
--- memcpy(ehdr->h_dest, dst, ETH_ALEN);
--- memcpy(ehdr->h_source, src, ETH_ALEN);
--- ehdr->h_proto = len;
--- }
--+ memcpy(ehdr, &tmp, sizeof(tmp));
--+
-- return 0;
-- }
--+
--+int ieee80211_data_to_8023(struct sk_buff *skb, const u8 *addr,
--+ enum nl80211_iftype iftype)
--+{
--+ return __ieee80211_data_to_8023(skb, NULL, addr, iftype);
--+}
-- EXPORT_SYMBOL(ieee80211_data_to_8023);
--
-- int ieee80211_data_from_8023(struct sk_buff *skb, const u8 *addr,
-diff --git a/package/kernel/mac80211/patches/320-ath9k-Switch-to-using-mac80211-intermediate-software.patch b/package/kernel/mac80211/patches/320-ath9k-Switch-to-using-mac80211-intermediate-software.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..f8b8f86e03ba0786ef410db31d6de2ab691430bd
---- /dev/null
-+++ b/package/kernel/mac80211/patches/320-ath9k-Switch-to-using-mac80211-intermediate-software.patch
-@@ -0,0 +1,871 @@
-+From: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= <toke@toke.dk>
-+Date: Wed, 6 Jul 2016 21:34:17 +0200
-+Subject: [PATCH] ath9k: Switch to using mac80211 intermediate software queues.
-+MIME-Version: 1.0
-+Content-Type: text/plain; charset=UTF-8
-+Content-Transfer-Encoding: 8bit
-+
-+This switches ath9k over to using the mac80211 intermediate software
-+queueing mechanism for data packets. It removes the queueing inside the
-+driver, except for the retry queue, and instead pulls from mac80211 when
-+a packet is needed. The retry queue is used to store a packet that was
-+pulled but can't be sent immediately.
-+
-+The old code path in ath_tx_start that would queue packets has been
-+removed completely, as has the qlen limit tunables (since there's no
-+longer a queue in the driver to limit).
-+
-+Based on Tim's original patch set, but reworked quite thoroughly.
-+
-+Cc: Tim Shepard <shep@alum.mit.edu>
-+Cc: Felix Fietkau <nbd@nbd.name>
-+Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
-+---
-+
-+--- a/drivers/net/wireless/ath/ath9k/ath9k.h
-++++ b/drivers/net/wireless/ath/ath9k/ath9k.h
-+@@ -91,7 +91,6 @@ int ath_descdma_setup(struct ath_softc *
-+ #define ATH_RXBUF 512
-+ #define ATH_TXBUF 512
-+ #define ATH_TXBUF_RESERVE 5
-+-#define ATH_MAX_QDEPTH (ATH_TXBUF / 4 - ATH_TXBUF_RESERVE)
-+ #define ATH_TXMAXTRY 13
-+ #define ATH_MAX_SW_RETRIES 30
-+
-+@@ -145,7 +144,9 @@ int ath_descdma_setup(struct ath_softc *
-+ #define BAW_WITHIN(_start, _bawsz, _seqno) \
-+ ((((_seqno) - (_start)) & 4095) < (_bawsz))
-+
-+-#define ATH_AN_2_TID(_an, _tidno) (&(_an)->tid[(_tidno)])
-++#define ATH_STA_2_TID(_sta, _tidno) ((struct ath_atx_tid *)(_sta)->txq[_tidno]->drv_priv)
-++#define ATH_VIF_2_TID(_vif) ((struct ath_atx_tid *)(_vif)->txq->drv_priv)
-++#define ATH_AN_2_TID(_an, _tidno) ((_an)->sta ? ATH_STA_2_TID((_an)->sta, _tidno) : ATH_VIF_2_TID((_an)->vif))
-+
-+ #define IS_HT_RATE(rate) (rate & 0x80)
-+ #define IS_CCK_RATE(rate) ((rate >= 0x18) && (rate <= 0x1e))
-+@@ -164,7 +165,6 @@ struct ath_txq {
-+ spinlock_t axq_lock;
-+ u32 axq_depth;
-+ u32 axq_ampdu_depth;
-+- bool stopped;
-+ bool axq_tx_inprogress;
-+ struct list_head txq_fifo[ATH_TXFIFO_DEPTH];
-+ u8 txq_headidx;
-+@@ -232,7 +232,6 @@ struct ath_buf {
-+
-+ struct ath_atx_tid {
-+ struct list_head list;
-+- struct sk_buff_head buf_q;
-+ struct sk_buff_head retry_q;
-+ struct ath_node *an;
-+ struct ath_txq *txq;
-+@@ -247,13 +246,13 @@ struct ath_atx_tid {
-+ s8 bar_index;
-+ bool active;
-+ bool clear_ps_filter;
-++ bool has_queued;
-+ };
-+
-+ struct ath_node {
-+ struct ath_softc *sc;
-+ struct ieee80211_sta *sta; /* station struct we're part of */
-+ struct ieee80211_vif *vif; /* interface with which we're associated */
-+- struct ath_atx_tid tid[IEEE80211_NUM_TIDS];
-+
-+ u16 maxampdu;
-+ u8 mpdudensity;
-+@@ -276,7 +275,6 @@ struct ath_tx_control {
-+ struct ath_node *an;
-+ struct ieee80211_sta *sta;
-+ u8 paprd;
-+- bool force_channel;
-+ };
-+
-+
-+@@ -293,7 +291,6 @@ struct ath_tx {
-+ struct ath_descdma txdma;
-+ struct ath_txq *txq_map[IEEE80211_NUM_ACS];
-+ struct ath_txq *uapsdq;
-+- u32 txq_max_pending[IEEE80211_NUM_ACS];
-+ u16 max_aggr_framelen[IEEE80211_NUM_ACS][4][32];
-+ };
-+
-+@@ -585,6 +582,7 @@ void ath9k_release_buffered_frames(struc
-+ u16 tids, int nframes,
-+ enum ieee80211_frame_release_type reason,
-+ bool more_data);
-++void ath9k_wake_tx_queue(struct ieee80211_hw *hw, struct ieee80211_txq *queue);
-+
-+ /********/
-+ /* VIFs */
-+--- a/drivers/net/wireless/ath/ath9k/channel.c
-++++ b/drivers/net/wireless/ath/ath9k/channel.c
-+@@ -1007,7 +1007,6 @@ static void ath_scan_send_probe(struct a
-+ goto error;
-+
-+ txctl.txq = sc->tx.txq_map[IEEE80211_AC_VO];
-+- txctl.force_channel = true;
-+ if (ath_tx_start(sc->hw, skb, &txctl))
-+ goto error;
-+
-+@@ -1130,7 +1129,6 @@ ath_chanctx_send_vif_ps_frame(struct ath
-+ memset(&txctl, 0, sizeof(txctl));
-+ txctl.txq = sc->tx.txq_map[IEEE80211_AC_VO];
-+ txctl.sta = sta;
-+- txctl.force_channel = true;
-+ if (ath_tx_start(sc->hw, skb, &txctl)) {
-+ ieee80211_free_txskb(sc->hw, skb);
-+ return false;
-+--- a/drivers/net/wireless/ath/ath9k/debug.c
-++++ b/drivers/net/wireless/ath/ath9k/debug.c
-+@@ -600,7 +600,6 @@ static int read_file_xmit(struct seq_fil
-+ PR("MPDUs XRetried: ", xretries);
-+ PR("Aggregates: ", a_aggr);
-+ PR("AMPDUs Queued HW:", a_queued_hw);
-+- PR("AMPDUs Queued SW:", a_queued_sw);
-+ PR("AMPDUs Completed:", a_completed);
-+ PR("AMPDUs Retried: ", a_retries);
-+ PR("AMPDUs XRetried: ", a_xretries);
-+@@ -629,8 +628,7 @@ static void print_queue(struct ath_softc
-+ seq_printf(file, "%s: %d ", "qnum", txq->axq_qnum);
-+ seq_printf(file, "%s: %2d ", "qdepth", txq->axq_depth);
-+ seq_printf(file, "%s: %2d ", "ampdu-depth", txq->axq_ampdu_depth);
-+- seq_printf(file, "%s: %3d ", "pending", txq->pending_frames);
-+- seq_printf(file, "%s: %d\n", "stopped", txq->stopped);
-++ seq_printf(file, "%s: %3d\n", "pending", txq->pending_frames);
-+
-+ ath_txq_unlock(sc, txq);
-+ }
-+@@ -1208,7 +1206,6 @@ static const char ath9k_gstrings_stats[]
-+ AMKSTR(d_tx_mpdu_xretries),
-+ AMKSTR(d_tx_aggregates),
-+ AMKSTR(d_tx_ampdus_queued_hw),
-+- AMKSTR(d_tx_ampdus_queued_sw),
-+ AMKSTR(d_tx_ampdus_completed),
-+ AMKSTR(d_tx_ampdu_retries),
-+ AMKSTR(d_tx_ampdu_xretries),
-+@@ -1288,7 +1285,6 @@ void ath9k_get_et_stats(struct ieee80211
-+ AWDATA(xretries);
-+ AWDATA(a_aggr);
-+ AWDATA(a_queued_hw);
-+- AWDATA(a_queued_sw);
-+ AWDATA(a_completed);
-+ AWDATA(a_retries);
-+ AWDATA(a_xretries);
-+@@ -1346,14 +1342,6 @@ int ath9k_init_debug(struct ath_hw *ah)
-+ read_file_xmit);
-+ debugfs_create_devm_seqfile(sc->dev, "queues", sc->debug.debugfs_phy,
-+ read_file_queues);
-+- debugfs_create_u32("qlen_bk", S_IRUSR | S_IWUSR, sc->debug.debugfs_phy,
-+- &sc->tx.txq_max_pending[IEEE80211_AC_BK]);
-+- debugfs_create_u32("qlen_be", S_IRUSR | S_IWUSR, sc->debug.debugfs_phy,
-+- &sc->tx.txq_max_pending[IEEE80211_AC_BE]);
-+- debugfs_create_u32("qlen_vi", S_IRUSR | S_IWUSR, sc->debug.debugfs_phy,
-+- &sc->tx.txq_max_pending[IEEE80211_AC_VI]);
-+- debugfs_create_u32("qlen_vo", S_IRUSR | S_IWUSR, sc->debug.debugfs_phy,
-+- &sc->tx.txq_max_pending[IEEE80211_AC_VO]);
-+ debugfs_create_devm_seqfile(sc->dev, "misc", sc->debug.debugfs_phy,
-+ read_file_misc);
-+ debugfs_create_devm_seqfile(sc->dev, "reset", sc->debug.debugfs_phy,
-+--- a/drivers/net/wireless/ath/ath9k/debug.h
-++++ b/drivers/net/wireless/ath/ath9k/debug.h
-+@@ -147,7 +147,6 @@ struct ath_interrupt_stats {
-+ * @completed: Total MPDUs (non-aggr) completed
-+ * @a_aggr: Total no. of aggregates queued
-+ * @a_queued_hw: Total AMPDUs queued to hardware
-+- * @a_queued_sw: Total AMPDUs queued to software queues
-+ * @a_completed: Total AMPDUs completed
-+ * @a_retries: No. of AMPDUs retried (SW)
-+ * @a_xretries: No. of AMPDUs dropped due to xretries
-+@@ -174,7 +173,6 @@ struct ath_tx_stats {
-+ u32 xretries;
-+ u32 a_aggr;
-+ u32 a_queued_hw;
-+- u32 a_queued_sw;
-+ u32 a_completed;
-+ u32 a_retries;
-+ u32 a_xretries;
-+--- a/drivers/net/wireless/ath/ath9k/debug_sta.c
-++++ b/drivers/net/wireless/ath/ath9k/debug_sta.c
-+@@ -52,8 +52,8 @@ static ssize_t read_file_node_aggr(struc
-+ "TID", "SEQ_START", "SEQ_NEXT", "BAW_SIZE",
-+ "BAW_HEAD", "BAW_TAIL", "BAR_IDX", "SCHED", "PAUSED");
-+
-+- for (tidno = 0, tid = &an->tid[tidno];
-+- tidno < IEEE80211_NUM_TIDS; tidno++, tid++) {
-++ for (tidno = 0; tidno < IEEE80211_NUM_TIDS; tidno++) {
-++ tid = ATH_STA_2_TID(an->sta, tidno);
-+ txq = tid->txq;
-+ ath_txq_lock(sc, txq);
-+ if (tid->active) {
-+--- a/drivers/net/wireless/ath/ath9k/init.c
-++++ b/drivers/net/wireless/ath/ath9k/init.c
-+@@ -358,7 +358,6 @@ static int ath9k_init_queues(struct ath_
-+ for (i = 0; i < IEEE80211_NUM_ACS; i++) {
-+ sc->tx.txq_map[i] = ath_txq_setup(sc, ATH9K_TX_QUEUE_DATA, i);
-+ sc->tx.txq_map[i]->mac80211_qnum = i;
-+- sc->tx.txq_max_pending[i] = ATH_MAX_QDEPTH;
-+ }
-+ return 0;
-+ }
-+@@ -873,6 +872,7 @@ static void ath9k_set_hw_capab(struct at
-+ hw->max_rate_tries = 10;
-+ hw->sta_data_size = sizeof(struct ath_node);
-+ hw->vif_data_size = sizeof(struct ath_vif);
-++ hw->txq_data_size = sizeof(struct ath_atx_tid);
-+ hw->extra_tx_headroom = 4;
-+
-+ hw->wiphy->available_antennas_rx = BIT(ah->caps.max_rxchains) - 1;
-+--- a/drivers/net/wireless/ath/ath9k/main.c
-++++ b/drivers/net/wireless/ath/ath9k/main.c
-+@@ -2695,4 +2695,5 @@ struct ieee80211_ops ath9k_ops = {
-+ .sw_scan_start = ath9k_sw_scan_start,
-+ .sw_scan_complete = ath9k_sw_scan_complete,
-+ .get_txpower = ath9k_get_txpower,
-++ .wake_tx_queue = ath9k_wake_tx_queue,
-+ };
-+--- a/drivers/net/wireless/ath/ath9k/xmit.c
-++++ b/drivers/net/wireless/ath/ath9k/xmit.c
-+@@ -65,6 +65,8 @@ static struct ath_buf *ath_tx_setup_buff
-+ struct ath_txq *txq,
-+ struct ath_atx_tid *tid,
-+ struct sk_buff *skb);
-++static int ath_tx_prepare(struct ieee80211_hw *hw, struct sk_buff *skb,
-++ struct ath_tx_control *txctl);
-+
-+ enum {
-+ MCS_HT20,
-+@@ -118,6 +120,26 @@ static void ath_tx_queue_tid(struct ath_
-+ list_add_tail(&tid->list, list);
-+ }
-+
-++void ath9k_wake_tx_queue(struct ieee80211_hw *hw, struct ieee80211_txq *queue)
-++{
-++ struct ath_softc *sc = hw->priv;
-++ struct ath_common *common = ath9k_hw_common(sc->sc_ah);
-++ struct ath_atx_tid *tid = (struct ath_atx_tid *) queue->drv_priv;
-++ struct ath_txq *txq = tid->txq;
-++
-++ ath_dbg(common, QUEUE, "Waking TX queue: %pM (%d)\n",
-++ queue->sta ? queue->sta->addr : queue->vif->addr,
-++ tid->tidno);
-++
-++ ath_txq_lock(sc, txq);
-++
-++ tid->has_queued = true;
-++ ath_tx_queue_tid(sc, txq, tid);
-++ ath_txq_schedule(sc, txq);
-++
-++ ath_txq_unlock(sc, txq);
-++}
-++
-+ static struct ath_frame_info *get_frame_info(struct sk_buff *skb)
-+ {
-+ struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
-+@@ -160,7 +182,6 @@ static void ath_set_rates(struct ieee802
-+ static void ath_txq_skb_done(struct ath_softc *sc, struct ath_txq *txq,
-+ struct sk_buff *skb)
-+ {
-+- struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
-+ struct ath_frame_info *fi = get_frame_info(skb);
-+ int q = fi->txq;
-+
-+@@ -171,14 +192,6 @@ static void ath_txq_skb_done(struct ath_
-+ if (WARN_ON(--txq->pending_frames < 0))
-+ txq->pending_frames = 0;
-+
-+- if (txq->stopped &&
-+- txq->pending_frames < sc->tx.txq_max_pending[q]) {
-+- if (ath9k_is_chanctx_enabled())
-+- ieee80211_wake_queue(sc->hw, info->hw_queue);
-+- else
-+- ieee80211_wake_queue(sc->hw, q);
-+- txq->stopped = false;
-+- }
-+ }
-+
-+ static struct ath_atx_tid *
-+@@ -188,9 +201,47 @@ ath_get_skb_tid(struct ath_softc *sc, st
-+ return ATH_AN_2_TID(an, tidno);
-+ }
-+
-++static struct sk_buff *
-++ath_tid_pull(struct ath_atx_tid *tid)
-++{
-++ struct ath_softc *sc = tid->an->sc;
-++ struct ieee80211_hw *hw = sc->hw;
-++ struct ath_tx_control txctl = {
-++ .txq = tid->txq,
-++ .sta = tid->an->sta,
-++ };
-++ struct sk_buff *skb;
-++ struct ath_frame_info *fi;
-++ int q;
-++
-++ if (!tid->has_queued)
-++ return NULL;
-++
-++ skb = ieee80211_tx_dequeue(hw, container_of((void*)tid, struct ieee80211_txq, drv_priv));
-++ if (!skb) {
-++ tid->has_queued = false;
-++ return NULL;
-++ }
-++
-++ if (ath_tx_prepare(hw, skb, &txctl)) {
-++ ieee80211_free_txskb(hw, skb);
-++ return NULL;
-++ }
-++
-++ q = skb_get_queue_mapping(skb);
-++ if (tid->txq == sc->tx.txq_map[q]) {
-++ fi = get_frame_info(skb);
-++ fi->txq = q;
-++ ++tid->txq->pending_frames;
-++ }
-++
-++ return skb;
-++ }
-++
-++
-+ static bool ath_tid_has_buffered(struct ath_atx_tid *tid)
-+ {
-+- return !skb_queue_empty(&tid->buf_q) || !skb_queue_empty(&tid->retry_q);
-++ return !skb_queue_empty(&tid->retry_q) || tid->has_queued;
-+ }
-+
-+ static struct sk_buff *ath_tid_dequeue(struct ath_atx_tid *tid)
-+@@ -199,46 +250,11 @@ static struct sk_buff *ath_tid_dequeue(s
-+
-+ skb = __skb_dequeue(&tid->retry_q);
-+ if (!skb)
-+- skb = __skb_dequeue(&tid->buf_q);
-++ skb = ath_tid_pull(tid);
-+
-+ return skb;
-+ }
-+
-+-/*
-+- * ath_tx_tid_change_state:
-+- * - clears a-mpdu flag of previous session
-+- * - force sequence number allocation to fix next BlockAck Window
-+- */
-+-static void
-+-ath_tx_tid_change_state(struct ath_softc *sc, struct ath_atx_tid *tid)
-+-{
-+- struct ath_txq *txq = tid->txq;
-+- struct ieee80211_tx_info *tx_info;
-+- struct sk_buff *skb, *tskb;
-+- struct ath_buf *bf;
-+- struct ath_frame_info *fi;
-+-
-+- skb_queue_walk_safe(&tid->buf_q, skb, tskb) {
-+- fi = get_frame_info(skb);
-+- bf = fi->bf;
-+-
-+- tx_info = IEEE80211_SKB_CB(skb);
-+- tx_info->flags &= ~IEEE80211_TX_CTL_AMPDU;
-+-
-+- if (bf)
-+- continue;
-+-
-+- bf = ath_tx_setup_buffer(sc, txq, tid, skb);
-+- if (!bf) {
-+- __skb_unlink(skb, &tid->buf_q);
-+- ath_txq_skb_done(sc, txq, skb);
-+- ieee80211_free_txskb(sc->hw, skb);
-+- continue;
-+- }
-+- }
-+-
-+-}
-+-
-+ static void ath_tx_flush_tid(struct ath_softc *sc, struct ath_atx_tid *tid)
-+ {
-+ struct ath_txq *txq = tid->txq;
-+@@ -873,20 +889,16 @@ static int ath_compute_num_delims(struct
-+
-+ static struct ath_buf *
-+ ath_tx_get_tid_subframe(struct ath_softc *sc, struct ath_txq *txq,
-+- struct ath_atx_tid *tid, struct sk_buff_head **q)
-++ struct ath_atx_tid *tid)
-+ {
-+ struct ieee80211_tx_info *tx_info;
-+ struct ath_frame_info *fi;
-+- struct sk_buff *skb;
-++ struct sk_buff *skb, *first_skb = NULL;
-+ struct ath_buf *bf;
-+ u16 seqno;
-+
-+ while (1) {
-+- *q = &tid->retry_q;
-+- if (skb_queue_empty(*q))
-+- *q = &tid->buf_q;
-+-
-+- skb = skb_peek(*q);
-++ skb = ath_tid_dequeue(tid);
-+ if (!skb)
-+ break;
-+
-+@@ -898,7 +910,6 @@ ath_tx_get_tid_subframe(struct ath_softc
-+ bf->bf_state.stale = false;
-+
-+ if (!bf) {
-+- __skb_unlink(skb, *q);
-+ ath_txq_skb_done(sc, txq, skb);
-+ ieee80211_free_txskb(sc->hw, skb);
-+ continue;
-+@@ -927,8 +938,19 @@ ath_tx_get_tid_subframe(struct ath_softc
-+ seqno = bf->bf_state.seqno;
-+
-+ /* do not step over block-ack window */
-+- if (!BAW_WITHIN(tid->seq_start, tid->baw_size, seqno))
-++ if (!BAW_WITHIN(tid->seq_start, tid->baw_size, seqno)) {
-++ __skb_queue_tail(&tid->retry_q, skb);
-++
-++ /* If there are other skbs in the retry q, they are
-++ * probably within the BAW, so loop immediately to get
-++ * one of them. Otherwise the queue can get stuck. */
-++ if (!skb_queue_is_first(&tid->retry_q, skb) && skb != first_skb) {
-++ if(!first_skb) /* infinite loop prevention */
-++ first_skb = skb;
-++ continue;
-++ }
-+ break;
-++ }
-+
-+ if (tid->bar_index > ATH_BA_INDEX(tid->seq_start, seqno)) {
-+ struct ath_tx_status ts = {};
-+@@ -936,7 +958,6 @@ ath_tx_get_tid_subframe(struct ath_softc
-+
-+ INIT_LIST_HEAD(&bf_head);
-+ list_add(&bf->list, &bf_head);
-+- __skb_unlink(skb, *q);
-+ ath_tx_update_baw(sc, tid, seqno);
-+ ath_tx_complete_buf(sc, bf, txq, &bf_head, &ts, 0);
-+ continue;
-+@@ -948,11 +969,10 @@ ath_tx_get_tid_subframe(struct ath_softc
-+ return NULL;
-+ }
-+
-+-static bool
-++static int
-+ ath_tx_form_aggr(struct ath_softc *sc, struct ath_txq *txq,
-+ struct ath_atx_tid *tid, struct list_head *bf_q,
-+- struct ath_buf *bf_first, struct sk_buff_head *tid_q,
-+- int *aggr_len)
-++ struct ath_buf *bf_first)
-+ {
-+ #define PADBYTES(_len) ((4 - ((_len) % 4)) % 4)
-+ struct ath_buf *bf = bf_first, *bf_prev = NULL;
-+@@ -962,12 +982,13 @@ ath_tx_form_aggr(struct ath_softc *sc, s
-+ struct ieee80211_tx_info *tx_info;
-+ struct ath_frame_info *fi;
-+ struct sk_buff *skb;
-+- bool closed = false;
-++
-+
-+ bf = bf_first;
-+ aggr_limit = ath_lookup_rate(sc, bf, tid);
-+
-+- do {
-++ while (bf)
-++ {
-+ skb = bf->bf_mpdu;
-+ fi = get_frame_info(skb);
-+
-+@@ -976,12 +997,12 @@ ath_tx_form_aggr(struct ath_softc *sc, s
-+ if (nframes) {
-+ if (aggr_limit < al + bpad + al_delta ||
-+ ath_lookup_legacy(bf) || nframes >= h_baw)
-+- break;
-++ goto stop;
-+
-+ tx_info = IEEE80211_SKB_CB(bf->bf_mpdu);
-+ if ((tx_info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE) ||
-+ !(tx_info->flags & IEEE80211_TX_CTL_AMPDU))
-+- break;
-++ goto stop;
-+ }
-+
-+ /* add padding for previous frame to aggregation length */
-+@@ -1003,20 +1024,18 @@ ath_tx_form_aggr(struct ath_softc *sc, s
-+ ath_tx_addto_baw(sc, tid, bf);
-+ bf->bf_state.ndelim = ndelim;
-+
-+- __skb_unlink(skb, tid_q);
-+ list_add_tail(&bf->list, bf_q);
-+ if (bf_prev)
-+ bf_prev->bf_next = bf;
-+
-+ bf_prev = bf;
-+
-+- bf = ath_tx_get_tid_subframe(sc, txq, tid, &tid_q);
-+- if (!bf) {
-+- closed = true;
-+- break;
-+- }
-+- } while (ath_tid_has_buffered(tid));
-+-
-++ bf = ath_tx_get_tid_subframe(sc, txq, tid);
-++ }
-++ goto finish;
-++stop:
-++ __skb_queue_tail(&tid->retry_q, bf->bf_mpdu);
-++finish:
-+ bf = bf_first;
-+ bf->bf_lastbf = bf_prev;
-+
-+@@ -1027,9 +1046,7 @@ ath_tx_form_aggr(struct ath_softc *sc, s
-+ TX_STAT_INC(txq->axq_qnum, a_aggr);
-+ }
-+
-+- *aggr_len = al;
-+-
-+- return closed;
-++ return al;
-+ #undef PADBYTES
-+ }
-+
-+@@ -1406,18 +1423,15 @@ static void ath_tx_fill_desc(struct ath_
-+ static void
-+ ath_tx_form_burst(struct ath_softc *sc, struct ath_txq *txq,
-+ struct ath_atx_tid *tid, struct list_head *bf_q,
-+- struct ath_buf *bf_first, struct sk_buff_head *tid_q)
-++ struct ath_buf *bf_first)
-+ {
-+ struct ath_buf *bf = bf_first, *bf_prev = NULL;
-+- struct sk_buff *skb;
-+ int nframes = 0;
-+
-+ do {
-+ struct ieee80211_tx_info *tx_info;
-+- skb = bf->bf_mpdu;
-+
-+ nframes++;
-+- __skb_unlink(skb, tid_q);
-+ list_add_tail(&bf->list, bf_q);
-+ if (bf_prev)
-+ bf_prev->bf_next = bf;
-+@@ -1426,13 +1440,15 @@ ath_tx_form_burst(struct ath_softc *sc,
-+ if (nframes >= 2)
-+ break;
-+
-+- bf = ath_tx_get_tid_subframe(sc, txq, tid, &tid_q);
-++ bf = ath_tx_get_tid_subframe(sc, txq, tid);
-+ if (!bf)
-+ break;
-+
-+ tx_info = IEEE80211_SKB_CB(bf->bf_mpdu);
-+- if (tx_info->flags & IEEE80211_TX_CTL_AMPDU)
-++ if (tx_info->flags & IEEE80211_TX_CTL_AMPDU) {
-++ __skb_queue_tail(&tid->retry_q, bf->bf_mpdu);
-+ break;
-++ }
-+
-+ ath_set_rates(tid->an->vif, tid->an->sta, bf, false);
-+ } while (1);
-+@@ -1443,34 +1459,33 @@ static bool ath_tx_sched_aggr(struct ath
-+ {
-+ struct ath_buf *bf;
-+ struct ieee80211_tx_info *tx_info;
-+- struct sk_buff_head *tid_q;
-+ struct list_head bf_q;
-+ int aggr_len = 0;
-+- bool aggr, last = true;
-++ bool aggr;
-+
-+ if (!ath_tid_has_buffered(tid))
-+ return false;
-+
-+ INIT_LIST_HEAD(&bf_q);
-+
-+- bf = ath_tx_get_tid_subframe(sc, txq, tid, &tid_q);
-++ bf = ath_tx_get_tid_subframe(sc, txq, tid);
-+ if (!bf)
-+ return false;
-+
-+ tx_info = IEEE80211_SKB_CB(bf->bf_mpdu);
-+ aggr = !!(tx_info->flags & IEEE80211_TX_CTL_AMPDU);
-+ if ((aggr && txq->axq_ampdu_depth >= ATH_AGGR_MIN_QDEPTH) ||
-+- (!aggr && txq->axq_depth >= ATH_NON_AGGR_MIN_QDEPTH)) {
-++ (!aggr && txq->axq_depth >= ATH_NON_AGGR_MIN_QDEPTH)) {
-++ __skb_queue_tail(&tid->retry_q, bf->bf_mpdu);
-+ *stop = true;
-+ return false;
-+ }
-+
-+ ath_set_rates(tid->an->vif, tid->an->sta, bf, false);
-+ if (aggr)
-+- last = ath_tx_form_aggr(sc, txq, tid, &bf_q, bf,
-+- tid_q, &aggr_len);
-++ aggr_len = ath_tx_form_aggr(sc, txq, tid, &bf_q, bf);
-+ else
-+- ath_tx_form_burst(sc, txq, tid, &bf_q, bf, tid_q);
-++ ath_tx_form_burst(sc, txq, tid, &bf_q, bf);
-+
-+ if (list_empty(&bf_q))
-+ return false;
-+@@ -1513,9 +1528,6 @@ int ath_tx_aggr_start(struct ath_softc *
-+ an->mpdudensity = density;
-+ }
-+
-+- /* force sequence number allocation for pending frames */
-+- ath_tx_tid_change_state(sc, txtid);
-+-
-+ txtid->active = true;
-+ *ssn = txtid->seq_start = txtid->seq_next;
-+ txtid->bar_index = -1;
-+@@ -1540,7 +1552,6 @@ void ath_tx_aggr_stop(struct ath_softc *
-+ ath_txq_lock(sc, txq);
-+ txtid->active = false;
-+ ath_tx_flush_tid(sc, txtid);
-+- ath_tx_tid_change_state(sc, txtid);
-+ ath_txq_unlock_complete(sc, txq);
-+ }
-+
-+@@ -1550,14 +1561,12 @@ void ath_tx_aggr_sleep(struct ieee80211_
-+ struct ath_common *common = ath9k_hw_common(sc->sc_ah);
-+ struct ath_atx_tid *tid;
-+ struct ath_txq *txq;
-+- bool buffered;
-+ int tidno;
-+
-+ ath_dbg(common, XMIT, "%s called\n", __func__);
-+
-+- for (tidno = 0, tid = &an->tid[tidno];
-+- tidno < IEEE80211_NUM_TIDS; tidno++, tid++) {
-+-
-++ for (tidno = 0; tidno < IEEE80211_NUM_TIDS; tidno++) {
-++ tid = ATH_AN_2_TID(an, tidno);
-+ txq = tid->txq;
-+
-+ ath_txq_lock(sc, txq);
-+@@ -1567,13 +1576,12 @@ void ath_tx_aggr_sleep(struct ieee80211_
-+ continue;
-+ }
-+
-+- buffered = ath_tid_has_buffered(tid);
-++ if (!skb_queue_empty(&tid->retry_q))
-++ ieee80211_sta_set_buffered(sta, tid->tidno, true);
-+
-+ list_del_init(&tid->list);
-+
-+ ath_txq_unlock(sc, txq);
-+-
-+- ieee80211_sta_set_buffered(sta, tidno, buffered);
-+ }
-+ }
-+
-+@@ -1586,19 +1594,16 @@ void ath_tx_aggr_wakeup(struct ath_softc
-+
-+ ath_dbg(common, XMIT, "%s called\n", __func__);
-+
-+- for (tidno = 0, tid = &an->tid[tidno];
-+- tidno < IEEE80211_NUM_TIDS; tidno++, tid++) {
-+-
-++ for (tidno = 0; tidno < IEEE80211_NUM_TIDS; tidno++) {
-++ tid = ATH_AN_2_TID(an, tidno);
-+ txq = tid->txq;
-+
-+ ath_txq_lock(sc, txq);
-+ tid->clear_ps_filter = true;
-+-
-+ if (ath_tid_has_buffered(tid)) {
-+ ath_tx_queue_tid(sc, txq, tid);
-+ ath_txq_schedule(sc, txq);
-+ }
-+-
-+ ath_txq_unlock_complete(sc, txq);
-+ }
-+ }
-+@@ -1621,11 +1626,6 @@ void ath_tx_aggr_resume(struct ath_softc
-+
-+ tid->baw_size = IEEE80211_MIN_AMPDU_BUF << sta->ht_cap.ampdu_factor;
-+
-+- if (ath_tid_has_buffered(tid)) {
-+- ath_tx_queue_tid(sc, txq, tid);
-+- ath_txq_schedule(sc, txq);
-+- }
-+-
-+ ath_txq_unlock_complete(sc, txq);
-+ }
-+
-+@@ -1641,7 +1641,6 @@ void ath9k_release_buffered_frames(struc
-+ struct ieee80211_tx_info *info;
-+ struct list_head bf_q;
-+ struct ath_buf *bf_tail = NULL, *bf;
-+- struct sk_buff_head *tid_q;
-+ int sent = 0;
-+ int i;
-+
-+@@ -1656,11 +1655,10 @@ void ath9k_release_buffered_frames(struc
-+
-+ ath_txq_lock(sc, tid->txq);
-+ while (nframes > 0) {
-+- bf = ath_tx_get_tid_subframe(sc, sc->tx.uapsdq, tid, &tid_q);
-++ bf = ath_tx_get_tid_subframe(sc, sc->tx.uapsdq, tid);
-+ if (!bf)
-+ break;
-+
-+- __skb_unlink(bf->bf_mpdu, tid_q);
-+ list_add_tail(&bf->list, &bf_q);
-+ ath_set_rates(tid->an->vif, tid->an->sta, bf, true);
-+ if (bf_isampdu(bf)) {
-+@@ -1675,7 +1673,7 @@ void ath9k_release_buffered_frames(struc
-+ sent++;
-+ TX_STAT_INC(txq->axq_qnum, a_queued_hw);
-+
-+- if (an->sta && !ath_tid_has_buffered(tid))
-++ if (an->sta && skb_queue_empty(&tid->retry_q))
-+ ieee80211_sta_set_buffered(an->sta, i, false);
-+ }
-+ ath_txq_unlock_complete(sc, tid->txq);
-+@@ -1902,13 +1900,7 @@ bool ath_drain_all_txq(struct ath_softc
-+ if (!ATH_TXQ_SETUP(sc, i))
-+ continue;
-+
-+- /*
-+- * The caller will resume queues with ieee80211_wake_queues.
-+- * Mark the queue as not stopped to prevent ath_tx_complete
-+- * from waking the queue too early.
-+- */
-+ txq = &sc->tx.txq[i];
-+- txq->stopped = false;
-+ ath_draintxq(sc, txq);
-+ }
-+
-+@@ -2308,15 +2300,12 @@ int ath_tx_start(struct ieee80211_hw *hw
-+ struct ath_txq *txq = txctl->txq;
-+ struct ath_atx_tid *tid = NULL;
-+ struct ath_buf *bf;
-+- bool queue, ps_resp;
-++ bool ps_resp;
-+ int q, ret;
-+
-+ if (vif)
-+ avp = (void *)vif->drv_priv;
-+
-+- if (info->flags & IEEE80211_TX_CTL_TX_OFFCHAN)
-+- txctl->force_channel = true;
-+-
-+ ps_resp = !!(info->control.flags & IEEE80211_TX_CTRL_PS_RESPONSE);
-+
-+ ret = ath_tx_prepare(hw, skb, txctl);
-+@@ -2331,63 +2320,13 @@ int ath_tx_start(struct ieee80211_hw *hw
-+
-+ q = skb_get_queue_mapping(skb);
-+
-++ if (ps_resp)
-++ txq = sc->tx.uapsdq;
-++
-+ ath_txq_lock(sc, txq);
-+ if (txq == sc->tx.txq_map[q]) {
-+ fi->txq = q;
-+- if (++txq->pending_frames > sc->tx.txq_max_pending[q] &&
-+- !txq->stopped) {
-+- if (ath9k_is_chanctx_enabled())
-+- ieee80211_stop_queue(sc->hw, info->hw_queue);
-+- else
-+- ieee80211_stop_queue(sc->hw, q);
-+- txq->stopped = true;
-+- }
-+- }
-+-
-+- queue = ieee80211_is_data_present(hdr->frame_control);
-+-
-+- /* If chanctx, queue all null frames while NOA could be there */
-+- if (ath9k_is_chanctx_enabled() &&
-+- ieee80211_is_nullfunc(hdr->frame_control) &&
-+- !txctl->force_channel)
-+- queue = true;
-+-
-+- /* Force queueing of all frames that belong to a virtual interface on
-+- * a different channel context, to ensure that they are sent on the
-+- * correct channel.
-+- */
-+- if (((avp && avp->chanctx != sc->cur_chan) ||
-+- sc->cur_chan->stopped) && !txctl->force_channel) {
-+- if (!txctl->an)
-+- txctl->an = &avp->mcast_node;
-+- queue = true;
-+- ps_resp = false;
-+- }
-+-
-+- if (txctl->an && queue)
-+- tid = ath_get_skb_tid(sc, txctl->an, skb);
-+-
-+- if (ps_resp) {
-+- ath_txq_unlock(sc, txq);
-+- txq = sc->tx.uapsdq;
-+- ath_txq_lock(sc, txq);
-+- } else if (txctl->an && queue) {
-+- WARN_ON(tid->txq != txctl->txq);
-+-
-+- if (info->flags & IEEE80211_TX_CTL_CLEAR_PS_FILT)
-+- tid->clear_ps_filter = true;
-+-
-+- /*
-+- * Add this frame to software queue for scheduling later
-+- * for aggregation.
-+- */
-+- TX_STAT_INC(txq->axq_qnum, a_queued_sw);
-+- __skb_queue_tail(&tid->buf_q, skb);
-+- if (!txctl->an->sleeping)
-+- ath_tx_queue_tid(sc, txq, tid);
-+-
-+- ath_txq_schedule(sc, txq);
-+- goto out;
-++ ++txq->pending_frames;
-+ }
-+
-+ bf = ath_tx_setup_buffer(sc, txq, tid, skb);
-+@@ -2871,9 +2810,8 @@ void ath_tx_node_init(struct ath_softc *
-+ struct ath_atx_tid *tid;
-+ int tidno, acno;
-+
-+- for (tidno = 0, tid = &an->tid[tidno];
-+- tidno < IEEE80211_NUM_TIDS;
-+- tidno++, tid++) {
-++ for (tidno = 0; tidno < IEEE80211_NUM_TIDS; tidno++) {
-++ tid = ATH_AN_2_TID(an, tidno);
-+ tid->an = an;
-+ tid->tidno = tidno;
-+ tid->seq_start = tid->seq_next = 0;
-+@@ -2881,11 +2819,14 @@ void ath_tx_node_init(struct ath_softc *
-+ tid->baw_head = tid->baw_tail = 0;
-+ tid->active = false;
-+ tid->clear_ps_filter = true;
-+- __skb_queue_head_init(&tid->buf_q);
-++ tid->has_queued = false;
-+ __skb_queue_head_init(&tid->retry_q);
-+ INIT_LIST_HEAD(&tid->list);
-+ acno = TID_TO_WME_AC(tidno);
-+ tid->txq = sc->tx.txq_map[acno];
-++
-++ if (!an->sta)
-++ break; /* just one multicast ath_atx_tid */
-+ }
-+ }
-+
-+@@ -2895,9 +2836,8 @@ void ath_tx_node_cleanup(struct ath_soft
-+ struct ath_txq *txq;
-+ int tidno;
-+
-+- for (tidno = 0, tid = &an->tid[tidno];
-+- tidno < IEEE80211_NUM_TIDS; tidno++, tid++) {
-+-
-++ for (tidno = 0; tidno < IEEE80211_NUM_TIDS; tidno++) {
-++ tid = ATH_AN_2_TID(an, tidno);
-+ txq = tid->txq;
-+
-+ ath_txq_lock(sc, txq);
-+@@ -2909,6 +2849,9 @@ void ath_tx_node_cleanup(struct ath_soft
-+ tid->active = false;
-+
-+ ath_txq_unlock(sc, txq);
-++
-++ if (!an->sta)
-++ break; /* just one multicast ath_atx_tid */
-+ }
-+ }
-+
-diff --git a/package/kernel/mac80211/patches/320-cfg80211-add-support-for-non-linear-skbs-in-ieee8021.patch b/package/kernel/mac80211/patches/320-cfg80211-add-support-for-non-linear-skbs-in-ieee8021.patch
-deleted file mode 100644
-index 2eeed22af0adb5e8386f5f5e75af725bbf71ec7b..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/320-cfg80211-add-support-for-non-linear-skbs-in-ieee8021.patch
-+++ /dev/null
-@@ -1,159 +0,0 @@
--From: Felix Fietkau <nbd@openwrt.org>
--Date: Tue, 2 Feb 2016 14:39:10 +0100
--Subject: [PATCH] cfg80211: add support for non-linear skbs in
-- ieee80211_amsdu_to_8023s
--
--Signed-off-by: Felix Fietkau <nbd@openwrt.org>
--Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-----
--
----- a/net/wireless/util.c
--+++ b/net/wireless/util.c
--@@ -644,73 +644,75 @@ int ieee80211_data_from_8023(struct sk_b
-- }
-- EXPORT_SYMBOL(ieee80211_data_from_8023);
--
--+static struct sk_buff *
--+__ieee80211_amsdu_copy(struct sk_buff *skb, unsigned int hlen,
--+ int offset, int len)
--+{
--+ struct sk_buff *frame;
--+
--+ if (skb->len - offset < len)
--+ return NULL;
--+
--+ /*
--+ * Allocate and reserve two bytes more for payload
--+ * alignment since sizeof(struct ethhdr) is 14.
--+ */
--+ frame = dev_alloc_skb(hlen + sizeof(struct ethhdr) + 2 + len);
--+
--+ skb_reserve(frame, hlen + sizeof(struct ethhdr) + 2);
--+ skb_copy_bits(skb, offset, skb_put(frame, len), len);
--+
--+ return frame;
--+}
--
-- void ieee80211_amsdu_to_8023s(struct sk_buff *skb, struct sk_buff_head *list,
-- const u8 *addr, enum nl80211_iftype iftype,
-- const unsigned int extra_headroom,
-- bool has_80211_header)
-- {
--+ unsigned int hlen = ALIGN(extra_headroom, 4);
-- struct sk_buff *frame = NULL;
-- u16 ethertype;
-- u8 *payload;
--- const struct ethhdr *eth;
--- int remaining, err;
--- u8 dst[ETH_ALEN], src[ETH_ALEN];
---
--- if (skb_linearize(skb))
--- goto out;
--+ int offset = 0, remaining, err;
--+ struct ethhdr eth;
--+ bool reuse_skb = true;
--+ bool last = false;
--
-- if (has_80211_header) {
--- err = ieee80211_data_to_8023(skb, addr, iftype);
--+ err = __ieee80211_data_to_8023(skb, ð, addr, iftype);
-- if (err)
-- goto out;
---
--- /* skip the wrapping header */
--- eth = (struct ethhdr *) skb_pull(skb, sizeof(struct ethhdr));
--- if (!eth)
--- goto out;
--- } else {
--- eth = (struct ethhdr *) skb->data;
-- }
--
--- while (skb != frame) {
--+ while (!last) {
--+ unsigned int subframe_len;
--+ int len;
-- u8 padding;
--- __be16 len = eth->h_proto;
--- unsigned int subframe_len = sizeof(struct ethhdr) + ntohs(len);
---
--- remaining = skb->len;
--- memcpy(dst, eth->h_dest, ETH_ALEN);
--- memcpy(src, eth->h_source, ETH_ALEN);
--
--+ skb_copy_bits(skb, offset, ð, sizeof(eth));
--+ len = ntohs(eth.h_proto);
--+ subframe_len = sizeof(struct ethhdr) + len;
-- padding = (4 - subframe_len) & 0x3;
--+
-- /* the last MSDU has no padding */
--+ remaining = skb->len - offset;
-- if (subframe_len > remaining)
-- goto purge;
--
--- skb_pull(skb, sizeof(struct ethhdr));
--+ offset += sizeof(struct ethhdr);
-- /* reuse skb for the last subframe */
--- if (remaining <= subframe_len + padding)
--+ last = remaining <= subframe_len + padding;
--+ if (!skb_is_nonlinear(skb) && last) {
--+ skb_pull(skb, offset);
-- frame = skb;
--- else {
--- unsigned int hlen = ALIGN(extra_headroom, 4);
--- /*
--- * Allocate and reserve two bytes more for payload
--- * alignment since sizeof(struct ethhdr) is 14.
--- */
--- frame = dev_alloc_skb(hlen + subframe_len + 2);
--+ reuse_skb = true;
--+ } else {
--+ frame = __ieee80211_amsdu_copy(skb, hlen, offset, len);
-- if (!frame)
-- goto purge;
--
--- skb_reserve(frame, hlen + sizeof(struct ethhdr) + 2);
--- memcpy(skb_put(frame, ntohs(len)), skb->data,
--- ntohs(len));
---
--- eth = (struct ethhdr *)skb_pull(skb, ntohs(len) +
--- padding);
--- if (!eth) {
--- dev_kfree_skb(frame);
--- goto purge;
--- }
--+ offset += len + padding;
-- }
--
-- skb_reset_network_header(frame);
--@@ -719,24 +721,20 @@ void ieee80211_amsdu_to_8023s(struct sk_
--
-- payload = frame->data;
-- ethertype = (payload[6] << 8) | payload[7];
---
-- if (likely((ether_addr_equal(payload, rfc1042_header) &&
-- ethertype != ETH_P_AARP && ethertype != ETH_P_IPX) ||
-- ether_addr_equal(payload, bridge_tunnel_header))) {
--- /* remove RFC1042 or Bridge-Tunnel
--- * encapsulation and replace EtherType */
--- skb_pull(frame, 6);
--- memcpy(skb_push(frame, ETH_ALEN), src, ETH_ALEN);
--- memcpy(skb_push(frame, ETH_ALEN), dst, ETH_ALEN);
--- } else {
--- memcpy(skb_push(frame, sizeof(__be16)), &len,
--- sizeof(__be16));
--- memcpy(skb_push(frame, ETH_ALEN), src, ETH_ALEN);
--- memcpy(skb_push(frame, ETH_ALEN), dst, ETH_ALEN);
--+ eth.h_proto = htons(ethertype);
--+ skb_pull(frame, ETH_ALEN + 2);
-- }
--+
--+ memcpy(skb_push(frame, sizeof(eth)), ð, sizeof(eth));
-- __skb_queue_tail(list, frame);
-- }
--
--+ if (!reuse_skb)
--+ dev_kfree_skb(skb);
--+
-- return;
--
-- purge:
-diff --git a/package/kernel/mac80211/patches/321-ath9k_hw-reset-AHB-WMAC-interface-on-AR91xx.patch b/package/kernel/mac80211/patches/321-ath9k_hw-reset-AHB-WMAC-interface-on-AR91xx.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..9caa76dc5d40a2fe2ce332e549bfba762a1431d5
---- /dev/null
-+++ b/package/kernel/mac80211/patches/321-ath9k_hw-reset-AHB-WMAC-interface-on-AR91xx.patch
-@@ -0,0 +1,25 @@
-+From: Felix Fietkau <nbd@nbd.name>
-+Date: Sat, 9 Jul 2016 15:25:24 +0200
-+Subject: [PATCH] ath9k_hw: reset AHB-WMAC interface on AR91xx
-+
-+Should fix a few stability issues
-+
-+Signed-off-by: Felix Fietkau <nbd@nbd.name>
-+---
-+
-+--- a/drivers/net/wireless/ath/ath9k/hw.c
-++++ b/drivers/net/wireless/ath/ath9k/hw.c
-+@@ -1398,8 +1398,12 @@ static bool ath9k_hw_set_reset(struct at
-+ if (!AR_SREV_9100(ah))
-+ REG_WRITE(ah, AR_RC, 0);
-+
-+- if (AR_SREV_9100(ah))
-++ if (AR_SREV_9100(ah)) {
-++ /* Reset the AHB-WMAC interface */
-++ if (ah->external_reset)
-++ ah->external_reset();
-+ udelay(50);
-++ }
-+
-+ return true;
-+ }
-diff --git a/package/kernel/mac80211/patches/321-mac80211-Parse-legacy-and-HT-rate-in-injected-frames.patch b/package/kernel/mac80211/patches/321-mac80211-Parse-legacy-and-HT-rate-in-injected-frames.patch
-deleted file mode 100644
-index c4155a118101fb910100de80f4ac7f6da1787a1c..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/321-mac80211-Parse-legacy-and-HT-rate-in-injected-frames.patch
-+++ /dev/null
-@@ -1,155 +0,0 @@
--From: Sven Eckelmann <sven@narfation.org>
--Date: Tue, 26 Jan 2016 17:11:13 +0100
--Subject: [PATCH] mac80211: Parse legacy and HT rate in injected frames
--
--Drivers/devices without their own rate control algorithm can get the
--information what rates they should use from either the radiotap header of
--injected frames or from the rate control algorithm. But the parsing of the
--legacy rate information from the radiotap header was removed in commit
--e6a9854b05c1 ("mac80211/drivers: rewrite the rate control API").
--
--The removal of this feature heavily reduced the usefulness of frame
--injection when wanting to simulate specific transmission behavior. Having
--rate parsing together with MCS rates and retry support allows a fine
--grained selection of the tx behavior of injected frames for these kind of
--tests.
--
--Signed-off-by: Sven Eckelmann <sven@narfation.org>
--Cc: Simon Wunderlich <sw@simonwunderlich.de>
--Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-----
--
----- a/include/net/mac80211.h
--+++ b/include/net/mac80211.h
--@@ -708,12 +708,14 @@ enum mac80211_tx_info_flags {
-- * protocol frame (e.g. EAP)
-- * @IEEE80211_TX_CTRL_PS_RESPONSE: This frame is a response to a poll
-- * frame (PS-Poll or uAPSD).
--+ * @IEEE80211_TX_CTRL_RATE_INJECT: This frame is injected with rate information
-- *
-- * These flags are used in tx_info->control.flags.
-- */
-- enum mac80211_tx_control_flags {
-- IEEE80211_TX_CTRL_PORT_CTRL_PROTO = BIT(0),
-- IEEE80211_TX_CTRL_PS_RESPONSE = BIT(1),
--+ IEEE80211_TX_CTRL_RATE_INJECT = BIT(2),
-- };
--
-- /*
----- a/net/mac80211/tx.c
--+++ b/net/mac80211/tx.c
--@@ -710,6 +710,10 @@ ieee80211_tx_h_rate_ctrl(struct ieee8021
--
-- info->control.short_preamble = txrc.short_preamble;
--
--+ /* don't ask rate control when rate already injected via radiotap */
--+ if (info->control.flags & IEEE80211_TX_CTRL_RATE_INJECT)
--+ return TX_CONTINUE;
--+
-- if (tx->sta)
-- assoc = test_sta_flag(tx->sta, WLAN_STA_ASSOC);
--
--@@ -1665,15 +1669,24 @@ void ieee80211_xmit(struct ieee80211_sub
-- ieee80211_tx(sdata, sta, skb, false);
-- }
--
---static bool ieee80211_parse_tx_radiotap(struct sk_buff *skb)
--+static bool ieee80211_parse_tx_radiotap(struct ieee80211_local *local,
--+ struct sk_buff *skb)
-- {
-- struct ieee80211_radiotap_iterator iterator;
-- struct ieee80211_radiotap_header *rthdr =
-- (struct ieee80211_radiotap_header *) skb->data;
-- struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
--+ struct ieee80211_supported_band *sband =
--+ local->hw.wiphy->bands[info->band];
-- int ret = ieee80211_radiotap_iterator_init(&iterator, rthdr, skb->len,
-- NULL);
-- u16 txflags;
--+ u16 rate = 0;
--+ bool rate_found = false;
--+ u8 rate_retries = 0;
--+ u16 rate_flags = 0;
--+ u8 mcs_known, mcs_flags;
--+ int i;
--
-- info->flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT |
-- IEEE80211_TX_CTL_DONTFRAG;
--@@ -1724,6 +1737,35 @@ static bool ieee80211_parse_tx_radiotap(
-- info->flags |= IEEE80211_TX_CTL_NO_ACK;
-- break;
--
--+ case IEEE80211_RADIOTAP_RATE:
--+ rate = *iterator.this_arg;
--+ rate_flags = 0;
--+ rate_found = true;
--+ break;
--+
--+ case IEEE80211_RADIOTAP_DATA_RETRIES:
--+ rate_retries = *iterator.this_arg;
--+ break;
--+
--+ case IEEE80211_RADIOTAP_MCS:
--+ mcs_known = iterator.this_arg[0];
--+ mcs_flags = iterator.this_arg[1];
--+ if (!(mcs_known & IEEE80211_RADIOTAP_MCS_HAVE_MCS))
--+ break;
--+
--+ rate_found = true;
--+ rate = iterator.this_arg[2];
--+ rate_flags = IEEE80211_TX_RC_MCS;
--+
--+ if (mcs_known & IEEE80211_RADIOTAP_MCS_HAVE_GI &&
--+ mcs_flags & IEEE80211_RADIOTAP_MCS_SGI)
--+ rate_flags |= IEEE80211_TX_RC_SHORT_GI;
--+
--+ if (mcs_known & IEEE80211_RADIOTAP_MCS_HAVE_BW &&
--+ mcs_flags & IEEE80211_RADIOTAP_MCS_BW_40)
--+ rate_flags |= IEEE80211_TX_RC_40_MHZ_WIDTH;
--+ break;
--+
-- /*
-- * Please update the file
-- * Documentation/networking/mac80211-injection.txt
--@@ -1738,6 +1780,32 @@ static bool ieee80211_parse_tx_radiotap(
-- if (ret != -ENOENT) /* ie, if we didn't simply run out of fields */
-- return false;
--
--+ if (rate_found) {
--+ info->control.flags |= IEEE80211_TX_CTRL_RATE_INJECT;
--+
--+ for (i = 0; i < IEEE80211_TX_MAX_RATES; i++) {
--+ info->control.rates[i].idx = -1;
--+ info->control.rates[i].flags = 0;
--+ info->control.rates[i].count = 0;
--+ }
--+
--+ if (rate_flags & IEEE80211_TX_RC_MCS) {
--+ info->control.rates[0].idx = rate;
--+ } else {
--+ for (i = 0; i < sband->n_bitrates; i++) {
--+ if (rate * 5 != sband->bitrates[i].bitrate)
--+ continue;
--+
--+ info->control.rates[0].idx = i;
--+ break;
--+ }
--+ }
--+
--+ info->control.rates[0].flags = rate_flags;
--+ info->control.rates[0].count = min_t(u8, rate_retries + 1,
--+ local->hw.max_rate_tries);
--+ }
--+
-- /*
-- * remove the radiotap header
-- * iterator->_max_length was sanity-checked against
--@@ -1819,7 +1887,7 @@ netdev_tx_t ieee80211_monitor_start_xmit
-- IEEE80211_TX_CTL_INJECTED;
--
-- /* process and remove the injection radiotap header */
--- if (!ieee80211_parse_tx_radiotap(skb))
--+ if (!ieee80211_parse_tx_radiotap(local, skb))
-- goto fail;
--
-- rcu_read_lock();
-diff --git a/package/kernel/mac80211/patches/322-ath9k_hw-issue-external-reset-for-QCA9550.patch b/package/kernel/mac80211/patches/322-ath9k_hw-issue-external-reset-for-QCA9550.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..5d4e849b7fd3e0cf1510e5759c150571864b3c89
---- /dev/null
-+++ b/package/kernel/mac80211/patches/322-ath9k_hw-issue-external-reset-for-QCA9550.patch
-@@ -0,0 +1,125 @@
-+From: Felix Fietkau <nbd@nbd.name>
-+Date: Sat, 9 Jul 2016 15:26:44 +0200
-+Subject: [PATCH] ath9k_hw: issue external reset for QCA9550
-+
-+The RTC interface on the SoC needs to be reset along with the rest of
-+the WMAC.
-+
-+Signed-off-by: Felix Fietkau <nbd@nbd.name>
-+---
-+
-+--- a/drivers/net/wireless/ath/ath9k/hw.c
-++++ b/drivers/net/wireless/ath/ath9k/hw.c
-+@@ -1275,39 +1275,56 @@ void ath9k_hw_get_delta_slope_vals(struc
-+ *coef_exponent = coef_exp - 16;
-+ }
-+
-+-/* AR9330 WAR:
-+- * call external reset function to reset WMAC if:
-+- * - doing a cold reset
-+- * - we have pending frames in the TX queues.
-+- */
-+-static bool ath9k_hw_ar9330_reset_war(struct ath_hw *ah, int type)
-++static bool ath9k_hw_need_external_reset(struct ath_hw *ah, int type)
-+ {
-+- int i, npend = 0;
-++ int i;
-+
-+- for (i = 0; i < AR_NUM_QCU; i++) {
-+- npend = ath9k_hw_numtxpending(ah, i);
-+- if (npend)
-+- break;
-++ if (type == ATH9K_RESET_COLD)
-++ return true;
-++
-++ if (AR_SREV_9550(ah))
-++ return true;
-++
-++ /* AR9330 WAR:
-++ * call external reset function to reset WMAC if:
-++ * - doing a cold reset
-++ * - we have pending frames in the TX queues.
-++ */
-++ if (AR_SREV_9330(ah)) {
-++ for (i = 0; i < AR_NUM_QCU; i++) {
-++ if (ath9k_hw_numtxpending(ah, i))
-++ return true;
-++ }
-+ }
-+
-+- if (ah->external_reset &&
-+- (npend || type == ATH9K_RESET_COLD)) {
-+- int reset_err = 0;
-++ return false;
-++}
-+
-+- ath_dbg(ath9k_hw_common(ah), RESET,
-+- "reset MAC via external reset\n");
-++static bool ath9k_hw_external_reset(struct ath_hw *ah, int type)
-++{
-++ int err;
-+
-+- reset_err = ah->external_reset();
-+- if (reset_err) {
-+- ath_err(ath9k_hw_common(ah),
-+- "External reset failed, err=%d\n",
-+- reset_err);
-+- return false;
-+- }
-++ if (!ah->external_reset || !ath9k_hw_need_external_reset(ah, type))
-++ return true;
-+
-+- REG_WRITE(ah, AR_RTC_RESET, 1);
-++ ath_dbg(ath9k_hw_common(ah), RESET,
-++ "reset MAC via external reset\n");
-++
-++ err = ah->external_reset();
-++ if (err) {
-++ ath_err(ath9k_hw_common(ah),
-++ "External reset failed, err=%d\n", err);
-++ return false;
-++ }
-++
-++ if (AR_SREV_9550(ah)) {
-++ REG_WRITE(ah, AR_RTC_RESET, 0);
-++ udelay(10);
-+ }
-+
-++ REG_WRITE(ah, AR_RTC_RESET, 1);
-++ udelay(10);
-++
-+ return true;
-+ }
-+
-+@@ -1360,24 +1377,23 @@ static bool ath9k_hw_set_reset(struct at
-+ rst_flags |= AR_RTC_RC_MAC_COLD;
-+ }
-+
-+- if (AR_SREV_9330(ah)) {
-+- if (!ath9k_hw_ar9330_reset_war(ah, type))
-+- return false;
-+- }
-+-
-+ if (ath9k_hw_mci_is_enabled(ah))
-+ ar9003_mci_check_gpm_offset(ah);
-+
-+ /* DMA HALT added to resolve ar9300 and ar9580 bus error during
-+- * RTC_RC reg read
-++ * RTC_RC reg read. Also needed for AR9550 external reset
-+ */
-+- if (AR_SREV_9300(ah) || AR_SREV_9580(ah)) {
-++ if (AR_SREV_9300(ah) || AR_SREV_9580(ah) || AR_SREV_9550(ah)) {
-+ REG_SET_BIT(ah, AR_CFG, AR_CFG_HALT_REQ);
-+ ath9k_hw_wait(ah, AR_CFG, AR_CFG_HALT_ACK, AR_CFG_HALT_ACK,
-+ 20 * AH_WAIT_TIMEOUT);
-+- REG_CLR_BIT(ah, AR_CFG, AR_CFG_HALT_REQ);
-+ }
-+
-++ ath9k_hw_external_reset(ah, type);
-++
-++ if (AR_SREV_9300(ah) || AR_SREV_9580(ah))
-++ REG_CLR_BIT(ah, AR_CFG, AR_CFG_HALT_REQ);
-++
-+ REG_WRITE(ah, AR_RTC_RC, rst_flags);
-+
-+ REGWRITE_BUFFER_FLUSH(ah);
-diff --git a/package/kernel/mac80211/patches/322-mac80211-add-A-MSDU-tx-support.patch b/package/kernel/mac80211/patches/322-mac80211-add-A-MSDU-tx-support.patch
-deleted file mode 100644
-index e7bfb9c83dd406e41e523195fabd0a4611dc86b4..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/322-mac80211-add-A-MSDU-tx-support.patch
-+++ /dev/null
-@@ -1,317 +0,0 @@
--From: Felix Fietkau <nbd@openwrt.org>
--Date: Fri, 5 Feb 2016 01:38:51 +0100
--Subject: [PATCH] mac80211: add A-MSDU tx support
--
--Requires software tx queueing support. frag_list support (for zero-copy)
--is optional.
--
--Signed-off-by: Felix Fietkau <nbd@openwrt.org>
-----
--
----- a/include/net/mac80211.h
--+++ b/include/net/mac80211.h
--@@ -709,6 +709,7 @@ enum mac80211_tx_info_flags {
-- * @IEEE80211_TX_CTRL_PS_RESPONSE: This frame is a response to a poll
-- * frame (PS-Poll or uAPSD).
-- * @IEEE80211_TX_CTRL_RATE_INJECT: This frame is injected with rate information
--+ * @IEEE80211_TX_CTRL_AMSDU: This frame is an A-MSDU frame
-- *
-- * These flags are used in tx_info->control.flags.
-- */
--@@ -716,6 +717,7 @@ enum mac80211_tx_control_flags {
-- IEEE80211_TX_CTRL_PORT_CTRL_PROTO = BIT(0),
-- IEEE80211_TX_CTRL_PS_RESPONSE = BIT(1),
-- IEEE80211_TX_CTRL_RATE_INJECT = BIT(2),
--+ IEEE80211_TX_CTRL_AMSDU = BIT(3),
-- };
--
-- /*
--@@ -1728,6 +1730,7 @@ struct ieee80211_sta_rates {
-- * size is min(max_amsdu_len, 7935) bytes.
-- * Both additional HT limits must be enforced by the low level driver.
-- * This is defined by the spec (IEEE 802.11-2012 section 8.3.2.2 NOTE 2).
--+ * @max_rc_amsdu_len: Maximum A-MSDU size in bytes recommended by rate control.
-- * @txq: per-TID data TX queues (if driver uses the TXQ abstraction)
-- */
-- struct ieee80211_sta {
--@@ -1748,6 +1751,7 @@ struct ieee80211_sta {
-- bool mfp;
-- u8 max_amsdu_subframes;
-- u16 max_amsdu_len;
--+ u16 max_rc_amsdu_len;
--
-- struct ieee80211_txq *txq[IEEE80211_NUM_TIDS];
--
--@@ -1961,6 +1965,15 @@ struct ieee80211_txq {
-- * order and does not need to manage its own reorder buffer or BA session
-- * timeout.
-- *
--+ * @IEEE80211_HW_TX_AMSDU: Hardware (or driver) supports software aggregated
--+ * A-MSDU frames. Requires software tx queueing and fast-xmit support.
--+ * When not using minstrel/minstrel_ht rate control, the driver should
--+ * limit the maximum A-MSDU size based on the current tx rate by setting
--+ * max_rc_amsdu_len in struct ieee80211_sta.
--+ *
--+ * @IEEE80211_HW_TX_FRAG_LIST: Hardware (or driver) supports sending frag_list
--+ * skbs, needed for zero-copy software A-MSDU.
--+ *
-- * @NUM_IEEE80211_HW_FLAGS: number of hardware flags, used for sizing arrays
-- */
-- enum ieee80211_hw_flags {
--@@ -1998,6 +2011,8 @@ enum ieee80211_hw_flags {
-- IEEE80211_HW_BEACON_TX_STATUS,
-- IEEE80211_HW_NEEDS_UNIQUE_STA_ADDR,
-- IEEE80211_HW_SUPPORTS_REORDERING_BUFFER,
--+ IEEE80211_HW_TX_AMSDU,
--+ IEEE80211_HW_TX_FRAG_LIST,
--
-- /* keep last, obviously */
-- NUM_IEEE80211_HW_FLAGS
--@@ -2070,6 +2085,9 @@ enum ieee80211_hw_flags {
-- * size is smaller (an example is LinkSys WRT120N with FW v1.0.07
-- * build 002 Jun 18 2012).
-- *
--+ * @max_tx_fragments: maximum number of tx buffers per (A)-MSDU, sum
--+ * of 1 + skb_shinfo(skb)->nr_frags for each skb in the frag_list.
--+ *
-- * @offchannel_tx_hw_queue: HW queue ID to use for offchannel TX
-- * (if %IEEE80211_HW_QUEUE_CONTROL is set)
-- *
--@@ -2124,6 +2142,7 @@ struct ieee80211_hw {
-- u8 max_rate_tries;
-- u8 max_rx_aggregation_subframes;
-- u8 max_tx_aggregation_subframes;
--+ u8 max_tx_fragments;
-- u8 offchannel_tx_hw_queue;
-- u8 radiotap_mcs_details;
-- u16 radiotap_vht_details;
----- a/net/mac80211/agg-tx.c
--+++ b/net/mac80211/agg-tx.c
--@@ -935,6 +935,7 @@ void ieee80211_process_addba_resp(struct
-- size_t len)
-- {
-- struct tid_ampdu_tx *tid_tx;
--+ struct ieee80211_txq *txq;
-- u16 capab, tid;
-- u8 buf_size;
-- bool amsdu;
--@@ -945,6 +946,10 @@ void ieee80211_process_addba_resp(struct
-- buf_size = (capab & IEEE80211_ADDBA_PARAM_BUF_SIZE_MASK) >> 6;
-- buf_size = min(buf_size, local->hw.max_tx_aggregation_subframes);
--
--+ txq = sta->sta.txq[tid];
--+ if (!amsdu && txq)
--+ set_bit(IEEE80211_TXQ_NO_AMSDU, &to_txq_info(txq)->flags);
--+
-- mutex_lock(&sta->ampdu_mlme.mtx);
--
-- tid_tx = rcu_dereference_protected_tid_tx(sta, tid);
----- a/net/mac80211/debugfs.c
--+++ b/net/mac80211/debugfs.c
--@@ -127,6 +127,8 @@ static const char *hw_flag_names[NUM_IEE
-- FLAG(BEACON_TX_STATUS),
-- FLAG(NEEDS_UNIQUE_STA_ADDR),
-- FLAG(SUPPORTS_REORDERING_BUFFER),
--+ FLAG(TX_AMSDU),
--+ FLAG(TX_FRAG_LIST),
--
-- /* keep last for the build bug below */
-- (void *)0x1
----- a/net/mac80211/ieee80211_i.h
--+++ b/net/mac80211/ieee80211_i.h
--@@ -799,6 +799,7 @@ struct mac80211_qos_map {
-- enum txq_info_flags {
-- IEEE80211_TXQ_STOP,
-- IEEE80211_TXQ_AMPDU,
--+ IEEE80211_TXQ_NO_AMSDU,
-- };
--
-- struct txq_info {
----- a/net/mac80211/tx.c
--+++ b/net/mac80211/tx.c
--@@ -1318,6 +1318,10 @@ struct sk_buff *ieee80211_tx_dequeue(str
-- out:
-- spin_unlock_bh(&txqi->queue.lock);
--
--+ if (skb && skb_has_frag_list(skb) &&
--+ !ieee80211_hw_check(&local->hw, TX_FRAG_LIST))
--+ skb_linearize(skb);
--+
-- return skb;
-- }
-- EXPORT_SYMBOL(ieee80211_tx_dequeue);
--@@ -2757,6 +2761,163 @@ void ieee80211_clear_fast_xmit(struct st
-- kfree_rcu(fast_tx, rcu_head);
-- }
--
--+static bool ieee80211_amsdu_realloc_pad(struct ieee80211_local *local,
--+ struct sk_buff *skb, int headroom,
--+ int *subframe_len)
--+{
--+ int amsdu_len = *subframe_len + sizeof(struct ethhdr);
--+ int padding = (4 - amsdu_len) & 3;
--+
--+ if (skb_headroom(skb) < headroom || skb_tailroom(skb) < padding) {
--+ I802_DEBUG_INC(local->tx_expand_skb_head);
--+
--+ if (pskb_expand_head(skb, headroom, padding, GFP_ATOMIC)) {
--+ wiphy_debug(local->hw.wiphy,
--+ "failed to reallocate TX buffer\n");
--+ return false;
--+ }
--+ }
--+
--+ if (padding) {
--+ *subframe_len += padding;
--+ memset(skb_put(skb, padding), 0, padding);
--+ }
--+
--+ return true;
--+}
--+
--+static bool ieee80211_amsdu_prepare_head(struct ieee80211_sub_if_data *sdata,
--+ struct ieee80211_fast_tx *fast_tx,
--+ struct sk_buff *skb)
--+{
--+ struct ieee80211_local *local = sdata->local;
--+ struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
--+ struct ieee80211_hdr *hdr;
--+ struct ethhdr amsdu_hdr;
--+ int hdr_len = fast_tx->hdr_len - sizeof(rfc1042_header);
--+ int subframe_len = skb->len - hdr_len;
--+ void *data;
--+ u8 *qc;
--+
--+ if (info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE)
--+ return false;
--+
--+ if (info->control.flags & IEEE80211_TX_CTRL_AMSDU)
--+ return true;
--+
--+ if (!ieee80211_amsdu_realloc_pad(local, skb, sizeof(amsdu_hdr),
--+ &subframe_len))
--+ return false;
--+
--+ amsdu_hdr.h_proto = cpu_to_be16(subframe_len);
--+ memcpy(amsdu_hdr.h_source, skb->data + fast_tx->sa_offs, ETH_ALEN);
--+ memcpy(amsdu_hdr.h_dest, skb->data + fast_tx->da_offs, ETH_ALEN);
--+
--+ data = skb_push(skb, sizeof(amsdu_hdr));
--+ memmove(data, data + sizeof(amsdu_hdr), hdr_len);
--+ memcpy(data + hdr_len, &amsdu_hdr, sizeof(amsdu_hdr));
--+
--+ hdr = data;
--+ qc = ieee80211_get_qos_ctl(hdr);
--+ *qc |= IEEE80211_QOS_CTL_A_MSDU_PRESENT;
--+
--+ info->control.flags |= IEEE80211_TX_CTRL_AMSDU;
--+
--+ return true;
--+}
--+
--+static bool ieee80211_amsdu_aggregate(struct ieee80211_sub_if_data *sdata,
--+ struct sta_info *sta,
--+ struct ieee80211_fast_tx *fast_tx,
--+ struct sk_buff *skb)
--+{
--+ struct ieee80211_local *local = sdata->local;
--+ u8 tid = skb->priority & IEEE80211_QOS_CTL_TAG1D_MASK;
--+ struct ieee80211_txq *txq = sta->sta.txq[tid];
--+ struct txq_info *txqi;
--+ struct sk_buff **frag_tail, *head;
--+ int subframe_len = skb->len - ETH_ALEN;
--+ u8 max_subframes = sta->sta.max_amsdu_subframes;
--+ int max_frags = local->hw.max_tx_fragments;
--+ int max_amsdu_len = sta->sta.max_amsdu_len;
--+ __be16 len;
--+ void *data;
--+ bool ret = false;
--+ int n = 1, nfrags;
--+
--+ if (!ieee80211_hw_check(&local->hw, TX_AMSDU))
--+ return false;
--+
--+ if (!txq)
--+ return false;
--+
--+ txqi = to_txq_info(txq);
--+ if (test_bit(IEEE80211_TXQ_NO_AMSDU, &txqi->flags))
--+ return false;
--+
--+ if (sta->sta.max_rc_amsdu_len)
--+ max_amsdu_len = min_t(int, max_amsdu_len,
--+ sta->sta.max_rc_amsdu_len);
--+
--+ spin_lock_bh(&txqi->queue.lock);
--+
--+ head = skb_peek_tail(&txqi->queue);
--+ if (!head)
--+ goto out;
--+
--+ if (skb->len + head->len > max_amsdu_len)
--+ goto out;
--+
--+ /*
--+ * HT A-MPDU limits maximum MPDU size to 4095 bytes. Since aggregation
--+ * sessions are started/stopped without txq flush, use the limit here
--+ * to avoid having to de-aggregate later.
--+ */
--+ if (skb->len + head->len > 4095 &&
--+ !sta->sta.vht_cap.vht_supported)
--+ goto out;
--+
--+ if (!ieee80211_amsdu_prepare_head(sdata, fast_tx, head))
--+ goto out;
--+
--+ nfrags = 1 + skb_shinfo(skb)->nr_frags;
--+ nfrags += 1 + skb_shinfo(head)->nr_frags;
--+ frag_tail = &skb_shinfo(head)->frag_list;
--+ while (*frag_tail) {
--+ nfrags += 1 + skb_shinfo(*frag_tail)->nr_frags;
--+ frag_tail = &(*frag_tail)->next;
--+ n++;
--+ }
--+
--+ if (max_subframes && n > max_subframes)
--+ goto out;
--+
--+ if (max_frags && nfrags > max_frags)
--+ goto out;
--+
--+ if (!ieee80211_amsdu_realloc_pad(local, skb, sizeof(rfc1042_header) + 2,
--+ &subframe_len))
--+ return false;
--+
--+ ret = true;
--+ data = skb_push(skb, ETH_ALEN + 2);
--+ memmove(data, data + ETH_ALEN + 2, 2 * ETH_ALEN);
--+
--+ data += 2 * ETH_ALEN;
--+ len = cpu_to_be16(subframe_len);
--+ memcpy(data, &len, 2);
--+ memcpy(data + 2, rfc1042_header, sizeof(rfc1042_header));
--+
--+ head->len += skb->len;
--+ head->data_len += skb->len;
--+ *frag_tail = skb;
--+
--+out:
--+ spin_unlock_bh(&txqi->queue.lock);
--+
--+ return ret;
--+}
--+
-- static bool ieee80211_xmit_fast(struct ieee80211_sub_if_data *sdata,
-- struct net_device *dev, struct sta_info *sta,
-- struct ieee80211_fast_tx *fast_tx,
--@@ -2811,6 +2972,10 @@ static bool ieee80211_xmit_fast(struct i
--
-- ieee80211_tx_stats(dev, skb->len + extra_head);
--
--+ if ((hdr->frame_control & cpu_to_le16(IEEE80211_STYPE_QOS_DATA)) &&
--+ ieee80211_amsdu_aggregate(sdata, sta, fast_tx, skb))
--+ return true;
--+
-- /* will not be crypto-handled beyond what we do here, so use false
-- * as the may-encrypt argument for the resize to not account for
-- * more room than we already have in 'extra_head'
-diff --git a/package/kernel/mac80211/patches/323-0000-brcmfmac-fix-setting-primary-channel-for-80-MHz-widt.patch b/package/kernel/mac80211/patches/323-0000-brcmfmac-fix-setting-primary-channel-for-80-MHz-widt.patch
-deleted file mode 100644
-index 9277b2cabcdf6a02fa285b7eef2391b7f575869a..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/323-0000-brcmfmac-fix-setting-primary-channel-for-80-MHz-widt.patch
-+++ /dev/null
-@@ -1,64 +0,0 @@
--From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
--Date: Wed, 20 Jan 2016 16:46:04 +0100
--Subject: [PATCH] brcmfmac: fix setting primary channel for 80 MHz width
--MIME-Version: 1.0
--Content-Type: text/plain; charset=UTF-8
--Content-Transfer-Encoding: 8bit
--
--First of all it changes the way we calculate primary channel offset. If
--we use e.g. 80 MHz channel with primary frequency 5180 MHz (which means
--center frequency is 5210 MHz) it makes sense to calculate primary offset
--as -30 MHz.
--Then it fixes values we compare primary_offset with. We were comparing
--offset in MHz against -2 or 2 which was resulting in picking a wrong
--primary channel.
--
--Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--@@ -247,7 +247,7 @@ static u16 chandef_to_chanspec(struct br
-- brcmf_dbg(TRACE, "chandef: control %d center %d width %d\n",
-- ch->chan->center_freq, ch->center_freq1, ch->width);
-- ch_inf.chnum = ieee80211_frequency_to_channel(ch->center_freq1);
--- primary_offset = ch->center_freq1 - ch->chan->center_freq;
--+ primary_offset = ch->chan->center_freq - ch->center_freq1;
-- switch (ch->width) {
-- case NL80211_CHAN_WIDTH_20:
-- case NL80211_CHAN_WIDTH_20_NOHT:
--@@ -256,24 +256,21 @@ static u16 chandef_to_chanspec(struct br
-- break;
-- case NL80211_CHAN_WIDTH_40:
-- ch_inf.bw = BRCMU_CHAN_BW_40;
--- if (primary_offset < 0)
--+ if (primary_offset > 0)
-- ch_inf.sb = BRCMU_CHAN_SB_U;
-- else
-- ch_inf.sb = BRCMU_CHAN_SB_L;
-- break;
-- case NL80211_CHAN_WIDTH_80:
-- ch_inf.bw = BRCMU_CHAN_BW_80;
--- if (primary_offset < 0) {
--- if (primary_offset < -CH_10MHZ_APART)
--- ch_inf.sb = BRCMU_CHAN_SB_UU;
--- else
--- ch_inf.sb = BRCMU_CHAN_SB_UL;
--- } else {
--- if (primary_offset > CH_10MHZ_APART)
--- ch_inf.sb = BRCMU_CHAN_SB_LL;
--- else
--- ch_inf.sb = BRCMU_CHAN_SB_LU;
--- }
--+ if (primary_offset == -30)
--+ ch_inf.sb = BRCMU_CHAN_SB_LL;
--+ else if (primary_offset == -10)
--+ ch_inf.sb = BRCMU_CHAN_SB_LU;
--+ else if (primary_offset == 10)
--+ ch_inf.sb = BRCMU_CHAN_SB_UL;
--+ else
--+ ch_inf.sb = BRCMU_CHAN_SB_UU;
-- break;
-- case NL80211_CHAN_WIDTH_80P80:
-- case NL80211_CHAN_WIDTH_160:
-diff --git a/package/kernel/mac80211/patches/323-0001-brcmfmac-analyze-descriptors-of-current-component-on.patch b/package/kernel/mac80211/patches/323-0001-brcmfmac-analyze-descriptors-of-current-component-on.patch
-deleted file mode 100644
-index d7018dab3d230ab2e342824ff5067d0a24b586a1..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/323-0001-brcmfmac-analyze-descriptors-of-current-component-on.patch
-+++ /dev/null
-@@ -1,51 +0,0 @@
--From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
--Date: Tue, 26 Jan 2016 17:57:01 +0100
--Subject: [PATCH] brcmfmac: analyze descriptors of current component only
--MIME-Version: 1.0
--Content-Type: text/plain; charset=UTF-8
--Content-Transfer-Encoding: 8bit
--
--So far we were looking for address descriptors without a check for
--crossing current component border. In case of dealing with unsupported
--descriptor or descriptor missing at all the code would incorrectly get
--data from another component.
--
--Consider this binary-described component from BCM4366 EROM:
--4bf83b01 TAG==CI CID==0x83b
--20080201 TAG==CI PORTS==0+1 WRAPPERS==0+1
--18400035 TAG==ADDR SZ_SZD TYPE_SLAVE
--00050000
--18107085 TAG==ADDR SZ_4K TYPE_SWRAP
--
--Driver was assigning invalid base address to this core:
--brcmfmac: [6 ] core 0x83b:32 base 0x18109000 wrap 0x18107000
--which came from totally different component defined in EROM:
--43b36701 TAG==CI CID==0x367
--00000201 TAG==CI PORTS==0+1 WRAPPERS==0+0
--18109005 TAG==ADDR SZ_4K TYPE_SLAVE
--
--This change will also allow us to support components without wrapper
--address in the future.
--
--Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
--@@ -803,7 +803,14 @@ static int brcmf_chip_dmp_get_regaddr(st
-- *eromaddr -= 4;
-- return -EFAULT;
-- }
--- } while (desc != DMP_DESC_ADDRESS);
--+ } while (desc != DMP_DESC_ADDRESS &&
--+ desc != DMP_DESC_COMPONENT);
--+
--+ /* stop if we crossed current component border */
--+ if (desc == DMP_DESC_COMPONENT) {
--+ *eromaddr -= 4;
--+ return 0;
--+ }
--
-- /* skip upper 32-bit address descriptor */
-- if (val & DMP_DESC_ADDRSIZE_GT32)
-diff --git a/package/kernel/mac80211/patches/323-0002-brcmfmac-allow-storing-PMU-core-without-wrapper-addr.patch b/package/kernel/mac80211/patches/323-0002-brcmfmac-allow-storing-PMU-core-without-wrapper-addr.patch
-deleted file mode 100644
-index 045ab4953bb9a43044435baa8e242b3f4794952a..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/323-0002-brcmfmac-allow-storing-PMU-core-without-wrapper-addr.patch
-+++ /dev/null
-@@ -1,28 +0,0 @@
--From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
--Date: Tue, 26 Jan 2016 17:57:02 +0100
--Subject: [PATCH] brcmfmac: allow storing PMU core without wrapper address
--MIME-Version: 1.0
--Content-Type: text/plain; charset=UTF-8
--Content-Transfer-Encoding: 8bit
--
--Separated PMU core can be found in new devices and should be used for
--accessing PMU registers (which were routed through ChipCommon so far).
--This core is one of exceptions that doesn't have or need wrapper address
--to be still safely accessible.
--
--Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
--@@ -883,7 +883,8 @@ int brcmf_chip_dmp_erom_scan(struct brcm
-- rev = (val & DMP_COMP_REVISION) >> DMP_COMP_REVISION_S;
--
-- /* need core with ports */
--- if (nmw + nsw == 0)
--+ if (nmw + nsw == 0 &&
--+ id != BCMA_CORE_PMU)
-- continue;
--
-- /* try to obtain register address info */
-diff --git a/package/kernel/mac80211/patches/323-0003-brcmfmac-read-extended-capabilities-of-ChipCommon-co.patch b/package/kernel/mac80211/patches/323-0003-brcmfmac-read-extended-capabilities-of-ChipCommon-co.patch
-deleted file mode 100644
-index 7b7ba4f743b244c0d766efbce7045e00e13e27ed..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/323-0003-brcmfmac-read-extended-capabilities-of-ChipCommon-co.patch
-+++ /dev/null
-@@ -1,43 +0,0 @@
--From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
--Date: Tue, 26 Jan 2016 17:57:03 +0100
--Subject: [PATCH] brcmfmac: read extended capabilities of ChipCommon core
--MIME-Version: 1.0
--Content-Type: text/plain; charset=UTF-8
--Content-Transfer-Encoding: 8bit
--
--This is an extra bitfield with info about some present hardware.
--
--Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
--@@ -1025,6 +1025,9 @@ static int brcmf_chip_setup(struct brcmf
-- /* get chipcommon capabilites */
-- pub->cc_caps = chip->ops->read32(chip->ctx,
-- CORE_CC_REG(base, capabilities));
--+ pub->cc_caps_ext = chip->ops->read32(chip->ctx,
--+ CORE_CC_REG(base,
--+ capabilities_ext));
--
-- /* get pmu caps & rev */
-- if (pub->cc_caps & CC_CAP_PMU) {
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.h
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.h
--@@ -27,6 +27,7 @@
-- * @chip: chip identifier.
-- * @chiprev: chip revision.
-- * @cc_caps: chipcommon core capabilities.
--+ * @cc_caps_ext: chipcommon core extended capabilities.
-- * @pmucaps: PMU capabilities.
-- * @pmurev: PMU revision.
-- * @rambase: RAM base address (only applicable for ARM CR4 chips).
--@@ -38,6 +39,7 @@ struct brcmf_chip {
-- u32 chip;
-- u32 chiprev;
-- u32 cc_caps;
--+ u32 cc_caps_ext;
-- u32 pmucaps;
-- u32 pmurev;
-- u32 rambase;
-diff --git a/package/kernel/mac80211/patches/323-0004-brcmfmac-access-PMU-registers-using-standalone-PMU-c.patch b/package/kernel/mac80211/patches/323-0004-brcmfmac-access-PMU-registers-using-standalone-PMU-c.patch
-deleted file mode 100644
-index 2af6fd93bc06142b459144caf49489d51f7f6304..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/323-0004-brcmfmac-access-PMU-registers-using-standalone-PMU-c.patch
-+++ /dev/null
-@@ -1,148 +0,0 @@
--From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
--Date: Tue, 26 Jan 2016 17:57:04 +0100
--Subject: [PATCH] brcmfmac: access PMU registers using standalone PMU core if
-- available
--MIME-Version: 1.0
--Content-Type: text/plain; charset=UTF-8
--Content-Transfer-Encoding: 8bit
--
--On recent Broadcom chipsets PMU is present as separated core and it
--can't be accessed using ChipCommon anymore as it fails with e.g.:
--[ 18.198412] Unhandled fault: imprecise external abort (0x1406) at 0xb6da200f
--
--Add a new helper function that will return a proper core that should be
--used for accessing PMU registers.
--
--Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.c
--@@ -1014,6 +1014,7 @@ static int brcmf_chip_setup(struct brcmf
-- {
-- struct brcmf_chip *pub;
-- struct brcmf_core_priv *cc;
--+ struct brcmf_core *pmu;
-- u32 base;
-- u32 val;
-- int ret = 0;
--@@ -1030,9 +1031,10 @@ static int brcmf_chip_setup(struct brcmf
-- capabilities_ext));
--
-- /* get pmu caps & rev */
--+ pmu = brcmf_chip_get_pmu(pub); /* after reading cc_caps_ext */
-- if (pub->cc_caps & CC_CAP_PMU) {
-- val = chip->ops->read32(chip->ctx,
--- CORE_CC_REG(base, pmucapabilities));
--+ CORE_CC_REG(pmu->base, pmucapabilities));
-- pub->pmurev = val & PCAP_REV_MASK;
-- pub->pmucaps = val;
-- }
--@@ -1131,6 +1133,23 @@ struct brcmf_core *brcmf_chip_get_chipco
-- return &cc->pub;
-- }
--
--+struct brcmf_core *brcmf_chip_get_pmu(struct brcmf_chip *pub)
--+{
--+ struct brcmf_core *cc = brcmf_chip_get_chipcommon(pub);
--+ struct brcmf_core *pmu;
--+
--+ /* See if there is separated PMU core available */
--+ if (cc->rev >= 35 &&
--+ pub->cc_caps_ext & BCMA_CC_CAP_EXT_AOB_PRESENT) {
--+ pmu = brcmf_chip_get_core(pub, BCMA_CORE_PMU);
--+ if (pmu)
--+ return pmu;
--+ }
--+
--+ /* Fallback to ChipCommon core for older hardware */
--+ return cc;
--+}
--+
-- bool brcmf_chip_iscoreup(struct brcmf_core *pub)
-- {
-- struct brcmf_core_priv *core;
--@@ -1301,6 +1320,7 @@ bool brcmf_chip_sr_capable(struct brcmf_
-- {
-- u32 base, addr, reg, pmu_cc3_mask = ~0;
-- struct brcmf_chip_priv *chip;
--+ struct brcmf_core *pmu = brcmf_chip_get_pmu(pub);
--
-- brcmf_dbg(TRACE, "Enter\n");
--
--@@ -1320,9 +1340,9 @@ bool brcmf_chip_sr_capable(struct brcmf_
-- case BRCM_CC_4335_CHIP_ID:
-- case BRCM_CC_4339_CHIP_ID:
-- /* read PMU chipcontrol register 3 */
--- addr = CORE_CC_REG(base, chipcontrol_addr);
--+ addr = CORE_CC_REG(pmu->base, chipcontrol_addr);
-- chip->ops->write32(chip->ctx, addr, 3);
--- addr = CORE_CC_REG(base, chipcontrol_data);
--+ addr = CORE_CC_REG(pmu->base, chipcontrol_data);
-- reg = chip->ops->read32(chip->ctx, addr);
-- return (reg & pmu_cc3_mask) != 0;
-- case BRCM_CC_43430_CHIP_ID:
--@@ -1330,12 +1350,12 @@ bool brcmf_chip_sr_capable(struct brcmf_
-- reg = chip->ops->read32(chip->ctx, addr);
-- return reg != 0;
-- default:
--- addr = CORE_CC_REG(base, pmucapabilities_ext);
--+ addr = CORE_CC_REG(pmu->base, pmucapabilities_ext);
-- reg = chip->ops->read32(chip->ctx, addr);
-- if ((reg & PCAPEXT_SR_SUPPORTED_MASK) == 0)
-- return false;
--
--- addr = CORE_CC_REG(base, retention_ctl);
--+ addr = CORE_CC_REG(pmu->base, retention_ctl);
-- reg = chip->ops->read32(chip->ctx, addr);
-- return (reg & (PMU_RCTL_MACPHY_DISABLE_MASK |
-- PMU_RCTL_LOGIC_DISABLE_MASK)) == 0;
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.h
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/chip.h
--@@ -85,6 +85,7 @@ struct brcmf_chip *brcmf_chip_attach(voi
-- void brcmf_chip_detach(struct brcmf_chip *chip);
-- struct brcmf_core *brcmf_chip_get_core(struct brcmf_chip *chip, u16 coreid);
-- struct brcmf_core *brcmf_chip_get_chipcommon(struct brcmf_chip *chip);
--+struct brcmf_core *brcmf_chip_get_pmu(struct brcmf_chip *pub);
-- bool brcmf_chip_iscoreup(struct brcmf_core *core);
-- void brcmf_chip_coredisable(struct brcmf_core *core, u32 prereset, u32 reset);
-- void brcmf_chip_resetcore(struct brcmf_core *core, u32 prereset, u32 reset,
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
--@@ -3615,7 +3615,6 @@ brcmf_sdio_drivestrengthinit(struct brcm
-- const struct sdiod_drive_str *str_tab = NULL;
-- u32 str_mask;
-- u32 str_shift;
--- u32 base;
-- u32 i;
-- u32 drivestrength_sel = 0;
-- u32 cc_data_temp;
--@@ -3658,14 +3657,15 @@ brcmf_sdio_drivestrengthinit(struct brcm
-- }
--
-- if (str_tab != NULL) {
--+ struct brcmf_core *pmu = brcmf_chip_get_pmu(ci);
--+
-- for (i = 0; str_tab[i].strength != 0; i++) {
-- if (drivestrength >= str_tab[i].strength) {
-- drivestrength_sel = str_tab[i].sel;
-- break;
-- }
-- }
--- base = brcmf_chip_get_chipcommon(ci)->base;
--- addr = CORE_CC_REG(base, chipcontrol_addr);
--+ addr = CORE_CC_REG(pmu->base, chipcontrol_addr);
-- brcmf_sdiod_regwl(sdiodev, addr, 1, NULL);
-- cc_data_temp = brcmf_sdiod_regrl(sdiodev, addr, NULL);
-- cc_data_temp &= ~str_mask;
--@@ -3835,8 +3835,7 @@ brcmf_sdio_probe_attach(struct brcmf_sdi
-- goto fail;
--
-- /* set PMUControl so a backplane reset does PMU state reload */
--- reg_addr = CORE_CC_REG(brcmf_chip_get_chipcommon(bus->ci)->base,
--- pmucontrol);
--+ reg_addr = CORE_CC_REG(brcmf_chip_get_pmu(bus->ci)->base, pmucontrol);
-- reg_val = brcmf_sdiod_regrl(bus->sdiodev, reg_addr, &err);
-- if (err)
-- goto fail;
-diff --git a/package/kernel/mac80211/patches/323-0005-brcmfmac-add-support-for-14e4-4365-PCI-ID-with-BCM43.patch b/package/kernel/mac80211/patches/323-0005-brcmfmac-add-support-for-14e4-4365-PCI-ID-with-BCM43.patch
-deleted file mode 100644
-index 35887fcb59219270e0aedd6c9466956f9ba318f4..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/323-0005-brcmfmac-add-support-for-14e4-4365-PCI-ID-with-BCM43.patch
-+++ /dev/null
-@@ -1,38 +0,0 @@
--From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
--Date: Tue, 26 Jan 2016 17:57:05 +0100
--Subject: [PATCH] brcmfmac: add support for 14e4:4365 PCI ID with BCM4366
-- chipset
--MIME-Version: 1.0
--Content-Type: text/plain; charset=UTF-8
--Content-Transfer-Encoding: 8bit
--
--On Broadcom ARM routers BCM4366 cards are available with 14e4:4365 ID.
--Unfortunately this ID was already used by Broadcom for cards with
--BCM43142, a totally different chipset requiring SoftMAC driver. To avoid
--a conflict between brcmfmac and bcma use more specific ID entry with
--subvendor and subdevice specified.
--
--Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
--@@ -1951,6 +1951,9 @@ static const struct dev_pm_ops brcmf_pci
--
-- #define BRCMF_PCIE_DEVICE(dev_id) { BRCM_PCIE_VENDOR_ID_BROADCOM, dev_id,\
-- PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_NETWORK_OTHER << 8, 0xffff00, 0 }
--+#define BRCMF_PCIE_DEVICE_SUB(dev_id, subvend, subdev) { \
--+ BRCM_PCIE_VENDOR_ID_BROADCOM, dev_id,\
--+ subvend, subdev, PCI_CLASS_NETWORK_OTHER << 8, 0xffff00, 0 }
--
-- static struct pci_device_id brcmf_pcie_devid_table[] = {
-- BRCMF_PCIE_DEVICE(BRCM_PCIE_4350_DEVICE_ID),
--@@ -1966,6 +1969,7 @@ static struct pci_device_id brcmf_pcie_d
-- BRCMF_PCIE_DEVICE(BRCM_PCIE_4365_DEVICE_ID),
-- BRCMF_PCIE_DEVICE(BRCM_PCIE_4365_2G_DEVICE_ID),
-- BRCMF_PCIE_DEVICE(BRCM_PCIE_4365_5G_DEVICE_ID),
--+ BRCMF_PCIE_DEVICE_SUB(0x4365, BRCM_PCIE_VENDOR_ID_BROADCOM, 0x4365),
-- BRCMF_PCIE_DEVICE(BRCM_PCIE_4366_DEVICE_ID),
-- BRCMF_PCIE_DEVICE(BRCM_PCIE_4366_2G_DEVICE_ID),
-- BRCMF_PCIE_DEVICE(BRCM_PCIE_4366_5G_DEVICE_ID),
-diff --git a/package/kernel/mac80211/patches/323-ath9k-Fix-programming-of-minCCA-power-threshold.patch b/package/kernel/mac80211/patches/323-ath9k-Fix-programming-of-minCCA-power-threshold.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..59ac29b1cfd6fa5d6f6cbab595ca0da1508fd077
---- /dev/null
-+++ b/package/kernel/mac80211/patches/323-ath9k-Fix-programming-of-minCCA-power-threshold.patch
-@@ -0,0 +1,26 @@
-+From: Sven Eckelmann <sven@narfation.org>
-+Date: Fri, 17 Jun 2016 11:58:20 +0200
-+Subject: [PATCH] ath9k: Fix programming of minCCA power threshold
-+
-+The function ar9003_hw_apply_minccapwr_thresh takes as second parameter not
-+a pointer to the channel but a boolean value describing whether the channel
-+is 2.4GHz or not. This broke (according to the origin commit) the ETSI
-+regulatory compliance on 5GHz channels.
-+
-+Fixes: 3533bf6b15a0 ("ath9k: Fix regulatory compliance")
-+Signed-off-by: Sven Eckelmann <sven@narfation.org>
-+Cc: Simon Wunderlich <sw@simonwunderlich.de>
-+Cc: Sujith Manoharan <c_manoha@qca.qualcomm.com>
-+---
-+
-+--- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
-++++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
-+@@ -4175,7 +4175,7 @@ static void ath9k_hw_ar9300_set_board_va
-+ if (!AR_SREV_9330(ah) && !AR_SREV_9340(ah) && !AR_SREV_9531(ah))
-+ ar9003_hw_internal_regulator_apply(ah);
-+ ar9003_hw_apply_tuning_caps(ah);
-+- ar9003_hw_apply_minccapwr_thresh(ah, chan);
-++ ar9003_hw_apply_minccapwr_thresh(ah, is2ghz);
-+ ar9003_hw_txend_to_xpa_off_apply(ah, is2ghz);
-+ ar9003_hw_thermometer_apply(ah);
-+ ar9003_hw_thermo_cal_apply(ah);
-diff --git a/package/kernel/mac80211/patches/324-ath9k_hw-fix-spectral-scan-on-AR9285-and-newer.patch b/package/kernel/mac80211/patches/324-ath9k_hw-fix-spectral-scan-on-AR9285-and-newer.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..b6f48680b7b1e2522c53c51834a8ec32638a3dec
---- /dev/null
-+++ b/package/kernel/mac80211/patches/324-ath9k_hw-fix-spectral-scan-on-AR9285-and-newer.patch
-@@ -0,0 +1,86 @@
-+From: Felix Fietkau <nbd@nbd.name>
-+Date: Mon, 11 Jul 2016 10:34:37 +0200
-+Subject: [PATCH] ath9k_hw: fix spectral scan on AR9285 and newer
-+
-+The register layout of AR_PHY_SPECTRAL_SCAN has changed, only AR9280
-+uses the old layout
-+
-+Signed-off-by: Felix Fietkau <nbd@nbd.name>
-+---
-+
-+--- a/drivers/net/wireless/ath/ath9k/ar9002_phy.c
-++++ b/drivers/net/wireless/ath/ath9k/ar9002_phy.c
-+@@ -476,6 +476,7 @@ static void ar9002_hw_set_bt_ant_diversi
-+ static void ar9002_hw_spectral_scan_config(struct ath_hw *ah,
-+ struct ath_spec_scan *param)
-+ {
-++ u32 repeat_bit;
-+ u8 count;
-+
-+ if (!param->enabled) {
-+@@ -486,12 +487,15 @@ static void ar9002_hw_spectral_scan_conf
-+ REG_SET_BIT(ah, AR_PHY_RADAR_0, AR_PHY_RADAR_0_FFT_ENA);
-+ REG_SET_BIT(ah, AR_PHY_SPECTRAL_SCAN, AR_PHY_SPECTRAL_SCAN_ENABLE);
-+
-++ if (AR_SREV_9280(ah))
-++ repeat_bit = AR_PHY_SPECTRAL_SCAN_SHORT_REPEAT;
-++ else
-++ repeat_bit = AR_PHY_SPECTRAL_SCAN_SHORT_REPEAT_KIWI;
-++
-+ if (param->short_repeat)
-+- REG_SET_BIT(ah, AR_PHY_SPECTRAL_SCAN,
-+- AR_PHY_SPECTRAL_SCAN_SHORT_REPEAT);
-++ REG_SET_BIT(ah, AR_PHY_SPECTRAL_SCAN, repeat_bit);
-+ else
-+- REG_CLR_BIT(ah, AR_PHY_SPECTRAL_SCAN,
-+- AR_PHY_SPECTRAL_SCAN_SHORT_REPEAT);
-++ REG_CLR_BIT(ah, AR_PHY_SPECTRAL_SCAN, repeat_bit);
-+
-+ /* on AR92xx, the highest bit of count will make the the chip send
-+ * spectral samples endlessly. Check if this really was intended,
-+@@ -499,15 +503,25 @@ static void ar9002_hw_spectral_scan_conf
-+ */
-+ count = param->count;
-+ if (param->endless) {
-+- if (AR_SREV_9271(ah))
-+- count = 0;
-+- else
-++ if (AR_SREV_9280(ah))
-+ count = 0x80;
-++ else
-++ count = 0;
-+ } else if (count & 0x80)
-+ count = 0x7f;
-++ else if (!count)
-++ count = 1;
-++
-++ if (AR_SREV_9280(ah)) {
-++ REG_RMW_FIELD(ah, AR_PHY_SPECTRAL_SCAN,
-++ AR_PHY_SPECTRAL_SCAN_COUNT, count);
-++ } else {
-++ REG_RMW_FIELD(ah, AR_PHY_SPECTRAL_SCAN,
-++ AR_PHY_SPECTRAL_SCAN_COUNT_KIWI, count);
-++ REG_SET_BIT(ah, AR_PHY_SPECTRAL_SCAN,
-++ AR_PHY_SPECTRAL_SCAN_PHYERR_MASK_SELECT);
-++ }
-+
-+- REG_RMW_FIELD(ah, AR_PHY_SPECTRAL_SCAN,
-+- AR_PHY_SPECTRAL_SCAN_COUNT, count);
-+ REG_RMW_FIELD(ah, AR_PHY_SPECTRAL_SCAN,
-+ AR_PHY_SPECTRAL_SCAN_PERIOD, param->period);
-+ REG_RMW_FIELD(ah, AR_PHY_SPECTRAL_SCAN,
-+--- a/drivers/net/wireless/ath/ath9k/ar9002_phy.h
-++++ b/drivers/net/wireless/ath/ath9k/ar9002_phy.h
-+@@ -177,8 +177,11 @@
-+ #define AR_PHY_SPECTRAL_SCAN_PERIOD_S 8
-+ #define AR_PHY_SPECTRAL_SCAN_COUNT 0x00FF0000 /* Number of reports, reg 68, bits 16-23*/
-+ #define AR_PHY_SPECTRAL_SCAN_COUNT_S 16
-++#define AR_PHY_SPECTRAL_SCAN_COUNT_KIWI 0x0FFF0000 /* Number of reports, reg 68, bits 16-27*/
-++#define AR_PHY_SPECTRAL_SCAN_COUNT_KIWI_S 16
-+ #define AR_PHY_SPECTRAL_SCAN_SHORT_REPEAT 0x01000000 /* Short repeat, reg 68, bit 24*/
-+-#define AR_PHY_SPECTRAL_SCAN_SHORT_REPEAT_S 24 /* Short repeat, reg 68, bit 24*/
-++#define AR_PHY_SPECTRAL_SCAN_SHORT_REPEAT_KIWI 0x10000000 /* Short repeat, reg 68, bit 28*/
-++#define AR_PHY_SPECTRAL_SCAN_PHYERR_MASK_SELECT 0x40000000
-+
-+ #define AR_PHY_RX_DELAY 0x9914
-+ #define AR_PHY_SEARCH_START_DELAY 0x9918
-diff --git a/package/kernel/mac80211/patches/324-brcmfmac-treat-NULL-character-in-NVRAM-as-separator.patch b/package/kernel/mac80211/patches/324-brcmfmac-treat-NULL-character-in-NVRAM-as-separator.patch
-deleted file mode 100644
-index 6ce60f19608abcc89a27c6cebfbb90806b58a503..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/324-brcmfmac-treat-NULL-character-in-NVRAM-as-separator.patch
-+++ /dev/null
-@@ -1,32 +0,0 @@
--From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
--Date: Sun, 31 Jan 2016 12:14:34 +0100
--Subject: [PATCH] brcmfmac: treat NULL character in NVRAM as separator
--MIME-Version: 1.0
--Content-Type: text/plain; charset=UTF-8
--Content-Transfer-Encoding: 8bit
--
--Platform NVRAM (stored on a flash partition) has entries separated by a
--NULL (\0) char. Our parsing code switches from VALUE state to IDLE
--whenever it meets a NULL (\0). When that happens our IDLE handler should
--simply consume it and analyze whatever is placed ahead.
--
--This fixes harmless warnings spamming debugging output:
--[ 155.165624] brcmfmac: brcmf_nvram_handle_idle warning: ln=1:col=20: ignoring invalid character
--[ 155.180806] brcmfmac: brcmf_nvram_handle_idle warning: ln=1:col=44: ignoring invalid character
--[ 155.195971] brcmfmac: brcmf_nvram_handle_idle warning: ln=1:col=63: ignoring invalid character
--
--Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
--@@ -93,7 +93,7 @@ static enum nvram_parser_state brcmf_nvr
-- c = nvp->data[nvp->pos];
-- if (c == '\n')
-- return COMMENT;
--- if (is_whitespace(c))
--+ if (is_whitespace(c) || c == '\0')
-- goto proceed;
-- if (c == '#')
-- return COMMENT;
-diff --git a/package/kernel/mac80211/patches/325-ath9k_hw-fix-duplicate-and-partially-wrong-definitio.patch b/package/kernel/mac80211/patches/325-ath9k_hw-fix-duplicate-and-partially-wrong-definitio.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..6685f33989dd9c872b817b32bcd5b1ce72f13089
---- /dev/null
-+++ b/package/kernel/mac80211/patches/325-ath9k_hw-fix-duplicate-and-partially-wrong-definitio.patch
-@@ -0,0 +1,57 @@
-+From: Felix Fietkau <nbd@nbd.name>
-+Date: Mon, 11 Jul 2016 11:31:39 +0200
-+Subject: [PATCH] ath9k_hw: fix duplicate (and partially wrong) definition
-+ of AR_CH0_THERM
-+
-+AR_PHY_65NM_CH0_THERM and AR_CH0_THERM were supposed to refer to the
-+same register, however they had different SREV checks.
-+
-+Remove the duplicate and use the checks. Since there were other SREV
-+checks present in the only place that uses this, this will probaby not
-+affect runtime behavior.
-+
-+Signed-off-by: Felix Fietkau <nbd@nbd.name>
-+---
-+
-+--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.h
-++++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.h
-+@@ -689,13 +689,6 @@
-+ #define AR_CH0_TOP_XPABIASLVL (AR_SREV_9550(ah) ? 0x3c0 : 0x300)
-+ #define AR_CH0_TOP_XPABIASLVL_S (AR_SREV_9550(ah) ? 6 : 8)
-+
-+-#define AR_CH0_THERM (AR_SREV_9300(ah) ? 0x16290 : \
-+- ((AR_SREV_9485(ah) ? 0x1628c : 0x16294)))
-+-#define AR_CH0_THERM_XPABIASLVL_MSB 0x3
-+-#define AR_CH0_THERM_XPABIASLVL_MSB_S 0
-+-#define AR_CH0_THERM_XPASHORT2GND 0x4
-+-#define AR_CH0_THERM_XPASHORT2GND_S 2
-+-
-+ #define AR_SWITCH_TABLE_COM_ALL (0xffff)
-+ #define AR_SWITCH_TABLE_COM_ALL_S (0)
-+ #define AR_SWITCH_TABLE_COM_AR9462_ALL (0xffffff)
-+@@ -712,15 +705,17 @@
-+ #define AR_SWITCH_TABLE_ALL (0xfff)
-+ #define AR_SWITCH_TABLE_ALL_S (0)
-+
-+-#define AR_PHY_65NM_CH0_THERM (AR_SREV_9300(ah) ? 0x16290 :\
-+- ((AR_SREV_9462(ah) || AR_SREV_9565(ah)) ? 0x16294 : 0x1628c))
-++#define AR_CH0_THERM (AR_SREV_9300(ah) ? 0x16290 :\
-++ ((AR_SREV_9462(ah) || AR_SREV_9565(ah)) ? 0x16294 : 0x1628c))
-++#define AR_CH0_THERM_XPABIASLVL_MSB 0x3
-++#define AR_CH0_THERM_XPABIASLVL_MSB_S 0
-++#define AR_CH0_THERM_XPASHORT2GND 0x4
-++#define AR_CH0_THERM_XPASHORT2GND_S 2
-+
-+-#define AR_PHY_65NM_CH0_THERM_LOCAL 0x80000000
-+-#define AR_PHY_65NM_CH0_THERM_LOCAL_S 31
-+-#define AR_PHY_65NM_CH0_THERM_START 0x20000000
-+-#define AR_PHY_65NM_CH0_THERM_START_S 29
-+-#define AR_PHY_65NM_CH0_THERM_SAR_ADC_OUT 0x0000ff00
-+-#define AR_PHY_65NM_CH0_THERM_SAR_ADC_OUT_S 8
-++#define AR_CH0_THERM_LOCAL 0x80000000
-++#define AR_CH0_THERM_START 0x20000000
-++#define AR_CH0_THERM_SAR_ADC_OUT 0x0000ff00
-++#define AR_CH0_THERM_SAR_ADC_OUT_S 8
-+
-+ #define AR_CH0_TOP2 (AR_SREV_9300(ah) ? 0x1628c : \
-+ (AR_SREV_9462(ah) ? 0x16290 : 0x16284))
-diff --git a/package/kernel/mac80211/patches/325-brcmfmac-sdio-Increase-the-default-timeouts-a-bit.patch b/package/kernel/mac80211/patches/325-brcmfmac-sdio-Increase-the-default-timeouts-a-bit.patch
-deleted file mode 100644
-index 012dea1e3a995d0118faea99f994da117e16293d..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/325-brcmfmac-sdio-Increase-the-default-timeouts-a-bit.patch
-+++ /dev/null
-@@ -1,41 +0,0 @@
--From: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
--Date: Mon, 25 Jan 2016 11:47:29 +0100
--Subject: [PATCH] brcmfmac: sdio: Increase the default timeouts a bit
--
--On a Radxa Rock2 board with a Ampak AP6335 (Broadcom 4339 core) it seems
--the card responds very quickly most of the time, unfortunately during
--initialisation it sometimes seems to take just a bit over 2 seconds to
--respond.
--
--This results intialization failing with message like:
-- brcmf_c_preinit_dcmds: Retreiving cur_etheraddr failed, -52
-- brcmf_bus_start: failed: -52
-- brcmf_sdio_firmware_callback: dongle is not responding
--
--Increasing the timeout to allow for a bit more headroom allows the
--card to initialize reliably.
--
--A quick search online after diagnosing/fixing this showed that Google
--has a similar patch in their ChromeOS tree, so this doesn't seem
--specific to the board I'm using.
--
--Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
--Reviewed-by: Julian Calaby <julian.calaby@gmail.com>
--Acked-by: Arend van Spriel <arend@broadcom.com>
--Reviewed-by: Douglas Anderson <dianders@chromium.org>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
--@@ -45,8 +45,8 @@
-- #include "chip.h"
-- #include "firmware.h"
--
---#define DCMD_RESP_TIMEOUT msecs_to_jiffies(2000)
---#define CTL_DONE_TIMEOUT msecs_to_jiffies(2000)
--+#define DCMD_RESP_TIMEOUT msecs_to_jiffies(2500)
--+#define CTL_DONE_TIMEOUT msecs_to_jiffies(2500)
--
-- #ifdef DEBUG
--
-diff --git a/package/kernel/mac80211/patches/326-ath9k-make-NF-load-complete-quickly-and-reliably.patch b/package/kernel/mac80211/patches/326-ath9k-make-NF-load-complete-quickly-and-reliably.patch
-deleted file mode 100644
-index 71f7a4043304e4120bfb1fdfa3744a2ebd53ac54..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/326-ath9k-make-NF-load-complete-quickly-and-reliably.patch
-+++ /dev/null
-@@ -1,87 +0,0 @@
--From: Miaoqing Pan <miaoqing@codeaurora.org>
--Date: Fri, 5 Feb 2016 09:45:50 +0800
--Subject: [PATCH] ath9k: make NF load complete quickly and reliably
--
--Make NF load complete quickly and reliably. NF load execution
--is delayed by HW to end of frame if frame Rx or Tx is ongoing.
--Increasing timeout to max frame duration. If NF cal is ongoing
--before NF load, stop it before load, and restart it afterwards.
--
--Signed-off-by: Miaoqing Pan <miaoqing@codeaurora.org>
-----
--
----- a/drivers/net/wireless/ath/ath9k/calib.c
--+++ b/drivers/net/wireless/ath/ath9k/calib.c
--@@ -241,6 +241,7 @@ int ath9k_hw_loadnf(struct ath_hw *ah, s
-- u8 chainmask = (ah->rxchainmask << 3) | ah->rxchainmask;
-- struct ath_common *common = ath9k_hw_common(ah);
-- s16 default_nf = ath9k_hw_get_default_nf(ah, chan);
--+ u32 bb_agc_ctl = REG_READ(ah, AR_PHY_AGC_CONTROL);
--
-- if (ah->caldata)
-- h = ah->caldata->nfCalHist;
--@@ -264,6 +265,16 @@ int ath9k_hw_loadnf(struct ath_hw *ah, s
-- }
--
-- /*
--+ * stop NF cal if ongoing to ensure NF load completes immediately
--+ * (or after end rx/tx frame if ongoing)
--+ */
--+ if (bb_agc_ctl & AR_PHY_AGC_CONTROL_NF) {
--+ REG_CLR_BIT(ah, AR_PHY_AGC_CONTROL, AR_PHY_AGC_CONTROL_NF);
--+ REG_RMW_BUFFER_FLUSH(ah);
--+ ENABLE_REG_RMW_BUFFER(ah);
--+ }
--+
--+ /*
-- * Load software filtered NF value into baseband internal minCCApwr
-- * variable.
-- */
--@@ -276,18 +287,33 @@ int ath9k_hw_loadnf(struct ath_hw *ah, s
--
-- /*
-- * Wait for load to complete, should be fast, a few 10s of us.
--- * The max delay was changed from an original 250us to 10000us
--- * since 250us often results in NF load timeout and causes deaf
--- * condition during stress testing 12/12/2009
--+ * The max delay was changed from an original 250us to 22.2 msec.
--+ * This would increase timeout to the longest possible frame
--+ * (11n max length 22.1 msec)
-- */
--- for (j = 0; j < 10000; j++) {
--+ for (j = 0; j < 22200; j++) {
-- if ((REG_READ(ah, AR_PHY_AGC_CONTROL) &
--- AR_PHY_AGC_CONTROL_NF) == 0)
--+ AR_PHY_AGC_CONTROL_NF) == 0)
-- break;
-- udelay(10);
-- }
--
-- /*
--+ * Restart NF so it can continue.
--+ */
--+ if (bb_agc_ctl & AR_PHY_AGC_CONTROL_NF) {
--+ ENABLE_REG_RMW_BUFFER(ah);
--+ if (bb_agc_ctl & AR_PHY_AGC_CONTROL_ENABLE_NF)
--+ REG_SET_BIT(ah, AR_PHY_AGC_CONTROL,
--+ AR_PHY_AGC_CONTROL_ENABLE_NF);
--+ if (bb_agc_ctl & AR_PHY_AGC_CONTROL_NO_UPDATE_NF)
--+ REG_SET_BIT(ah, AR_PHY_AGC_CONTROL,
--+ AR_PHY_AGC_CONTROL_NO_UPDATE_NF);
--+ REG_SET_BIT(ah, AR_PHY_AGC_CONTROL, AR_PHY_AGC_CONTROL_NF);
--+ REG_RMW_BUFFER_FLUSH(ah);
--+ }
--+
--+ /*
-- * We timed out waiting for the noisefloor to load, probably due to an
-- * in-progress rx. Simply return here and allow the load plenty of time
-- * to complete before the next calibration interval. We need to avoid
--@@ -296,7 +322,7 @@ int ath9k_hw_loadnf(struct ath_hw *ah, s
-- * here, the baseband nf cal will just be capped by our present
-- * noisefloor until the next calibration timer.
-- */
--- if (j == 10000) {
--+ if (j == 22200) {
-- ath_dbg(common, ANY,
-- "Timeout while waiting for nf to load: AR_PHY_AGC_CONTROL=0x%x\n",
-- REG_READ(ah, AR_PHY_AGC_CONTROL));
-diff --git a/package/kernel/mac80211/patches/326-ath9k_hw-simplify-ar9003_hw_per_calibration.patch b/package/kernel/mac80211/patches/326-ath9k_hw-simplify-ar9003_hw_per_calibration.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..999d9934cd47c41a53e296915139818ba10f9643
---- /dev/null
-+++ b/package/kernel/mac80211/patches/326-ath9k_hw-simplify-ar9003_hw_per_calibration.patch
-@@ -0,0 +1,88 @@
-+From: Felix Fietkau <nbd@nbd.name>
-+Date: Mon, 11 Jul 2016 11:34:47 +0200
-+Subject: [PATCH] ath9k_hw: simplify ar9003_hw_per_calibration
-+
-+Reduce indentation, use a variable to save a few pointer dereferences
-+
-+Signed-off-by: Felix Fietkau <nbd@nbd.name>
-+---
-+
-+--- a/drivers/net/wireless/ath/ath9k/ar9003_calib.c
-++++ b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
-+@@ -75,50 +75,49 @@ static bool ar9003_hw_per_calibration(st
-+ struct ath9k_cal_list *currCal)
-+ {
-+ struct ath9k_hw_cal_data *caldata = ah->caldata;
-+- /* Cal is assumed not done until explicitly set below */
-+- bool iscaldone = false;
-++ const struct ath9k_percal_data *cur_caldata = currCal->calData;
-+
-+ /* Calibration in progress. */
-+ if (currCal->calState == CAL_RUNNING) {
-+ /* Check to see if it has finished. */
-+- if (!(REG_READ(ah, AR_PHY_TIMING4) & AR_PHY_TIMING4_DO_CAL)) {
-+- /*
-+- * Accumulate cal measures for active chains
-+- */
-+- currCal->calData->calCollect(ah);
-+- ah->cal_samples++;
-++ if (REG_READ(ah, AR_PHY_TIMING4) & AR_PHY_TIMING4_DO_CAL)
-++ return false;
-+
-+- if (ah->cal_samples >=
-+- currCal->calData->calNumSamples) {
-+- unsigned int i, numChains = 0;
-+- for (i = 0; i < AR9300_MAX_CHAINS; i++) {
-+- if (rxchainmask & (1 << i))
-+- numChains++;
-+- }
-++ /*
-++ * Accumulate cal measures for active chains
-++ */
-++ cur_caldata->calCollect(ah);
-++ ah->cal_samples++;
-+
-+- /*
-+- * Process accumulated data
-+- */
-+- currCal->calData->calPostProc(ah, numChains);
-++ if (ah->cal_samples >= cur_caldata->calNumSamples) {
-++ unsigned int i, numChains = 0;
-++ for (i = 0; i < AR9300_MAX_CHAINS; i++) {
-++ if (rxchainmask & (1 << i))
-++ numChains++;
-++ }
-+
-+- /* Calibration has finished. */
-+- caldata->CalValid |= currCal->calData->calType;
-+- currCal->calState = CAL_DONE;
-+- iscaldone = true;
-+- } else {
-++ /*
-++ * Process accumulated data
-++ */
-++ cur_caldata->calPostProc(ah, numChains);
-++
-++ /* Calibration has finished. */
-++ caldata->CalValid |= cur_caldata->calType;
-++ currCal->calState = CAL_DONE;
-++ return true;
-++ } else {
-+ /*
-+ * Set-up collection of another sub-sample until we
-+ * get desired number
-+ */
-+ ar9003_hw_setup_calibration(ah, currCal);
-+- }
-+ }
-+- } else if (!(caldata->CalValid & currCal->calData->calType)) {
-++ } else if (!(caldata->CalValid & cur_caldata->calType)) {
-+ /* If current cal is marked invalid in channel, kick it off */
-+ ath9k_hw_reset_calibration(ah, currCal);
-+ }
-+
-+- return iscaldone;
-++ return false;
-+ }
-+
-+ static int ar9003_hw_calibrate(struct ath_hw *ah, struct ath9k_channel *chan,
-diff --git a/package/kernel/mac80211/patches/327-ath9k_hw-get-rid-of-some-duplicate-code-in-calibrati.patch b/package/kernel/mac80211/patches/327-ath9k_hw-get-rid-of-some-duplicate-code-in-calibrati.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..b7f3823ee625a7e77b84c4e293dbf6ac81fc3db1
---- /dev/null
-+++ b/package/kernel/mac80211/patches/327-ath9k_hw-get-rid-of-some-duplicate-code-in-calibrati.patch
-@@ -0,0 +1,94 @@
-+From: Felix Fietkau <nbd@nbd.name>
-+Date: Mon, 11 Jul 2016 11:35:20 +0200
-+Subject: [PATCH] ath9k_hw: get rid of some duplicate code in calibration
-+ init
-+
-+Remove a misleading debug message as well
-+
-+Signed-off-by: Felix Fietkau <nbd@nbd.name>
-+---
-+
-+--- a/drivers/net/wireless/ath/ath9k/ar9003_calib.c
-++++ b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
-+@@ -1373,6 +1373,26 @@ static void ar9003_hw_cl_cal_post_proc(s
-+ }
-+ }
-+
-++static void ar9003_hw_init_cal_common(struct ath_hw *ah)
-++{
-++ struct ath9k_hw_cal_data *caldata = ah->caldata;
-++
-++ /* Initialize list pointers */
-++ ah->cal_list = ah->cal_list_last = ah->cal_list_curr = NULL;
-++
-++ INIT_CAL(&ah->iq_caldata);
-++ INSERT_CAL(ah, &ah->iq_caldata);
-++
-++ /* Initialize current pointer to first element in list */
-++ ah->cal_list_curr = ah->cal_list;
-++
-++ if (ah->cal_list_curr)
-++ ath9k_hw_reset_calibration(ah, ah->cal_list_curr);
-++
-++ if (caldata)
-++ caldata->CalValid = 0;
-++}
-++
-+ static bool ar9003_hw_init_cal_pcoem(struct ath_hw *ah,
-+ struct ath9k_channel *chan)
-+ {
-+@@ -1532,21 +1552,7 @@ skip_tx_iqcal:
-+ /* Revert chainmask to runtime parameters */
-+ ar9003_hw_set_chain_masks(ah, ah->rxchainmask, ah->txchainmask);
-+
-+- /* Initialize list pointers */
-+- ah->cal_list = ah->cal_list_last = ah->cal_list_curr = NULL;
-+-
-+- INIT_CAL(&ah->iq_caldata);
-+- INSERT_CAL(ah, &ah->iq_caldata);
-+- ath_dbg(common, CALIBRATE, "enabling IQ Calibration\n");
-+-
-+- /* Initialize current pointer to first element in list */
-+- ah->cal_list_curr = ah->cal_list;
-+-
-+- if (ah->cal_list_curr)
-+- ath9k_hw_reset_calibration(ah, ah->cal_list_curr);
-+-
-+- if (caldata)
-+- caldata->CalValid = 0;
-++ ar9003_hw_init_cal_common(ah);
-+
-+ return true;
-+ }
-+@@ -1577,8 +1583,6 @@ static bool do_ar9003_agc_cal(struct ath
-+ static bool ar9003_hw_init_cal_soc(struct ath_hw *ah,
-+ struct ath9k_channel *chan)
-+ {
-+- struct ath_common *common = ath9k_hw_common(ah);
-+- struct ath9k_hw_cal_data *caldata = ah->caldata;
-+ bool txiqcal_done = false;
-+ bool status = true;
-+ bool run_agc_cal = false, sep_iq_cal = false;
-+@@ -1676,21 +1680,7 @@ skip_tx_iqcal:
-+ /* Revert chainmask to runtime parameters */
-+ ar9003_hw_set_chain_masks(ah, ah->rxchainmask, ah->txchainmask);
-+
-+- /* Initialize list pointers */
-+- ah->cal_list = ah->cal_list_last = ah->cal_list_curr = NULL;
-+-
-+- INIT_CAL(&ah->iq_caldata);
-+- INSERT_CAL(ah, &ah->iq_caldata);
-+- ath_dbg(common, CALIBRATE, "enabling IQ Calibration\n");
-+-
-+- /* Initialize current pointer to first element in list */
-+- ah->cal_list_curr = ah->cal_list;
-+-
-+- if (ah->cal_list_curr)
-+- ath9k_hw_reset_calibration(ah, ah->cal_list_curr);
-+-
-+- if (caldata)
-+- caldata->CalValid = 0;
-++ ar9003_hw_init_cal_common(ah);
-+
-+ return true;
-+ }
-diff --git a/package/kernel/mac80211/patches/327-mac80211-Remove-MPP-table-entries-with-MPath.patch b/package/kernel/mac80211/patches/327-mac80211-Remove-MPP-table-entries-with-MPath.patch
-deleted file mode 100644
-index f7f9df946a462b5ede16dc61f49f2731ae444af6..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/327-mac80211-Remove-MPP-table-entries-with-MPath.patch
-+++ /dev/null
-@@ -1,54 +0,0 @@
--From: Henning Rogge <hrogge@gmail.com>
--Date: Wed, 3 Feb 2016 13:58:36 +0100
--Subject: [PATCH] mac80211: Remove MPP table entries with MPath
--
--Make the mesh_path_del() function remove all mpp table entries
--that are proxied by the removed mesh path.
--
--Acked-by: Bob Copeland <me@bobcopeland.com>
--Signed-off-by: Henning Rogge <henning.rogge@fkie.fraunhofer.de>
--Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-----
--
----- a/net/mac80211/mesh_pathtbl.c
--+++ b/net/mac80211/mesh_pathtbl.c
--@@ -835,6 +835,29 @@ void mesh_path_flush_by_nexthop(struct s
-- rcu_read_unlock();
-- }
--
--+static void mpp_flush_by_proxy(struct ieee80211_sub_if_data *sdata,
--+ const u8 *proxy)
--+{
--+ struct mesh_table *tbl;
--+ struct mesh_path *mpp;
--+ struct mpath_node *node;
--+ int i;
--+
--+ rcu_read_lock();
--+ read_lock_bh(&pathtbl_resize_lock);
--+ tbl = resize_dereference_mpp_paths();
--+ for_each_mesh_entry(tbl, node, i) {
--+ mpp = node->mpath;
--+ if (ether_addr_equal(mpp->mpp, proxy)) {
--+ spin_lock(&tbl->hashwlock[i]);
--+ __mesh_path_del(tbl, node);
--+ spin_unlock(&tbl->hashwlock[i]);
--+ }
--+ }
--+ read_unlock_bh(&pathtbl_resize_lock);
--+ rcu_read_unlock();
--+}
--+
-- static void table_flush_by_iface(struct mesh_table *tbl,
-- struct ieee80211_sub_if_data *sdata)
-- {
--@@ -892,6 +915,9 @@ int mesh_path_del(struct ieee80211_sub_i
-- int hash_idx;
-- int err = 0;
--
--+ /* flush relevant mpp entries first */
--+ mpp_flush_by_proxy(sdata, addr);
--+
-- read_lock_bh(&pathtbl_resize_lock);
-- tbl = resize_dereference_mesh_paths();
-- hash_idx = mesh_table_hash(addr, sdata, tbl);
-diff --git a/package/kernel/mac80211/patches/328-ath9k_hw-implement-temperature-compensation-support-.patch b/package/kernel/mac80211/patches/328-ath9k_hw-implement-temperature-compensation-support-.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..cff32ad47cb0b905d9cfa4eb021258b644b2a47a
---- /dev/null
-+++ b/package/kernel/mac80211/patches/328-ath9k_hw-implement-temperature-compensation-support-.patch
-@@ -0,0 +1,97 @@
-+From: Felix Fietkau <nbd@nbd.name>
-+Date: Mon, 11 Jul 2016 11:35:55 +0200
-+Subject: [PATCH] ath9k_hw: implement temperature compensation support for
-+ AR9003+
-+
-+Signed-off-by: Felix Fietkau <nbd@nbd.name>
-+---
-+
-+--- a/drivers/net/wireless/ath/ath9k/ar9003_calib.c
-++++ b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
-+@@ -33,6 +33,7 @@ struct coeff {
-+
-+ enum ar9003_cal_types {
-+ IQ_MISMATCH_CAL = BIT(0),
-++ TEMP_COMP_CAL = BIT(1),
-+ };
-+
-+ static void ar9003_hw_setup_calibration(struct ath_hw *ah,
-+@@ -58,6 +59,12 @@ static void ar9003_hw_setup_calibration(
-+ /* Kick-off cal */
-+ REG_SET_BIT(ah, AR_PHY_TIMING4, AR_PHY_TIMING4_DO_CAL);
-+ break;
-++ case TEMP_COMP_CAL:
-++ ath_dbg(common, CALIBRATE,
-++ "starting Temperature Compensation Calibration\n");
-++ REG_SET_BIT(ah, AR_CH0_THERM, AR_CH0_THERM_LOCAL);
-++ REG_SET_BIT(ah, AR_CH0_THERM, AR_CH0_THERM_START);
-++ break;
-+ default:
-+ ath_err(common, "Invalid calibration type\n");
-+ break;
-+@@ -86,7 +93,8 @@ static bool ar9003_hw_per_calibration(st
-+ /*
-+ * Accumulate cal measures for active chains
-+ */
-+- cur_caldata->calCollect(ah);
-++ if (cur_caldata->calCollect)
-++ cur_caldata->calCollect(ah);
-+ ah->cal_samples++;
-+
-+ if (ah->cal_samples >= cur_caldata->calNumSamples) {
-+@@ -99,7 +107,8 @@ static bool ar9003_hw_per_calibration(st
-+ /*
-+ * Process accumulated data
-+ */
-+- cur_caldata->calPostProc(ah, numChains);
-++ if (cur_caldata->calPostProc)
-++ cur_caldata->calPostProc(ah, numChains);
-+
-+ /* Calibration has finished. */
-+ caldata->CalValid |= cur_caldata->calType;
-+@@ -314,9 +323,16 @@ static const struct ath9k_percal_data iq
-+ ar9003_hw_iqcalibrate
-+ };
-+
-++static const struct ath9k_percal_data temp_cal_single_sample = {
-++ TEMP_COMP_CAL,
-++ MIN_CAL_SAMPLES,
-++ PER_MAX_LOG_COUNT,
-++};
-++
-+ static void ar9003_hw_init_cal_settings(struct ath_hw *ah)
-+ {
-+ ah->iq_caldata.calData = &iq_cal_single_sample;
-++ ah->temp_caldata.calData = &temp_cal_single_sample;
-+
-+ if (AR_SREV_9300_20_OR_LATER(ah)) {
-+ ah->enabled_cals |= TX_IQ_CAL;
-+@@ -324,7 +340,7 @@ static void ar9003_hw_init_cal_settings(
-+ ah->enabled_cals |= TX_IQ_ON_AGC_CAL;
-+ }
-+
-+- ah->supp_cals = IQ_MISMATCH_CAL;
-++ ah->supp_cals = IQ_MISMATCH_CAL | TEMP_COMP_CAL;
-+ }
-+
-+ #define OFF_UPPER_LT 24
-+@@ -1383,6 +1399,9 @@ static void ar9003_hw_init_cal_common(st
-+ INIT_CAL(&ah->iq_caldata);
-+ INSERT_CAL(ah, &ah->iq_caldata);
-+
-++ INIT_CAL(&ah->temp_caldata);
-++ INSERT_CAL(ah, &ah->temp_caldata);
-++
-+ /* Initialize current pointer to first element in list */
-+ ah->cal_list_curr = ah->cal_list;
-+
-+--- a/drivers/net/wireless/ath/ath9k/hw.h
-++++ b/drivers/net/wireless/ath/ath9k/hw.h
-+@@ -830,6 +830,7 @@ struct ath_hw {
-+ /* Calibration */
-+ u32 supp_cals;
-+ struct ath9k_cal_list iq_caldata;
-++ struct ath9k_cal_list temp_caldata;
-+ struct ath9k_cal_list adcgain_caldata;
-+ struct ath9k_cal_list adcdc_caldata;
-+ struct ath9k_cal_list *cal_list;
-diff --git a/package/kernel/mac80211/patches/328-mac80211-let-unused-MPP-table-entries-timeout.patch b/package/kernel/mac80211/patches/328-mac80211-let-unused-MPP-table-entries-timeout.patch
-deleted file mode 100644
-index 740993c9e0284e5d03a9036ac87fd7548b22ab3b..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/328-mac80211-let-unused-MPP-table-entries-timeout.patch
-+++ /dev/null
-@@ -1,104 +0,0 @@
--From: Henning Rogge <hrogge@gmail.com>
--Date: Wed, 3 Feb 2016 13:58:37 +0100
--Subject: [PATCH] mac80211: let unused MPP table entries timeout
--
--Remember the last time when a mpp table entry is used for
--rx or tx and remove them after MESH_PATH_EXPIRE time.
--
--Acked-by: Bob Copeland <me@bobcopeland.com>
--Signed-off-by: Henning Rogge <henning.rogge@fkie.fraunhofer.de>
--Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-----
--
----- a/net/mac80211/mesh_pathtbl.c
--+++ b/net/mac80211/mesh_pathtbl.c
--@@ -942,6 +942,46 @@ enddel:
-- }
--
-- /**
--+ * mpp_path_del - delete a mesh proxy path from the table
--+ *
--+ * @addr: addr address (ETH_ALEN length)
--+ * @sdata: local subif
--+ *
--+ * Returns: 0 if successful
--+ */
--+static int mpp_path_del(struct ieee80211_sub_if_data *sdata, const u8 *addr)
--+{
--+ struct mesh_table *tbl;
--+ struct mesh_path *mpath;
--+ struct mpath_node *node;
--+ struct hlist_head *bucket;
--+ int hash_idx;
--+ int err = 0;
--+
--+ read_lock_bh(&pathtbl_resize_lock);
--+ tbl = resize_dereference_mpp_paths();
--+ hash_idx = mesh_table_hash(addr, sdata, tbl);
--+ bucket = &tbl->hash_buckets[hash_idx];
--+
--+ spin_lock(&tbl->hashwlock[hash_idx]);
--+ hlist_for_each_entry(node, bucket, list) {
--+ mpath = node->mpath;
--+ if (mpath->sdata == sdata &&
--+ ether_addr_equal(addr, mpath->dst)) {
--+ __mesh_path_del(tbl, node);
--+ goto enddel;
--+ }
--+ }
--+
--+ err = -ENXIO;
--+enddel:
--+ mesh_paths_generation++;
--+ spin_unlock(&tbl->hashwlock[hash_idx]);
--+ read_unlock_bh(&pathtbl_resize_lock);
--+ return err;
--+}
--+
--+/**
-- * mesh_path_tx_pending - sends pending frames in a mesh path queue
-- *
-- * @mpath: mesh path to activate
--@@ -1157,6 +1197,17 @@ void mesh_path_expire(struct ieee80211_s
-- time_after(jiffies, mpath->exp_time + MESH_PATH_EXPIRE))
-- mesh_path_del(mpath->sdata, mpath->dst);
-- }
--+
--+ tbl = rcu_dereference(mpp_paths);
--+ for_each_mesh_entry(tbl, node, i) {
--+ if (node->mpath->sdata != sdata)
--+ continue;
--+ mpath = node->mpath;
--+ if ((!(mpath->flags & MESH_PATH_FIXED)) &&
--+ time_after(jiffies, mpath->exp_time + MESH_PATH_EXPIRE))
--+ mpp_path_del(mpath->sdata, mpath->dst);
--+ }
--+
-- rcu_read_unlock();
-- }
--
----- a/net/mac80211/rx.c
--+++ b/net/mac80211/rx.c
--@@ -2291,6 +2291,7 @@ ieee80211_rx_h_mesh_fwding(struct ieee80
-- spin_lock_bh(&mppath->state_lock);
-- if (!ether_addr_equal(mppath->mpp, mpp_addr))
-- memcpy(mppath->mpp, mpp_addr, ETH_ALEN);
--+ mppath->exp_time = jiffies;
-- spin_unlock_bh(&mppath->state_lock);
-- }
-- rcu_read_unlock();
----- a/net/mac80211/tx.c
--+++ b/net/mac80211/tx.c
--@@ -2171,8 +2171,11 @@ static struct sk_buff *ieee80211_build_h
-- mpp_lookup = true;
-- }
--
--- if (mpp_lookup)
--+ if (mpp_lookup) {
-- mppath = mpp_path_lookup(sdata, skb->data);
--+ if (mppath)
--+ mppath->exp_time = jiffies;
--+ }
--
-- if (mppath && mpath)
-- mesh_path_del(mpath->sdata, mpath->dst);
-diff --git a/package/kernel/mac80211/patches/329-mac80211-Unify-mesh-and-mpp-path-removal-function.patch b/package/kernel/mac80211/patches/329-mac80211-Unify-mesh-and-mpp-path-removal-function.patch
-deleted file mode 100644
-index 0c36b1d5687447021eaa560d08b16580351b4a20..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/329-mac80211-Unify-mesh-and-mpp-path-removal-function.patch
-+++ /dev/null
-@@ -1,143 +0,0 @@
--From: Henning Rogge <hrogge@gmail.com>
--Date: Wed, 3 Feb 2016 13:58:38 +0100
--Subject: [PATCH] mac80211: Unify mesh and mpp path removal function
--
--mpp_path_del() and mesh_path_del() are mostly the same function.
--Move common code into a new static function.
--
--Acked-by: Bob Copeland <me@bobcopeland.com>
--Signed-off-by: Henning Rogge <henning.rogge@fkie.fraunhofer.de>
--Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-----
--
----- a/net/mac80211/mesh_pathtbl.c
--+++ b/net/mac80211/mesh_pathtbl.c
--@@ -55,16 +55,21 @@ int mpp_paths_generation;
-- static DEFINE_RWLOCK(pathtbl_resize_lock);
--
--
--+static inline struct mesh_table *resize_dereference_paths(
--+ struct mesh_table __rcu *table)
--+{
--+ return rcu_dereference_protected(table,
--+ lockdep_is_held(&pathtbl_resize_lock));
--+}
--+
-- static inline struct mesh_table *resize_dereference_mesh_paths(void)
-- {
--- return rcu_dereference_protected(mesh_paths,
--- lockdep_is_held(&pathtbl_resize_lock));
--+ return resize_dereference_paths(mesh_paths);
-- }
--
-- static inline struct mesh_table *resize_dereference_mpp_paths(void)
-- {
--- return rcu_dereference_protected(mpp_paths,
--- lockdep_is_held(&pathtbl_resize_lock));
--+ return resize_dereference_paths(mpp_paths);
-- }
--
-- /*
--@@ -899,14 +904,17 @@ void mesh_path_flush_by_iface(struct iee
-- }
--
-- /**
--- * mesh_path_del - delete a mesh path from the table
--+ * table_path_del - delete a path from the mesh or mpp table
-- *
--- * @addr: dst address (ETH_ALEN length)
--+ * @tbl: mesh or mpp path table
-- * @sdata: local subif
--+ * @addr: dst address (ETH_ALEN length)
-- *
-- * Returns: 0 if successful
-- */
---int mesh_path_del(struct ieee80211_sub_if_data *sdata, const u8 *addr)
--+static int table_path_del(struct mesh_table __rcu *rcu_tbl,
--+ struct ieee80211_sub_if_data *sdata,
--+ const u8 *addr)
-- {
-- struct mesh_table *tbl;
-- struct mesh_path *mpath;
--@@ -915,11 +923,7 @@ int mesh_path_del(struct ieee80211_sub_i
-- int hash_idx;
-- int err = 0;
--
--- /* flush relevant mpp entries first */
--- mpp_flush_by_proxy(sdata, addr);
---
--- read_lock_bh(&pathtbl_resize_lock);
--- tbl = resize_dereference_mesh_paths();
--+ tbl = resize_dereference_paths(rcu_tbl);
-- hash_idx = mesh_table_hash(addr, sdata, tbl);
-- bucket = &tbl->hash_buckets[hash_idx];
--
--@@ -935,9 +939,30 @@ int mesh_path_del(struct ieee80211_sub_i
--
-- err = -ENXIO;
-- enddel:
--- mesh_paths_generation++;
-- spin_unlock(&tbl->hashwlock[hash_idx]);
--+ return err;
--+}
--+
--+/**
--+ * mesh_path_del - delete a mesh path from the table
--+ *
--+ * @addr: dst address (ETH_ALEN length)
--+ * @sdata: local subif
--+ *
--+ * Returns: 0 if successful
--+ */
--+int mesh_path_del(struct ieee80211_sub_if_data *sdata, const u8 *addr)
--+{
--+ int err = 0;
--+
--+ /* flush relevant mpp entries first */
--+ mpp_flush_by_proxy(sdata, addr);
--+
--+ read_lock_bh(&pathtbl_resize_lock);
--+ err = table_path_del(mesh_paths, sdata, addr);
--+ mesh_paths_generation++;
-- read_unlock_bh(&pathtbl_resize_lock);
--+
-- return err;
-- }
--
--@@ -951,33 +976,13 @@ enddel:
-- */
-- static int mpp_path_del(struct ieee80211_sub_if_data *sdata, const u8 *addr)
-- {
--- struct mesh_table *tbl;
--- struct mesh_path *mpath;
--- struct mpath_node *node;
--- struct hlist_head *bucket;
--- int hash_idx;
-- int err = 0;
--
-- read_lock_bh(&pathtbl_resize_lock);
--- tbl = resize_dereference_mpp_paths();
--- hash_idx = mesh_table_hash(addr, sdata, tbl);
--- bucket = &tbl->hash_buckets[hash_idx];
---
--- spin_lock(&tbl->hashwlock[hash_idx]);
--- hlist_for_each_entry(node, bucket, list) {
--- mpath = node->mpath;
--- if (mpath->sdata == sdata &&
--- ether_addr_equal(addr, mpath->dst)) {
--- __mesh_path_del(tbl, node);
--- goto enddel;
--- }
--- }
---
--- err = -ENXIO;
---enddel:
--- mesh_paths_generation++;
--- spin_unlock(&tbl->hashwlock[hash_idx]);
--+ err = table_path_del(mpp_paths, sdata, addr);
--+ mpp_paths_generation++;
-- read_unlock_bh(&pathtbl_resize_lock);
--+
-- return err;
-- }
--
-diff --git a/package/kernel/mac80211/patches/329-mac80211-fix-check-for-buffered-powersave-frames-wit.patch b/package/kernel/mac80211/patches/329-mac80211-fix-check-for-buffered-powersave-frames-wit.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..38e541c7150aaf9b32eed89f8edfdf989d4677f7
---- /dev/null
-+++ b/package/kernel/mac80211/patches/329-mac80211-fix-check-for-buffered-powersave-frames-wit.patch
-@@ -0,0 +1,21 @@
-+From: Felix Fietkau <nbd@nbd.name>
-+Date: Mon, 11 Jul 2016 15:07:06 +0200
-+Subject: [PATCH] mac80211: fix check for buffered powersave frames with txq
-+
-+The logic was inverted here, set the bit if frames are pending.
-+
-+Fixes: ba8c3d6f16a1 ("mac80211: add an intermediate software queue implementation")
-+Signed-off-by: Felix Fietkau <nbd@nbd.name>
-+---
-+
-+--- a/net/mac80211/rx.c
-++++ b/net/mac80211/rx.c
-+@@ -1268,7 +1268,7 @@ static void sta_ps_start(struct sta_info
-+ for (tid = 0; tid < ARRAY_SIZE(sta->sta.txq); tid++) {
-+ struct txq_info *txqi = to_txq_info(sta->sta.txq[tid]);
-+
-+- if (!txqi->tin.backlog_packets)
-++ if (txqi->tin.backlog_packets)
-+ set_bit(tid, &sta->txq_buffered_tids);
-+ else
-+ clear_bit(tid, &sta->txq_buffered_tids);
-diff --git a/package/kernel/mac80211/patches/330-ath10k-fix-rx-status-reporting-for-A-MSDU-subframes.patch b/package/kernel/mac80211/patches/330-ath10k-fix-rx-status-reporting-for-A-MSDU-subframes.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..a6031b9c265d87656f04a7f7a639233949054818
---- /dev/null
-+++ b/package/kernel/mac80211/patches/330-ath10k-fix-rx-status-reporting-for-A-MSDU-subframes.patch
-@@ -0,0 +1,36 @@
-+From: Felix Fietkau <nbd@nbd.name>
-+Date: Sun, 17 Jul 2016 12:49:59 +0200
-+Subject: [PATCH] ath10k: fix rx status reporting for A-MSDU subframes
-+
-+Patch by Nagarajan, Ashok Raj <arnagara@qti.qualcomm.com>
-+
-+Signed-off-by: Felix Fietkau <nbd@nbd.name>
-+---
-+
-+--- a/drivers/net/wireless/ath/ath10k/htt_rx.c
-++++ b/drivers/net/wireless/ath/ath10k/htt_rx.c
-+@@ -1525,7 +1525,7 @@ static void ath10k_htt_rx_h_filter(struc
-+ static int ath10k_htt_rx_handle_amsdu(struct ath10k_htt *htt)
-+ {
-+ struct ath10k *ar = htt->ar;
-+- static struct ieee80211_rx_status rx_status;
-++ struct ieee80211_rx_status *rx_status = &htt->rx_status;
-+ struct sk_buff_head amsdu;
-+ int ret;
-+
-+@@ -1549,11 +1549,11 @@ static int ath10k_htt_rx_handle_amsdu(st
-+ return ret;
-+ }
-+
-+- ath10k_htt_rx_h_ppdu(ar, &amsdu, &rx_status, 0xffff);
-++ ath10k_htt_rx_h_ppdu(ar, &amsdu, rx_status, 0xffff);
-+ ath10k_htt_rx_h_unchain(ar, &amsdu, ret > 0);
-+- ath10k_htt_rx_h_filter(ar, &amsdu, &rx_status);
-+- ath10k_htt_rx_h_mpdu(ar, &amsdu, &rx_status);
-+- ath10k_htt_rx_h_deliver(ar, &amsdu, &rx_status);
-++ ath10k_htt_rx_h_filter(ar, &amsdu, rx_status);
-++ ath10k_htt_rx_h_mpdu(ar, &amsdu, rx_status);
-++ ath10k_htt_rx_h_deliver(ar, &amsdu, rx_status);
-+
-+ return 0;
-+ }
-diff --git a/package/kernel/mac80211/patches/330-mac80211-minstrel-Change-expected-throughput-unit-ba.patch b/package/kernel/mac80211/patches/330-mac80211-minstrel-Change-expected-throughput-unit-ba.patch
-deleted file mode 100644
-index 4dc6d663ed7af432b5d26338ef74732abe6aa31c..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/330-mac80211-minstrel-Change-expected-throughput-unit-ba.patch
-+++ /dev/null
-@@ -1,51 +0,0 @@
--From: Sven Eckelmann <sven.eckelmann@open-mesh.com>
--Date: Tue, 2 Feb 2016 08:12:26 +0100
--Subject: [PATCH] mac80211: minstrel: Change expected throughput unit back to
-- Kbps
--
--The change from cur_tp to the function
--minstrel_get_tp_avg/minstrel_ht_get_tp_avg changed the unit used for the
--current throughput. For example in minstrel_ht the correct
--conversion between them would be:
--
-- mrs->cur_tp / 10 == minstrel_ht_get_tp_avg(..).
--
--This factor 10 must also be included in the calculation of
--minstrel_get_expected_throughput and minstrel_ht_get_expected_throughput to
--return values with the unit [Kbps] instead of [10Kbps]. Otherwise routing
--algorithms like B.A.T.M.A.N. V will make incorrect decision based on these
--values. Its kernel based implementation expects expected_throughput always
--to have the unit [Kbps] and not sometimes [10Kbps] and sometimes [Kbps].
--
--The same requirement has iw or olsrdv2's nl80211 based statistics module
--which retrieve the same data via NL80211_STA_INFO_TX_BITRATE.
--
--Cc: stable@vger.kernel.org
--Fixes: 6a27b2c40b48 ("mac80211: restructure per-rate throughput calculation into function")
--Signed-off-by: Sven Eckelmann <sven@open-mesh.com>
--Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-----
--
----- a/net/mac80211/rc80211_minstrel.c
--+++ b/net/mac80211/rc80211_minstrel.c
--@@ -711,7 +711,7 @@ static u32 minstrel_get_expected_through
-- * computing cur_tp
-- */
-- tmp_mrs = &mi->r[idx].stats;
--- tmp_cur_tp = minstrel_get_tp_avg(&mi->r[idx], tmp_mrs->prob_ewma);
--+ tmp_cur_tp = minstrel_get_tp_avg(&mi->r[idx], tmp_mrs->prob_ewma) * 10;
-- tmp_cur_tp = tmp_cur_tp * 1200 * 8 / 1024;
--
-- return tmp_cur_tp;
----- a/net/mac80211/rc80211_minstrel_ht.c
--+++ b/net/mac80211/rc80211_minstrel_ht.c
--@@ -1335,7 +1335,8 @@ static u32 minstrel_ht_get_expected_thro
-- prob = mi->groups[i].rates[j].prob_ewma;
--
-- /* convert tp_avg from pkt per second in kbps */
--- tp_avg = minstrel_ht_get_tp_avg(mi, i, j, prob) * AVG_PKT_SIZE * 8 / 1024;
--+ tp_avg = minstrel_ht_get_tp_avg(mi, i, j, prob) * 10;
--+ tp_avg = tp_avg * AVG_PKT_SIZE * 8 / 1024;
--
-- return tp_avg;
-- }
-diff --git a/package/kernel/mac80211/patches/331-brcmfmac-Increase-nr-of-supported-flowrings.patch b/package/kernel/mac80211/patches/331-brcmfmac-Increase-nr-of-supported-flowrings.patch
-deleted file mode 100644
-index 1fd016f7f6bc9ad7bd4265e16a439b4de33b8f9c..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/331-brcmfmac-Increase-nr-of-supported-flowrings.patch
-+++ /dev/null
-@@ -1,307 +0,0 @@
--From: Hante Meuleman <meuleman@broadcom.com>
--Date: Sun, 7 Feb 2016 18:08:24 +0100
--Subject: [PATCH] brcmfmac: Increase nr of supported flowrings.
--MIME-Version: 1.0
--Content-Type: text/plain; charset=UTF-8
--Content-Transfer-Encoding: 8bit
--
--New generation devices have firmware which has more than 256 flowrings.
--E.g. following debugging message comes from 14e4:4365 BCM4366:
--[ 194.606245] brcmfmac: brcmf_pcie_init_ringbuffers Nr of flowrings is 264
--
--At various code places (related to flowrings) we were using u8 which
--could lead to storing wrong number or infinite loops when indexing with
--this type. This issue was quite easy to spot in brcmf_flowring_detach
--where it led to infinite loop e.g. on failed initialization.
--
--This patch switches code to proper types and increases the maximum
--number of supported flowrings to 512.
--
--Originally this change was sent in September 2015, but back it was
--causing a regression on BCM43602 resulting in:
--Unable to handle kernel NULL pointer dereference at virtual address ...
--
--The reason for this regression was missing update (s/u8/u16) of struct
--brcmf_flowring_ring. This problem was handled in 9f64df9 ("brcmfmac: Fix
--bug in flowring management."). Starting with that it's safe to apply
--this original patch as it doesn't cause a regression anymore.
--
--This patch fixes an infinite loop on BCM4366 which is supported since
--4.4 so it makes sense to apply it to stable 4.4+.
--
--Cc: <stable@vger.kernel.org> # 4.4+
--Reviewed-by: Arend Van Spriel <arend@broadcom.com>
--Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
--Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
--Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
--Signed-off-by: Arend van Spriel <arend@broadcom.com>
--Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
-----
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.c
--@@ -32,7 +32,7 @@
-- #define BRCMF_FLOWRING_LOW (BRCMF_FLOWRING_HIGH - 256)
-- #define BRCMF_FLOWRING_INVALID_IFIDX 0xff
--
---#define BRCMF_FLOWRING_HASH_AP(da, fifo, ifidx) (da[5] + fifo + ifidx * 16)
--+#define BRCMF_FLOWRING_HASH_AP(da, fifo, ifidx) (da[5] * 2 + fifo + ifidx * 16)
-- #define BRCMF_FLOWRING_HASH_STA(fifo, ifidx) (fifo + ifidx * 16)
--
-- static const u8 brcmf_flowring_prio2fifo[] = {
--@@ -68,7 +68,7 @@ u32 brcmf_flowring_lookup(struct brcmf_f
-- u8 prio, u8 ifidx)
-- {
-- struct brcmf_flowring_hash *hash;
--- u8 hash_idx;
--+ u16 hash_idx;
-- u32 i;
-- bool found;
-- bool sta;
--@@ -88,6 +88,7 @@ u32 brcmf_flowring_lookup(struct brcmf_f
-- }
-- hash_idx = sta ? BRCMF_FLOWRING_HASH_STA(fifo, ifidx) :
-- BRCMF_FLOWRING_HASH_AP(mac, fifo, ifidx);
--+ hash_idx &= (BRCMF_FLOWRING_HASHSIZE - 1);
-- found = false;
-- hash = flow->hash;
-- for (i = 0; i < BRCMF_FLOWRING_HASHSIZE; i++) {
--@@ -98,6 +99,7 @@ u32 brcmf_flowring_lookup(struct brcmf_f
-- break;
-- }
-- hash_idx++;
--+ hash_idx &= (BRCMF_FLOWRING_HASHSIZE - 1);
-- }
-- if (found)
-- return hash[hash_idx].flowid;
--@@ -111,7 +113,7 @@ u32 brcmf_flowring_create(struct brcmf_f
-- {
-- struct brcmf_flowring_ring *ring;
-- struct brcmf_flowring_hash *hash;
--- u8 hash_idx;
--+ u16 hash_idx;
-- u32 i;
-- bool found;
-- u8 fifo;
--@@ -131,6 +133,7 @@ u32 brcmf_flowring_create(struct brcmf_f
-- }
-- hash_idx = sta ? BRCMF_FLOWRING_HASH_STA(fifo, ifidx) :
-- BRCMF_FLOWRING_HASH_AP(mac, fifo, ifidx);
--+ hash_idx &= (BRCMF_FLOWRING_HASHSIZE - 1);
-- found = false;
-- hash = flow->hash;
-- for (i = 0; i < BRCMF_FLOWRING_HASHSIZE; i++) {
--@@ -140,6 +143,7 @@ u32 brcmf_flowring_create(struct brcmf_f
-- break;
-- }
-- hash_idx++;
--+ hash_idx &= (BRCMF_FLOWRING_HASHSIZE - 1);
-- }
-- if (found) {
-- for (i = 0; i < flow->nrofrings; i++) {
--@@ -169,7 +173,7 @@ u32 brcmf_flowring_create(struct brcmf_f
-- }
--
--
---u8 brcmf_flowring_tid(struct brcmf_flowring *flow, u8 flowid)
--+u8 brcmf_flowring_tid(struct brcmf_flowring *flow, u16 flowid)
-- {
-- struct brcmf_flowring_ring *ring;
--
--@@ -179,7 +183,7 @@ u8 brcmf_flowring_tid(struct brcmf_flowr
-- }
--
--
---static void brcmf_flowring_block(struct brcmf_flowring *flow, u8 flowid,
--+static void brcmf_flowring_block(struct brcmf_flowring *flow, u16 flowid,
-- bool blocked)
-- {
-- struct brcmf_flowring_ring *ring;
--@@ -228,10 +232,10 @@ static void brcmf_flowring_block(struct
-- }
--
--
---void brcmf_flowring_delete(struct brcmf_flowring *flow, u8 flowid)
--+void brcmf_flowring_delete(struct brcmf_flowring *flow, u16 flowid)
-- {
-- struct brcmf_flowring_ring *ring;
--- u8 hash_idx;
--+ u16 hash_idx;
-- struct sk_buff *skb;
--
-- ring = flow->rings[flowid];
--@@ -253,7 +257,7 @@ void brcmf_flowring_delete(struct brcmf_
-- }
--
--
---u32 brcmf_flowring_enqueue(struct brcmf_flowring *flow, u8 flowid,
--+u32 brcmf_flowring_enqueue(struct brcmf_flowring *flow, u16 flowid,
-- struct sk_buff *skb)
-- {
-- struct brcmf_flowring_ring *ring;
--@@ -279,7 +283,7 @@ u32 brcmf_flowring_enqueue(struct brcmf_
-- }
--
--
---struct sk_buff *brcmf_flowring_dequeue(struct brcmf_flowring *flow, u8 flowid)
--+struct sk_buff *brcmf_flowring_dequeue(struct brcmf_flowring *flow, u16 flowid)
-- {
-- struct brcmf_flowring_ring *ring;
-- struct sk_buff *skb;
--@@ -300,7 +304,7 @@ struct sk_buff *brcmf_flowring_dequeue(s
-- }
--
--
---void brcmf_flowring_reinsert(struct brcmf_flowring *flow, u8 flowid,
--+void brcmf_flowring_reinsert(struct brcmf_flowring *flow, u16 flowid,
-- struct sk_buff *skb)
-- {
-- struct brcmf_flowring_ring *ring;
--@@ -311,7 +315,7 @@ void brcmf_flowring_reinsert(struct brcm
-- }
--
--
---u32 brcmf_flowring_qlen(struct brcmf_flowring *flow, u8 flowid)
--+u32 brcmf_flowring_qlen(struct brcmf_flowring *flow, u16 flowid)
-- {
-- struct brcmf_flowring_ring *ring;
--
--@@ -326,7 +330,7 @@ u32 brcmf_flowring_qlen(struct brcmf_flo
-- }
--
--
---void brcmf_flowring_open(struct brcmf_flowring *flow, u8 flowid)
--+void brcmf_flowring_open(struct brcmf_flowring *flow, u16 flowid)
-- {
-- struct brcmf_flowring_ring *ring;
--
--@@ -340,10 +344,10 @@ void brcmf_flowring_open(struct brcmf_fl
-- }
--
--
---u8 brcmf_flowring_ifidx_get(struct brcmf_flowring *flow, u8 flowid)
--+u8 brcmf_flowring_ifidx_get(struct brcmf_flowring *flow, u16 flowid)
-- {
-- struct brcmf_flowring_ring *ring;
--- u8 hash_idx;
--+ u16 hash_idx;
--
-- ring = flow->rings[flowid];
-- hash_idx = ring->hash_id;
--@@ -384,7 +388,7 @@ void brcmf_flowring_detach(struct brcmf_
-- struct brcmf_pub *drvr = bus_if->drvr;
-- struct brcmf_flowring_tdls_entry *search;
-- struct brcmf_flowring_tdls_entry *remove;
--- u8 flowid;
--+ u16 flowid;
--
-- for (flowid = 0; flowid < flow->nrofrings; flowid++) {
-- if (flow->rings[flowid])
--@@ -408,7 +412,7 @@ void brcmf_flowring_configure_addr_mode(
-- struct brcmf_bus *bus_if = dev_get_drvdata(flow->dev);
-- struct brcmf_pub *drvr = bus_if->drvr;
-- u32 i;
--- u8 flowid;
--+ u16 flowid;
--
-- if (flow->addr_mode[ifidx] != addr_mode) {
-- for (i = 0; i < ARRAY_SIZE(flow->hash); i++) {
--@@ -434,7 +438,7 @@ void brcmf_flowring_delete_peer(struct b
-- struct brcmf_flowring_tdls_entry *prev;
-- struct brcmf_flowring_tdls_entry *search;
-- u32 i;
--- u8 flowid;
--+ u16 flowid;
-- bool sta;
--
-- sta = (flow->addr_mode[ifidx] == ADDR_INDIRECT);
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.h
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.h
--@@ -16,7 +16,7 @@
-- #define BRCMFMAC_FLOWRING_H
--
--
---#define BRCMF_FLOWRING_HASHSIZE 256
--+#define BRCMF_FLOWRING_HASHSIZE 512 /* has to be 2^x */
-- #define BRCMF_FLOWRING_INVALID_ID 0xFFFFFFFF
--
--
--@@ -24,7 +24,7 @@ struct brcmf_flowring_hash {
-- u8 mac[ETH_ALEN];
-- u8 fifo;
-- u8 ifidx;
--- u8 flowid;
--+ u16 flowid;
-- };
--
-- enum ring_status {
--@@ -61,16 +61,16 @@ u32 brcmf_flowring_lookup(struct brcmf_f
-- u8 prio, u8 ifidx);
-- u32 brcmf_flowring_create(struct brcmf_flowring *flow, u8 da[ETH_ALEN],
-- u8 prio, u8 ifidx);
---void brcmf_flowring_delete(struct brcmf_flowring *flow, u8 flowid);
---void brcmf_flowring_open(struct brcmf_flowring *flow, u8 flowid);
---u8 brcmf_flowring_tid(struct brcmf_flowring *flow, u8 flowid);
---u32 brcmf_flowring_enqueue(struct brcmf_flowring *flow, u8 flowid,
--+void brcmf_flowring_delete(struct brcmf_flowring *flow, u16 flowid);
--+void brcmf_flowring_open(struct brcmf_flowring *flow, u16 flowid);
--+u8 brcmf_flowring_tid(struct brcmf_flowring *flow, u16 flowid);
--+u32 brcmf_flowring_enqueue(struct brcmf_flowring *flow, u16 flowid,
-- struct sk_buff *skb);
---struct sk_buff *brcmf_flowring_dequeue(struct brcmf_flowring *flow, u8 flowid);
---void brcmf_flowring_reinsert(struct brcmf_flowring *flow, u8 flowid,
--+struct sk_buff *brcmf_flowring_dequeue(struct brcmf_flowring *flow, u16 flowid);
--+void brcmf_flowring_reinsert(struct brcmf_flowring *flow, u16 flowid,
-- struct sk_buff *skb);
---u32 brcmf_flowring_qlen(struct brcmf_flowring *flow, u8 flowid);
---u8 brcmf_flowring_ifidx_get(struct brcmf_flowring *flow, u8 flowid);
--+u32 brcmf_flowring_qlen(struct brcmf_flowring *flow, u16 flowid);
--+u8 brcmf_flowring_ifidx_get(struct brcmf_flowring *flow, u16 flowid);
-- struct brcmf_flowring *brcmf_flowring_attach(struct device *dev, u16 nrofrings);
-- void brcmf_flowring_detach(struct brcmf_flowring *flow);
-- void brcmf_flowring_configure_addr_mode(struct brcmf_flowring *flow, int ifidx,
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c
--@@ -677,7 +677,7 @@ static u32 brcmf_msgbuf_flowring_create(
-- }
--
--
---static void brcmf_msgbuf_txflow(struct brcmf_msgbuf *msgbuf, u8 flowid)
--+static void brcmf_msgbuf_txflow(struct brcmf_msgbuf *msgbuf, u16 flowid)
-- {
-- struct brcmf_flowring *flow = msgbuf->flow;
-- struct brcmf_commonring *commonring;
--@@ -1310,7 +1310,7 @@ int brcmf_proto_msgbuf_rx_trigger(struct
-- }
--
--
---void brcmf_msgbuf_delete_flowring(struct brcmf_pub *drvr, u8 flowid)
--+void brcmf_msgbuf_delete_flowring(struct brcmf_pub *drvr, u16 flowid)
-- {
-- struct brcmf_msgbuf *msgbuf = (struct brcmf_msgbuf *)drvr->proto->pd;
-- struct msgbuf_tx_flowring_delete_req *delete;
--@@ -1415,6 +1415,13 @@ int brcmf_proto_msgbuf_attach(struct brc
-- u32 count;
--
-- if_msgbuf = drvr->bus_if->msgbuf;
--+
--+ if (if_msgbuf->nrof_flowrings >= BRCMF_FLOWRING_HASHSIZE) {
--+ brcmf_err("driver not configured for this many flowrings %d\n",
--+ if_msgbuf->nrof_flowrings);
--+ if_msgbuf->nrof_flowrings = BRCMF_FLOWRING_HASHSIZE - 1;
--+ }
--+
-- msgbuf = kzalloc(sizeof(*msgbuf), GFP_KERNEL);
-- if (!msgbuf)
-- goto fail;
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.h
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.h
--@@ -33,7 +33,7 @@
--
--
-- int brcmf_proto_msgbuf_rx_trigger(struct device *dev);
---void brcmf_msgbuf_delete_flowring(struct brcmf_pub *drvr, u8 flowid);
--+void brcmf_msgbuf_delete_flowring(struct brcmf_pub *drvr, u16 flowid);
-- int brcmf_proto_msgbuf_attach(struct brcmf_pub *drvr);
-- void brcmf_proto_msgbuf_detach(struct brcmf_pub *drvr);
-- #else
-diff --git a/package/kernel/mac80211/patches/332-cfg80211-fix-faulty-variable-initialization-in-ieee8.patch b/package/kernel/mac80211/patches/332-cfg80211-fix-faulty-variable-initialization-in-ieee8.patch
-deleted file mode 100644
-index e414f23784163abfeba59d9e523e3684643c038a..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/332-cfg80211-fix-faulty-variable-initialization-in-ieee8.patch
-+++ /dev/null
-@@ -1,22 +0,0 @@
--From: Felix Fietkau <nbd@openwrt.org>
--Date: Mon, 8 Feb 2016 14:24:36 +0100
--Subject: [PATCH] cfg80211: fix faulty variable initialization in
-- ieee80211_amsdu_to_8023s
--
--reuse_skb is set to true if the code decides to use the last segment.
--Fixes a memory leak
--
--Signed-off-by: Felix Fietkau <nbd@openwrt.org>
-----
--
----- a/net/wireless/util.c
--+++ b/net/wireless/util.c
--@@ -676,7 +676,7 @@ void ieee80211_amsdu_to_8023s(struct sk_
-- u8 *payload;
-- int offset = 0, remaining, err;
-- struct ethhdr eth;
--- bool reuse_skb = true;
--+ bool reuse_skb = false;
-- bool last = false;
--
-- if (has_80211_header) {
-diff --git a/package/kernel/mac80211/patches/333-cfg80211-reuse-existing-page-fragments-in-A-MSDU-rx.patch b/package/kernel/mac80211/patches/333-cfg80211-reuse-existing-page-fragments-in-A-MSDU-rx.patch
-deleted file mode 100644
-index 6e2d0cf5b0783860cb39264e33ecdef622fcc548..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/333-cfg80211-reuse-existing-page-fragments-in-A-MSDU-rx.patch
-+++ /dev/null
-@@ -1,132 +0,0 @@
--From: Felix Fietkau <nbd@openwrt.org>
--Date: Mon, 8 Feb 2016 14:33:19 +0100
--Subject: [PATCH] cfg80211: reuse existing page fragments in A-MSDU rx
--
--This massively reduces data copying and thus improves rx performance
--
--Signed-off-by: Felix Fietkau <nbd@openwrt.org>
-----
--
----- a/net/wireless/util.c
--+++ b/net/wireless/util.c
--@@ -644,23 +644,93 @@ int ieee80211_data_from_8023(struct sk_b
-- }
-- EXPORT_SYMBOL(ieee80211_data_from_8023);
--
--+static void
--+__frame_add_frag(struct sk_buff *skb, struct page *page,
--+ void *ptr, int len, int size)
--+{
--+ struct skb_shared_info *sh = skb_shinfo(skb);
--+ int page_offset;
--+
--+ atomic_inc(&page->_count);
--+ page_offset = ptr - page_address(page);
--+ skb_add_rx_frag(skb, sh->nr_frags, page, page_offset, len, size);
--+}
--+
--+static void
--+__ieee80211_amsdu_copy_frag(struct sk_buff *skb, struct sk_buff *frame,
--+ int offset, int len)
--+{
--+ struct skb_shared_info *sh = skb_shinfo(skb);
--+ const skb_frag_t *frag = &sh->frags[-1];
--+ struct page *frag_page;
--+ void *frag_ptr;
--+ int frag_len, frag_size;
--+ int head_size = skb->len - skb->data_len;
--+ int cur_len;
--+
--+ frag_page = virt_to_head_page(skb->head);
--+ frag_ptr = skb->data;
--+ frag_size = head_size;
--+
--+ while (offset >= frag_size) {
--+ offset -= frag_size;
--+ frag++;
--+ frag_page = skb_frag_page(frag);
--+ frag_ptr = skb_frag_address(frag);
--+ frag_size = skb_frag_size(frag);
--+ }
--+
--+ frag_ptr += offset;
--+ frag_len = frag_size - offset;
--+
--+ cur_len = min(len, frag_len);
--+
--+ __frame_add_frag(frame, frag_page, frag_ptr, cur_len, frag_size);
--+ len -= cur_len;
--+
--+ while (len > 0) {
--+ frag++;
--+ frag_len = skb_frag_size(frag);
--+ cur_len = min(len, frag_len);
--+ __frame_add_frag(frame, skb_frag_page(frag),
--+ skb_frag_address(frag), cur_len, frag_len);
--+ len -= cur_len;
--+ }
--+}
--+
-- static struct sk_buff *
-- __ieee80211_amsdu_copy(struct sk_buff *skb, unsigned int hlen,
--- int offset, int len)
--+ int offset, int len, bool reuse_frag)
-- {
-- struct sk_buff *frame;
--+ int cur_len = len;
--
-- if (skb->len - offset < len)
-- return NULL;
--
-- /*
--+ * When reusing framents, copy some data to the head to simplify
--+ * ethernet header handling and speed up protocol header processing
--+ * in the stack later.
--+ */
--+ if (reuse_frag)
--+ cur_len = min_t(int, len, 32);
--+
--+ /*
-- * Allocate and reserve two bytes more for payload
-- * alignment since sizeof(struct ethhdr) is 14.
-- */
--- frame = dev_alloc_skb(hlen + sizeof(struct ethhdr) + 2 + len);
--+ frame = dev_alloc_skb(hlen + sizeof(struct ethhdr) + 2 + cur_len);
--
-- skb_reserve(frame, hlen + sizeof(struct ethhdr) + 2);
--- skb_copy_bits(skb, offset, skb_put(frame, len), len);
--+ skb_copy_bits(skb, offset, skb_put(frame, cur_len), cur_len);
--+
--+ len -= cur_len;
--+ if (!len)
--+ return frame;
--+
--+ offset += cur_len;
--+ __ieee80211_amsdu_copy_frag(skb, frame, offset, len);
--
-- return frame;
-- }
--@@ -676,6 +746,7 @@ void ieee80211_amsdu_to_8023s(struct sk_
-- u8 *payload;
-- int offset = 0, remaining, err;
-- struct ethhdr eth;
--+ bool reuse_frag = skb->head_frag && !skb_has_frag_list(skb);
-- bool reuse_skb = false;
-- bool last = false;
--
--@@ -703,12 +774,13 @@ void ieee80211_amsdu_to_8023s(struct sk_
-- offset += sizeof(struct ethhdr);
-- /* reuse skb for the last subframe */
-- last = remaining <= subframe_len + padding;
--- if (!skb_is_nonlinear(skb) && last) {
--+ if (!skb_is_nonlinear(skb) && !reuse_frag && last) {
-- skb_pull(skb, offset);
-- frame = skb;
-- reuse_skb = true;
-- } else {
--- frame = __ieee80211_amsdu_copy(skb, hlen, offset, len);
--+ frame = __ieee80211_amsdu_copy(skb, hlen, offset, len,
--+ reuse_frag);
-- if (!frame)
-- goto purge;
--
-diff --git a/package/kernel/mac80211/patches/334-mac80211-fix-wiphy-supported_band-access.patch b/package/kernel/mac80211/patches/334-mac80211-fix-wiphy-supported_band-access.patch
-deleted file mode 100644
-index f8f4f0999dd2185090fdffef1d80629f15a67dd2..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/334-mac80211-fix-wiphy-supported_band-access.patch
-+++ /dev/null
-@@ -1,36 +0,0 @@
--From: Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>
--Date: Wed, 10 Feb 2016 16:08:17 +0100
--Subject: [PATCH] mac80211: fix wiphy supported_band access
--
--Fix wiphy supported_band access in tx radiotap parsing. In particular,
--info->band is always set to 0 (IEEE80211_BAND_2GHZ) since it has not
--assigned yet. This cause a kernel crash on 5GHz only devices.
--Move ieee80211_parse_tx_radiotap() after info->band assignment
--
--Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>
-----
--
----- a/net/mac80211/tx.c
--+++ b/net/mac80211/tx.c
--@@ -1890,10 +1890,6 @@ netdev_tx_t ieee80211_monitor_start_xmit
-- info->flags = IEEE80211_TX_CTL_REQ_TX_STATUS |
-- IEEE80211_TX_CTL_INJECTED;
--
--- /* process and remove the injection radiotap header */
--- if (!ieee80211_parse_tx_radiotap(local, skb))
--- goto fail;
---
-- rcu_read_lock();
--
-- /*
--@@ -1955,6 +1951,10 @@ netdev_tx_t ieee80211_monitor_start_xmit
-- goto fail_rcu;
--
-- info->band = chandef->chan->band;
--+ /* process and remove the injection radiotap header */
--+ if (!ieee80211_parse_tx_radiotap(local, skb))
--+ goto fail_rcu;
--+
-- ieee80211_xmit(sdata, NULL, skb);
-- rcu_read_unlock();
--
-diff --git a/package/kernel/mac80211/patches/335-mac80211-minstrel_ht-set-A-MSDU-tx-limits-based-on-s.patch b/package/kernel/mac80211/patches/335-mac80211-minstrel_ht-set-A-MSDU-tx-limits-based-on-s.patch
-deleted file mode 100644
-index acaacf7cacc3ecf380dd69794aaa6b07b5403708..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/335-mac80211-minstrel_ht-set-A-MSDU-tx-limits-based-on-s.patch
-+++ /dev/null
-@@ -1,61 +0,0 @@
--From: Felix Fietkau <nbd@openwrt.org>
--Date: Thu, 18 Feb 2016 19:30:05 +0100
--Subject: [PATCH] mac80211: minstrel_ht: set A-MSDU tx limits based on selected
-- max_prob_rate
--
--Prevents excessive A-MSDU aggregation at low data rates or bad
--conditions.
--
--Signed-off-by: Felix Fietkau <nbd@openwrt.org>
-----
--
----- a/net/mac80211/rc80211_minstrel_ht.c
--+++ b/net/mac80211/rc80211_minstrel_ht.c
--@@ -883,6 +883,39 @@ minstrel_ht_set_rate(struct minstrel_pri
-- ratetbl->rate[offset].flags = flags;
-- }
--
--+static int
--+minstrel_ht_get_max_amsdu_len(struct minstrel_ht_sta *mi)
--+{
--+ int group = mi->max_prob_rate / MCS_GROUP_RATES;
--+ const struct mcs_group *g = &minstrel_mcs_groups[group];
--+ int rate = mi->max_prob_rate % MCS_GROUP_RATES;
--+
--+ /* Disable A-MSDU if max_prob_rate is bad */
--+ if (mi->groups[group].rates[rate].prob_ewma < MINSTREL_FRAC(50, 100))
--+ return 1;
--+
--+ /* If the rate is slower than single-stream MCS1, make A-MSDU limit small */
--+ if (g->duration[rate] > MCS_DURATION(1, 0, 52))
--+ return 500;
--+
--+ /*
--+ * If the rate is slower than single-stream MCS4, limit A-MSDU to usual
--+ * data packet size
--+ */
--+ if (g->duration[rate] > MCS_DURATION(1, 0, 104))
--+ return 1500;
--+
--+ /*
--+ * If the rate is slower than single-stream MCS7, limit A-MSDU to twice
--+ * the usual data packet size
--+ */
--+ if (g->duration[rate] > MCS_DURATION(1, 0, 260))
--+ return 3000;
--+
--+ /* unlimited */
--+ return 0;
--+}
--+
-- static void
-- minstrel_ht_update_rates(struct minstrel_priv *mp, struct minstrel_ht_sta *mi)
-- {
--@@ -907,6 +940,7 @@ minstrel_ht_update_rates(struct minstrel
-- minstrel_ht_set_rate(mp, mi, rates, i++, mi->max_prob_rate);
-- }
--
--+ mi->sta->max_rc_amsdu_len = minstrel_ht_get_max_amsdu_len(mi);
-- rates->rate[i].idx = -1;
-- rate_control_set_rates(mp->hw, mi->sta, rates);
-- }
-diff --git a/package/kernel/mac80211/patches/336-mac80211-minstrel_ht-set-default-tx-aggregation-time.patch b/package/kernel/mac80211/patches/336-mac80211-minstrel_ht-set-default-tx-aggregation-time.patch
-deleted file mode 100644
-index 32a2ad6f0bcdafc499f257b6f925aaf0499e24c0..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/336-mac80211-minstrel_ht-set-default-tx-aggregation-time.patch
-+++ /dev/null
-@@ -1,31 +0,0 @@
--From: Felix Fietkau <nbd@openwrt.org>
--Date: Thu, 18 Feb 2016 19:45:33 +0100
--Subject: [PATCH] mac80211: minstrel_ht: set default tx aggregation timeout to
-- 0
--
--The value 5000 was put here with the addition of the timeout field to
--ieee80211_start_tx_ba_session. It was originally added in mac80211 to
--save resources for drivers like iwlwifi, which only supports a limited
--number of concurrent aggregation sessions.
--
--Since iwlwifi does not use minstrel_ht and other drivers don't need
--this, 0 is a better default - especially since there have been
--recent reports of aggregation setup related issues reproduced with
--ath9k. This should improve stability without causing any adverse
--effects.
--
--Cc: stable@vger.kernel.org
--Signed-off-by: Felix Fietkau <nbd@openwrt.org>
-----
--
----- a/net/mac80211/rc80211_minstrel_ht.c
--+++ b/net/mac80211/rc80211_minstrel_ht.c
--@@ -692,7 +692,7 @@ minstrel_aggr_check(struct ieee80211_sta
-- if (likely(sta->ampdu_mlme.tid_tx[tid]))
-- return;
--
--- ieee80211_start_tx_ba_session(pubsta, tid, 5000);
--+ ieee80211_start_tx_ba_session(pubsta, tid, 0);
-- }
--
-- static void
-diff --git a/package/kernel/mac80211/patches/337-mac80211-minstrel_ht-fix-a-logic-error-in-RTS-CTS-ha.patch b/package/kernel/mac80211/patches/337-mac80211-minstrel_ht-fix-a-logic-error-in-RTS-CTS-ha.patch
-deleted file mode 100644
-index 229351ba56802ef44fae5fe5f88a3ffbb0ada098..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/337-mac80211-minstrel_ht-fix-a-logic-error-in-RTS-CTS-ha.patch
-+++ /dev/null
-@@ -1,26 +0,0 @@
--From: Felix Fietkau <nbd@openwrt.org>
--Date: Wed, 24 Feb 2016 12:03:13 +0100
--Subject: [PATCH] mac80211: minstrel_ht: fix a logic error in RTS/CTS handling
--MIME-Version: 1.0
--Content-Type: text/plain; charset=UTF-8
--Content-Transfer-Encoding: 8bit
--
--RTS/CTS needs to be enabled if the rate is a fallback rate *or* if it's
--a dual-stream rate and the sta is in dynamic SMPS mode.
--
--Fixes: a3ebb4e1b763 ("mac80211: minstrel_ht: handle peers in dynamic SMPS")
--Reported-by: MatÃÂas Richart <mrichart@fing.edu.uy>
--Signed-off-by: Felix Fietkau <nbd@openwrt.org>
-----
--
----- a/net/mac80211/rc80211_minstrel_ht.c
--+++ b/net/mac80211/rc80211_minstrel_ht.c
--@@ -872,7 +872,7 @@ minstrel_ht_set_rate(struct minstrel_pri
-- * - if station is in dynamic SMPS (and streams > 1)
-- * - for fallback rates, to increase chances of getting through
-- */
--- if (offset > 0 &&
--+ if (offset > 0 ||
-- (mi->sta->smps_mode == IEEE80211_SMPS_DYNAMIC &&
-- group->streams > 1)) {
-- ratetbl->rate[offset].count = ratetbl->rate[offset].count_rts;
-diff --git a/package/kernel/mac80211/patches/338-mac80211-Fix-Public-Action-frame-RX-in-AP-mode.patch b/package/kernel/mac80211/patches/338-mac80211-Fix-Public-Action-frame-RX-in-AP-mode.patch
-deleted file mode 100644
-index 56cd94aa152169fa4e98cd16dbf8a251dca4ca8a..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/338-mac80211-Fix-Public-Action-frame-RX-in-AP-mode.patch
-+++ /dev/null
-@@ -1,35 +0,0 @@
--From: Jouni Malinen <jouni@qca.qualcomm.com>
--Date: Tue, 1 Mar 2016 00:29:00 +0200
--Subject: [PATCH] mac80211: Fix Public Action frame RX in AP mode
--
--Public Action frames use special rules for how the BSSID field (Address
--3) is set. A wildcard BSSID is used in cases where the transmitter and
--recipient are not members of the same BSS. As such, we need to accept
--Public Action frames with wildcard BSSID.
--
--Commit db8e17324553 ("mac80211: ignore frames between TDLS peers when
--operating as AP") added a rule that drops Action frames to TDLS-peers
--based on an Action frame having different DA (Address 1) and BSSID
--(Address 3) values. This is not correct since it misses the possibility
--of BSSID being a wildcard BSSID in which case the Address 1 would not
--necessarily match.
--
--Fix this by allowing mac80211 to accept wildcard BSSID in an Action
--frame when in AP mode.
--
--Fixes: db8e17324553 ("mac80211: ignore frames between TDLS peers when operating as AP")
--Cc: stable@vger.kernel.org
--Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
--Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-----
--
----- a/net/mac80211/rx.c
--+++ b/net/mac80211/rx.c
--@@ -3374,6 +3374,7 @@ static bool ieee80211_accept_frame(struc
-- return false;
-- /* ignore action frames to TDLS-peers */
-- if (ieee80211_is_action(hdr->frame_control) &&
--+ !is_broadcast_ether_addr(bssid) &&
-- !ether_addr_equal(bssid, hdr->addr1))
-- return false;
-- }
-diff --git a/package/kernel/mac80211/patches/339-cfg80211-add-radiotap-VHT-info-to-rtap_namespace_siz.patch b/package/kernel/mac80211/patches/339-cfg80211-add-radiotap-VHT-info-to-rtap_namespace_siz.patch
-deleted file mode 100644
-index 15d6cd03eae1c5b2380cb718238762cbf5f5a5b6..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/339-cfg80211-add-radiotap-VHT-info-to-rtap_namespace_siz.patch
-+++ /dev/null
-@@ -1,21 +0,0 @@
--From: Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>
--Date: Fri, 19 Feb 2016 11:43:04 +0100
--Subject: [PATCH] cfg80211: add radiotap VHT info to rtap_namespace_sizes
--
--Add IEEE80211_RADIOTAP_VHT entry to rtap_namespace_sizes array in order to
--define alignment and size of VHT info in tx radiotap
--
--Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>
--Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-----
--
----- a/net/wireless/radiotap.c
--+++ b/net/wireless/radiotap.c
--@@ -43,6 +43,7 @@ static const struct radiotap_align_size
-- [IEEE80211_RADIOTAP_DATA_RETRIES] = { .align = 1, .size = 1, },
-- [IEEE80211_RADIOTAP_MCS] = { .align = 1, .size = 3, },
-- [IEEE80211_RADIOTAP_AMPDU_STATUS] = { .align = 4, .size = 8, },
--+ [IEEE80211_RADIOTAP_VHT] = { .align = 2, .size = 12, },
-- /*
-- * add more here as they are defined in radiotap.h
-- */
-diff --git a/package/kernel/mac80211/patches/340-mac80211-fix-parsing-of-40Mhz-in-injected-radiotap-h.patch b/package/kernel/mac80211/patches/340-mac80211-fix-parsing-of-40Mhz-in-injected-radiotap-h.patch
-deleted file mode 100644
-index de1b38625c3845be51df0f34c2b82290651ca4be..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/340-mac80211-fix-parsing-of-40Mhz-in-injected-radiotap-h.patch
-+++ /dev/null
-@@ -1,36 +0,0 @@
--From: Sven Eckelmann <sven@narfation.org>
--Date: Wed, 24 Feb 2016 16:25:49 +0100
--Subject: [PATCH] mac80211: fix parsing of 40Mhz in injected radiotap
-- header
--
--The MCS bandwidth part of the radiotap header is 2 bits wide. The full 2
--bit have to compared against IEEE80211_RADIOTAP_MCS_BW_40 and not only if
--the first bit is set. Otherwise IEEE80211_RADIOTAP_MCS_BW_40 can be
--confused with IEEE80211_RADIOTAP_MCS_BW_20U.
--
--Fixes: 5ec3aed9ba4c ("mac80211: Parse legacy and HT rate in injected frames")
--Signed-off-by: Sven Eckelmann <sven@narfation.org>
-----
--
----- a/net/mac80211/tx.c
--+++ b/net/mac80211/tx.c
--@@ -1689,7 +1689,7 @@ static bool ieee80211_parse_tx_radiotap(
-- bool rate_found = false;
-- u8 rate_retries = 0;
-- u16 rate_flags = 0;
--- u8 mcs_known, mcs_flags;
--+ u8 mcs_known, mcs_flags, mcs_bw;
-- int i;
--
-- info->flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT |
--@@ -1765,8 +1765,9 @@ static bool ieee80211_parse_tx_radiotap(
-- mcs_flags & IEEE80211_RADIOTAP_MCS_SGI)
-- rate_flags |= IEEE80211_TX_RC_SHORT_GI;
--
--+ mcs_bw = mcs_flags & IEEE80211_RADIOTAP_MCS_BW_MASK;
-- if (mcs_known & IEEE80211_RADIOTAP_MCS_HAVE_BW &&
--- mcs_flags & IEEE80211_RADIOTAP_MCS_BW_40)
--+ mcs_bw == IEEE80211_RADIOTAP_MCS_BW_40)
-- rate_flags |= IEEE80211_TX_RC_40_MHZ_WIDTH;
-- break;
--
-diff --git a/package/kernel/mac80211/patches/341-mac80211-parse-VHT-info-in-injected-frames.patch b/package/kernel/mac80211/patches/341-mac80211-parse-VHT-info-in-injected-frames.patch
-deleted file mode 100644
-index ac1f2517f29973c74cdd32301b32d1be93fcefb1..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/341-mac80211-parse-VHT-info-in-injected-frames.patch
-+++ /dev/null
-@@ -1,65 +0,0 @@
--From: Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>
--Date: Tue, 23 Feb 2016 15:43:35 +0100
--Subject: [PATCH] mac80211: parse VHT info in injected frames
--
--Add VHT radiotap parsing support to ieee80211_parse_tx_radiotap().
--That capability has been tested using a d-link dir-860l rev b1 running
--OpenWrt trunk and mt76 driver
--
--Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>
-----
--
----- a/net/mac80211/tx.c
--+++ b/net/mac80211/tx.c
--@@ -1690,6 +1690,8 @@ static bool ieee80211_parse_tx_radiotap(
-- u8 rate_retries = 0;
-- u16 rate_flags = 0;
-- u8 mcs_known, mcs_flags, mcs_bw;
--+ u16 vht_known;
--+ u8 vht_mcs = 0, vht_nss = 0;
-- int i;
--
-- info->flags |= IEEE80211_TX_INTFL_DONT_ENCRYPT |
--@@ -1771,6 +1773,32 @@ static bool ieee80211_parse_tx_radiotap(
-- rate_flags |= IEEE80211_TX_RC_40_MHZ_WIDTH;
-- break;
--
--+ case IEEE80211_RADIOTAP_VHT:
--+ vht_known = get_unaligned_le16(iterator.this_arg);
--+ rate_found = true;
--+
--+ rate_flags = IEEE80211_TX_RC_VHT_MCS;
--+ if ((vht_known & IEEE80211_RADIOTAP_VHT_KNOWN_GI) &&
--+ (iterator.this_arg[2] &
--+ IEEE80211_RADIOTAP_VHT_FLAG_SGI))
--+ rate_flags |= IEEE80211_TX_RC_SHORT_GI;
--+ if (vht_known &
--+ IEEE80211_RADIOTAP_VHT_KNOWN_BANDWIDTH) {
--+ if (iterator.this_arg[3] == 1)
--+ rate_flags |=
--+ IEEE80211_TX_RC_40_MHZ_WIDTH;
--+ else if (iterator.this_arg[3] == 4)
--+ rate_flags |=
--+ IEEE80211_TX_RC_80_MHZ_WIDTH;
--+ else if (iterator.this_arg[3] == 11)
--+ rate_flags |=
--+ IEEE80211_TX_RC_160_MHZ_WIDTH;
--+ }
--+
--+ vht_mcs = iterator.this_arg[4] >> 4;
--+ vht_nss = iterator.this_arg[4] & 0xF;
--+ break;
--+
-- /*
-- * Please update the file
-- * Documentation/networking/mac80211-injection.txt
--@@ -1796,6 +1824,9 @@ static bool ieee80211_parse_tx_radiotap(
--
-- if (rate_flags & IEEE80211_TX_RC_MCS) {
-- info->control.rates[0].idx = rate;
--+ } else if (rate_flags & IEEE80211_TX_RC_VHT_MCS) {
--+ ieee80211_rate_set_vht(info->control.rates, vht_mcs,
--+ vht_nss);
-- } else {
-- for (i = 0; i < sband->n_bitrates; i++) {
-- if (rate * 5 != sband->bitrates[i].bitrate)
-diff --git a/package/kernel/mac80211/patches/342-mac80211-do-not-pass-injected-frames-without-a-valid.patch b/package/kernel/mac80211/patches/342-mac80211-do-not-pass-injected-frames-without-a-valid.patch
-deleted file mode 100644
-index d7452c29c1fad9ee170199c33b260161b603032a..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/342-mac80211-do-not-pass-injected-frames-without-a-valid.patch
-+++ /dev/null
-@@ -1,23 +0,0 @@
--From: Felix Fietkau <nbd@openwrt.org>
--Date: Wed, 2 Mar 2016 15:51:40 +0100
--Subject: [PATCH] mac80211: do not pass injected frames without a valid rate to
-- the driver
--
--Fall back to rate control if the requested bitrate was not found.
--
--Fixes: dfdfc2beb0dd ("mac80211: Parse legacy and HT rate in injected frames")
--Signed-off-by: Felix Fietkau <nbd@openwrt.org>
-----
--
----- a/net/mac80211/tx.c
--+++ b/net/mac80211/tx.c
--@@ -1837,6 +1837,9 @@ static bool ieee80211_parse_tx_radiotap(
-- }
-- }
--
--+ if (info->control.rates[0].idx < 0)
--+ info->control.flags &= ~IEEE80211_TX_CTRL_RATE_INJECT;
--+
-- info->control.rates[0].flags = rate_flags;
-- info->control.rates[0].count = min_t(u8, rate_retries + 1,
-- local->hw.max_rate_tries);
-diff --git a/package/kernel/mac80211/patches/343-mac80211-minstrel_ht-improve-sample-rate-skip-logic.patch b/package/kernel/mac80211/patches/343-mac80211-minstrel_ht-improve-sample-rate-skip-logic.patch
-deleted file mode 100644
-index 55ff817009294fde4c61548f95a49ca506d15b4d..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/343-mac80211-minstrel_ht-improve-sample-rate-skip-logic.patch
-+++ /dev/null
-@@ -1,77 +0,0 @@
--From: Felix Fietkau <nbd@openwrt.org>
--Date: Thu, 3 Mar 2016 23:20:06 +0100
--Subject: [PATCH] mac80211: minstrel_ht: improve sample rate skip logic
--
--There were a few issues that were slowing down the process of finding
--the optimal rate, especially on devices with multi-rate retry
--limitations:
--
--When max_tp_rate[0] was slower than max_tp_rate[1], the code did not
--sample max_tp_rate[1], which would often allow it to switch places with
--max_tp_rate[0] (e.g. if only the first sampling attempts were bad, but the
--rate is otherwise good).
--
--Also, sample attempts of rates between max_tp_rate[0] and [1] were being
--ignored in this case, because the code only checked if the rate was
--slower than [1].
--
--Fix this by checking against the fastest / second fastest max_tp_rate
--instead of assuming a specific order between the two.
--
--In my tests this patch significantly reduces the time until minstrel_ht
--finds the optimal rate right after assoc
--
--Signed-off-by: Felix Fietkau <nbd@openwrt.org>
-----
--
----- a/net/mac80211/rc80211_minstrel_ht.c
--+++ b/net/mac80211/rc80211_minstrel_ht.c
--@@ -958,6 +958,7 @@ minstrel_get_sample_rate(struct minstrel
-- struct minstrel_rate_stats *mrs;
-- struct minstrel_mcs_group_data *mg;
-- unsigned int sample_dur, sample_group, cur_max_tp_streams;
--+ int tp_rate1, tp_rate2;
-- int sample_idx = 0;
--
-- if (mi->sample_wait > 0) {
--@@ -979,14 +980,22 @@ minstrel_get_sample_rate(struct minstrel
-- mrs = &mg->rates[sample_idx];
-- sample_idx += sample_group * MCS_GROUP_RATES;
--
--+ /* Set tp_rate1, tp_rate2 to the highest / second highest max_tp_rate */
--+ if (minstrel_get_duration(mi->max_tp_rate[0]) >
--+ minstrel_get_duration(mi->max_tp_rate[1])) {
--+ tp_rate1 = mi->max_tp_rate[1];
--+ tp_rate2 = mi->max_tp_rate[0];
--+ } else {
--+ tp_rate1 = mi->max_tp_rate[0];
--+ tp_rate2 = mi->max_tp_rate[1];
--+ }
--+
-- /*
-- * Sampling might add some overhead (RTS, no aggregation)
--- * to the frame. Hence, don't use sampling for the currently
--- * used rates.
--+ * to the frame. Hence, don't use sampling for the highest currently
--+ * used highest throughput or probability rate.
-- */
--- if (sample_idx == mi->max_tp_rate[0] ||
--- sample_idx == mi->max_tp_rate[1] ||
--- sample_idx == mi->max_prob_rate)
--+ if (sample_idx == mi->max_tp_rate[0] || sample_idx == mi->max_prob_rate)
-- return -1;
--
-- /*
--@@ -1001,10 +1010,10 @@ minstrel_get_sample_rate(struct minstrel
-- * if the link is working perfectly.
-- */
--
--- cur_max_tp_streams = minstrel_mcs_groups[mi->max_tp_rate[0] /
--+ cur_max_tp_streams = minstrel_mcs_groups[tp_rate1 /
-- MCS_GROUP_RATES].streams;
-- sample_dur = minstrel_get_duration(sample_idx);
--- if (sample_dur >= minstrel_get_duration(mi->max_tp_rate[1]) &&
--+ if (sample_dur >= minstrel_get_duration(tp_rate2) &&
-- (cur_max_tp_streams - 1 <
-- minstrel_mcs_groups[sample_group].streams ||
-- sample_dur >= minstrel_get_duration(mi->max_prob_rate))) {
-diff --git a/package/kernel/mac80211/patches/344-0001-brcmfmac-change-function-name-for-brcmf_cfg80211_wai.patch b/package/kernel/mac80211/patches/344-0001-brcmfmac-change-function-name-for-brcmf_cfg80211_wai.patch
-deleted file mode 100644
-index e3427de732787befec7f0f738efb3cc85a00aa0d..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/344-0001-brcmfmac-change-function-name-for-brcmf_cfg80211_wai.patch
-+++ /dev/null
-@@ -1,99 +0,0 @@
--From: Arend van Spriel <arend@broadcom.com>
--Date: Wed, 17 Feb 2016 11:26:50 +0100
--Subject: [PATCH] brcmfmac: change function name for
-- brcmf_cfg80211_wait_vif_event_timeout()
--
--Dropping the '_timeout' from the function name as the fact that a timeout
--value is passed makes it obvious a timeout is used. Also helps to keep code
--lines a bit shorter and easier to stick to 80 char boundary.
--
--Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
--Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
--Signed-off-by: Arend van Spriel <arend@broadcom.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--@@ -564,8 +564,8 @@ struct wireless_dev *brcmf_ap_add_vif(st
-- }
--
-- /* wait for firmware event */
--- err = brcmf_cfg80211_wait_vif_event_timeout(cfg, BRCMF_E_IF_ADD,
--- BRCMF_VIF_EVENT_TIMEOUT);
--+ err = brcmf_cfg80211_wait_vif_event(cfg, BRCMF_E_IF_ADD,
--+ BRCMF_VIF_EVENT_TIMEOUT);
-- brcmf_cfg80211_arm_vif_event(cfg, NULL);
-- if (!err) {
-- brcmf_err("timeout occurred\n");
--@@ -6395,8 +6395,9 @@ bool brcmf_cfg80211_vif_event_armed(stru
--
-- return armed;
-- }
---int brcmf_cfg80211_wait_vif_event_timeout(struct brcmf_cfg80211_info *cfg,
--- u8 action, ulong timeout)
--+
--+int brcmf_cfg80211_wait_vif_event(struct brcmf_cfg80211_info *cfg,
--+ u8 action, ulong timeout)
-- {
-- struct brcmf_cfg80211_vif_event *event = &cfg->vif_event;
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h
--@@ -402,8 +402,8 @@ bool brcmf_get_vif_state_any(struct brcm
-- void brcmf_cfg80211_arm_vif_event(struct brcmf_cfg80211_info *cfg,
-- struct brcmf_cfg80211_vif *vif);
-- bool brcmf_cfg80211_vif_event_armed(struct brcmf_cfg80211_info *cfg);
---int brcmf_cfg80211_wait_vif_event_timeout(struct brcmf_cfg80211_info *cfg,
--- u8 action, ulong timeout);
--+int brcmf_cfg80211_wait_vif_event(struct brcmf_cfg80211_info *cfg,
--+ u8 action, ulong timeout);
-- s32 brcmf_notify_escan_complete(struct brcmf_cfg80211_info *cfg,
-- struct brcmf_if *ifp, bool aborted,
-- bool fw_abort);
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
--@@ -1988,8 +1988,8 @@ int brcmf_p2p_ifchange(struct brcmf_cfg8
-- brcmf_cfg80211_arm_vif_event(cfg, NULL);
-- return err;
-- }
--- err = brcmf_cfg80211_wait_vif_event_timeout(cfg, BRCMF_E_IF_CHANGE,
--- BRCMF_VIF_EVENT_TIMEOUT);
--+ err = brcmf_cfg80211_wait_vif_event(cfg, BRCMF_E_IF_CHANGE,
--+ BRCMF_VIF_EVENT_TIMEOUT);
-- brcmf_cfg80211_arm_vif_event(cfg, NULL);
-- if (!err) {
-- brcmf_err("No BRCMF_E_IF_CHANGE event received\n");
--@@ -2090,8 +2090,8 @@ static struct wireless_dev *brcmf_p2p_cr
-- }
--
-- /* wait for firmware event */
--- err = brcmf_cfg80211_wait_vif_event_timeout(p2p->cfg, BRCMF_E_IF_ADD,
--- BRCMF_VIF_EVENT_TIMEOUT);
--+ err = brcmf_cfg80211_wait_vif_event(p2p->cfg, BRCMF_E_IF_ADD,
--+ BRCMF_VIF_EVENT_TIMEOUT);
-- brcmf_cfg80211_arm_vif_event(p2p->cfg, NULL);
-- brcmf_fweh_p2pdev_setup(pri_ifp, false);
-- if (!err) {
--@@ -2180,8 +2180,8 @@ struct wireless_dev *brcmf_p2p_add_vif(s
-- }
--
-- /* wait for firmware event */
--- err = brcmf_cfg80211_wait_vif_event_timeout(cfg, BRCMF_E_IF_ADD,
--- BRCMF_VIF_EVENT_TIMEOUT);
--+ err = brcmf_cfg80211_wait_vif_event(cfg, BRCMF_E_IF_ADD,
--+ BRCMF_VIF_EVENT_TIMEOUT);
-- brcmf_cfg80211_arm_vif_event(cfg, NULL);
-- if (!err) {
-- brcmf_err("timeout occurred\n");
--@@ -2274,8 +2274,8 @@ int brcmf_p2p_del_vif(struct wiphy *wiph
-- }
-- if (!err) {
-- /* wait for firmware event */
--- err = brcmf_cfg80211_wait_vif_event_timeout(cfg, BRCMF_E_IF_DEL,
--- BRCMF_VIF_EVENT_TIMEOUT);
--+ err = brcmf_cfg80211_wait_vif_event(cfg, BRCMF_E_IF_DEL,
--+ BRCMF_VIF_EVENT_TIMEOUT);
-- if (!err)
-- err = -EIO;
-- else
-diff --git a/package/kernel/mac80211/patches/344-0002-brcmfmac-Limit-memory-allocs-to-64K.patch b/package/kernel/mac80211/patches/344-0002-brcmfmac-Limit-memory-allocs-to-64K.patch
-deleted file mode 100644
-index 9c336f774fd79a2306dae746d3622db22eee76eb..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/344-0002-brcmfmac-Limit-memory-allocs-to-64K.patch
-+++ /dev/null
-@@ -1,127 +0,0 @@
--From: Hante Meuleman <meuleman@broadcom.com>
--Date: Wed, 17 Feb 2016 11:26:51 +0100
--Subject: [PATCH] brcmfmac: Limit memory allocs to <64K
--
--Some systems have problems with allocating memory allocation larger
--then 64K. Often on unload/load or suspend/resume a failure is
--reported: Could not allocate wiphy device. This patch makes the
--escan intermediate storage buf dynamically allocated, and smaller
--than 64K.
--
--Reviewed-by: Arend Van Spriel <arend@broadcom.com>
--Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
--Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
--Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
--Signed-off-by: Arend van Spriel <arend@broadcom.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--@@ -1125,7 +1125,7 @@ brcmf_cfg80211_escan(struct wiphy *wiphy
--
-- /* Arm scan timeout timer */
-- mod_timer(&cfg->escan_timeout, jiffies +
--- WL_ESCAN_TIMER_INTERVAL_MS * HZ / 1000);
--+ BRCMF_ESCAN_TIMER_INTERVAL_MS * HZ / 1000);
--
-- return 0;
--
--@@ -3020,7 +3020,7 @@ brcmf_cfg80211_escan_handler(struct brcm
--
-- list = (struct brcmf_scan_results *)
-- cfg->escan_info.escan_buf;
--- if (bi_length > WL_ESCAN_BUF_SIZE - list->buflen) {
--+ if (bi_length > BRCMF_ESCAN_BUF_SIZE - list->buflen) {
-- brcmf_err("Buffer is too small: ignoring\n");
-- goto exit;
-- }
--@@ -3033,8 +3033,8 @@ brcmf_cfg80211_escan_handler(struct brcm
-- bss_info_le))
-- goto exit;
-- }
--- memcpy(&(cfg->escan_info.escan_buf[list->buflen]),
--- bss_info_le, bi_length);
--+ memcpy(&cfg->escan_info.escan_buf[list->buflen], bss_info_le,
--+ bi_length);
-- list->version = le32_to_cpu(bss_info_le->version);
-- list->buflen += bi_length;
-- list->count++;
--@@ -5402,14 +5402,14 @@ static void brcmf_deinit_priv_mem(struct
-- {
-- kfree(cfg->conf);
-- cfg->conf = NULL;
--- kfree(cfg->escan_ioctl_buf);
--- cfg->escan_ioctl_buf = NULL;
-- kfree(cfg->extra_buf);
-- cfg->extra_buf = NULL;
-- kfree(cfg->wowl.nd);
-- cfg->wowl.nd = NULL;
-- kfree(cfg->wowl.nd_info);
-- cfg->wowl.nd_info = NULL;
--+ kfree(cfg->escan_info.escan_buf);
--+ cfg->escan_info.escan_buf = NULL;
-- }
--
-- static s32 brcmf_init_priv_mem(struct brcmf_cfg80211_info *cfg)
--@@ -5417,9 +5417,6 @@ static s32 brcmf_init_priv_mem(struct br
-- cfg->conf = kzalloc(sizeof(*cfg->conf), GFP_KERNEL);
-- if (!cfg->conf)
-- goto init_priv_mem_out;
--- cfg->escan_ioctl_buf = kzalloc(BRCMF_DCMD_MEDLEN, GFP_KERNEL);
--- if (!cfg->escan_ioctl_buf)
--- goto init_priv_mem_out;
-- cfg->extra_buf = kzalloc(WL_EXTRA_BUF_MAX, GFP_KERNEL);
-- if (!cfg->extra_buf)
-- goto init_priv_mem_out;
--@@ -5431,6 +5428,9 @@ static s32 brcmf_init_priv_mem(struct br
-- GFP_KERNEL);
-- if (!cfg->wowl.nd_info)
-- goto init_priv_mem_out;
--+ cfg->escan_info.escan_buf = kzalloc(BRCMF_ESCAN_BUF_SIZE, GFP_KERNEL);
--+ if (!cfg->escan_info.escan_buf)
--+ goto init_priv_mem_out;
--
-- return 0;
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h
--@@ -28,8 +28,11 @@
-- #define WL_ROAM_TRIGGER_LEVEL -75
-- #define WL_ROAM_DELTA 20
--
---#define WL_ESCAN_BUF_SIZE (1024 * 64)
---#define WL_ESCAN_TIMER_INTERVAL_MS 10000 /* E-Scan timeout */
--+/* Keep BRCMF_ESCAN_BUF_SIZE below 64K (65536). Allocing over 64K can be
--+ * problematic on some systems and should be avoided.
--+ */
--+#define BRCMF_ESCAN_BUF_SIZE 65000
--+#define BRCMF_ESCAN_TIMER_INTERVAL_MS 10000 /* E-Scan timeout */
--
-- #define WL_ESCAN_ACTION_START 1
-- #define WL_ESCAN_ACTION_CONTINUE 2
--@@ -205,7 +208,7 @@ enum wl_escan_state {
--
-- struct escan_info {
-- u32 escan_state;
--- u8 escan_buf[WL_ESCAN_BUF_SIZE];
--+ u8 *escan_buf;
-- struct wiphy *wiphy;
-- struct brcmf_if *ifp;
-- s32 (*run)(struct brcmf_cfg80211_info *cfg, struct brcmf_if *ifp,
--@@ -278,7 +281,6 @@ struct brcmf_cfg80211_wowl {
-- * @escan_info: escan information.
-- * @escan_timeout: Timer for catch scan timeout.
-- * @escan_timeout_work: scan timeout worker.
--- * @escan_ioctl_buf: dongle command buffer for escan commands.
-- * @vif_list: linked list of vif instances.
-- * @vif_cnt: number of vif instances.
-- * @vif_event: vif event signalling.
--@@ -309,7 +311,6 @@ struct brcmf_cfg80211_info {
-- struct escan_info escan_info;
-- struct timer_list escan_timeout;
-- struct work_struct escan_timeout_work;
--- u8 *escan_ioctl_buf;
-- struct list_head vif_list;
-- struct brcmf_cfg80211_vif_event vif_event;
-- struct completion vif_disabled;
-diff --git a/package/kernel/mac80211/patches/344-0003-brcmfmac-check-for-wowl-support-before-enumerating-f.patch b/package/kernel/mac80211/patches/344-0003-brcmfmac-check-for-wowl-support-before-enumerating-f.patch
-deleted file mode 100644
-index ee3d9f37a851cb1d31a53e341614bd7166c2e581..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/344-0003-brcmfmac-check-for-wowl-support-before-enumerating-f.patch
-+++ /dev/null
-@@ -1,29 +0,0 @@
--From: Franky Lin <frankyl@broadcom.com>
--Date: Wed, 17 Feb 2016 11:26:52 +0100
--Subject: [PATCH] brcmfmac: check for wowl support before enumerating feature
-- flag
--
--In some cases wiphy->wowlan could be NULL if firmware doesn't have the
--support. Driver should check for support before walking down the feature
--flags.
--
--Reviewed-by: Arend Van Spriel <arend@broadcom.com>
--Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
--Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
--Signed-off-by: Franky Lin <frankyl@broadcom.com>
--Signed-off-by: Arend van Spriel <arend@broadcom.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--@@ -6594,7 +6594,8 @@ struct brcmf_cfg80211_info *brcmf_cfg802
-- if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_SCAN_RANDOM_MAC)) {
-- wiphy->features |= NL80211_FEATURE_SCHED_SCAN_RANDOM_MAC_ADDR;
-- #ifdef CONFIG_PM
--- if (wiphy->wowlan->flags & WIPHY_WOWLAN_NET_DETECT)
--+ if (wiphy->wowlan &&
--+ wiphy->wowlan->flags & WIPHY_WOWLAN_NET_DETECT)
-- wiphy->features |= NL80211_FEATURE_ND_RANDOM_MAC_ADDR;
-- #endif
-- }
-diff --git a/package/kernel/mac80211/patches/344-0004-brcmfmac-Configure-country-code-using-device-specifi.patch b/package/kernel/mac80211/patches/344-0004-brcmfmac-Configure-country-code-using-device-specifi.patch
-deleted file mode 100644
-index c52cac87b979e6da07d24f2e7e119261dceea2ce..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/344-0004-brcmfmac-Configure-country-code-using-device-specifi.patch
-+++ /dev/null
-@@ -1,214 +0,0 @@
--From: Hante Meuleman <meuleman@broadcom.com>
--Date: Wed, 17 Feb 2016 11:26:53 +0100
--Subject: [PATCH] brcmfmac: Configure country code using device specific
-- settings
--
--Country code configuration in a device is a device specific
--operation. For this the country code as specified by reg notifier
--(iso3166 alpha2) needs to be translated to a device specific
--country locale and revision number. This patch adds this
--translation and puts a placeholder in the device specific settings
--where the translation table can be stored. Additional patches will
--be needed to read these tables from for example device platform
--data.
--
--Reviewed-by: Arend Van Spriel <arend@broadcom.com>
--Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
--Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
--Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
--Signed-off-by: Arend van Spriel <arend@broadcom.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--@@ -6405,28 +6405,85 @@ int brcmf_cfg80211_wait_vif_event(struct
-- vif_event_equals(event, action), timeout);
-- }
--
--+static s32 brcmf_translate_country_code(struct brcmf_pub *drvr, char alpha2[2],
--+ struct brcmf_fil_country_le *ccreq)
--+{
--+ struct cc_translate *country_codes;
--+ struct cc_entry *cc;
--+ s32 found_index;
--+ int i;
--+
--+ country_codes = drvr->settings->country_codes;
--+ if (!country_codes) {
--+ brcmf_dbg(TRACE, "No country codes configured for device\n");
--+ return -EINVAL;
--+ }
--+
--+ if ((alpha2[0] == ccreq->country_abbrev[0]) &&
--+ (alpha2[1] == ccreq->country_abbrev[1])) {
--+ brcmf_dbg(TRACE, "Country code already set\n");
--+ return -EAGAIN;
--+ }
--+
--+ found_index = -1;
--+ for (i = 0; i < country_codes->table_size; i++) {
--+ cc = &country_codes->table[i];
--+ if ((cc->iso3166[0] == '\0') && (found_index == -1))
--+ found_index = i;
--+ if ((cc->iso3166[0] == alpha2[0]) &&
--+ (cc->iso3166[1] == alpha2[1])) {
--+ found_index = i;
--+ break;
--+ }
--+ }
--+ if (found_index == -1) {
--+ brcmf_dbg(TRACE, "No country code match found\n");
--+ return -EINVAL;
--+ }
--+ memset(ccreq, 0, sizeof(*ccreq));
--+ ccreq->rev = cpu_to_le32(country_codes->table[found_index].rev);
--+ memcpy(ccreq->ccode, country_codes->table[found_index].cc,
--+ BRCMF_COUNTRY_BUF_SZ);
--+ ccreq->country_abbrev[0] = alpha2[0];
--+ ccreq->country_abbrev[1] = alpha2[1];
--+ ccreq->country_abbrev[2] = 0;
--+
--+ return 0;
--+}
--+
-- static void brcmf_cfg80211_reg_notifier(struct wiphy *wiphy,
-- struct regulatory_request *req)
-- {
-- struct brcmf_cfg80211_info *cfg = wiphy_priv(wiphy);
-- struct brcmf_if *ifp = netdev_priv(cfg_to_ndev(cfg));
-- struct brcmf_fil_country_le ccreq;
--+ s32 err;
-- int i;
--
--- brcmf_dbg(TRACE, "enter: initiator=%d, alpha=%c%c\n", req->initiator,
--- req->alpha2[0], req->alpha2[1]);
---
-- /* ignore non-ISO3166 country codes */
-- for (i = 0; i < sizeof(req->alpha2); i++)
-- if (req->alpha2[i] < 'A' || req->alpha2[i] > 'Z') {
--- brcmf_err("not a ISO3166 code\n");
--+ brcmf_err("not a ISO3166 code (0x%02x 0x%02x)\n",
--+ req->alpha2[0], req->alpha2[1]);
-- return;
-- }
--- memset(&ccreq, 0, sizeof(ccreq));
--- ccreq.rev = cpu_to_le32(-1);
--- memcpy(ccreq.ccode, req->alpha2, sizeof(req->alpha2));
--- if (brcmf_fil_iovar_data_set(ifp, "country", &ccreq, sizeof(ccreq))) {
--- brcmf_err("firmware rejected country setting\n");
--+
--+ brcmf_dbg(TRACE, "Enter: initiator=%d, alpha=%c%c\n", req->initiator,
--+ req->alpha2[0], req->alpha2[1]);
--+
--+ err = brcmf_fil_iovar_data_get(ifp, "country", &ccreq, sizeof(ccreq));
--+ if (err) {
--+ brcmf_err("Country code iovar returned err = %d\n", err);
--+ return;
--+ }
--+
--+ err = brcmf_translate_country_code(ifp->drvr, req->alpha2, &ccreq);
--+ if (err)
--+ return;
--+
--+ err = brcmf_fil_iovar_data_set(ifp, "country", &ccreq, sizeof(ccreq));
--+ if (err) {
--+ brcmf_err("Firmware rejected country setting\n");
-- return;
-- }
-- brcmf_setup_wiphybands(wiphy);
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
--@@ -230,10 +230,8 @@ void brcmf_mp_attach(void)
-- int brcmf_mp_device_attach(struct brcmf_pub *drvr)
-- {
-- drvr->settings = kzalloc(sizeof(*drvr->settings), GFP_ATOMIC);
--- if (!drvr->settings) {
--- brcmf_err("Failed to alloca storage space for settings\n");
--+ if (!drvr->settings)
-- return -ENOMEM;
--- }
--
-- drvr->settings->sdiod_txglomsz = brcmf_sdiod_txglomsz;
-- drvr->settings->p2p_enable = !!brcmf_p2p_enable;
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.h
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.h
--@@ -15,6 +15,8 @@
-- #ifndef BRCMFMAC_COMMON_H
-- #define BRCMFMAC_COMMON_H
--
--+#include "fwil_types.h"
--+
-- extern const u8 ALLFFMAC[ETH_ALEN];
--
-- #define BRCMF_FW_ALTPATH_LEN 256
--@@ -39,6 +41,33 @@ struct brcmf_mp_global_t {
-- extern struct brcmf_mp_global_t brcmf_mp_global;
--
-- /**
--+ * struct cc_entry - Struct for translating user space country code (iso3166) to
--+ * firmware country code and revision.
--+ *
--+ * @iso3166: iso3166 alpha 2 country code string.
--+ * @cc: firmware country code string.
--+ * @rev: firmware country code revision.
--+ */
--+struct cc_entry {
--+ char iso3166[BRCMF_COUNTRY_BUF_SZ];
--+ char cc[BRCMF_COUNTRY_BUF_SZ];
--+ s32 rev;
--+};
--+
--+/**
--+ * struct cc_translate - Struct for translating country codes as set by user
--+ * space to a country code and rev which can be used by
--+ * firmware.
--+ *
--+ * @table_size: number of entries in table (> 0)
--+ * @table: dynamic array of 1 or more elements with translation information.
--+ */
--+struct cc_translate {
--+ int table_size;
--+ struct cc_entry table[0];
--+};
--+
--+/**
-- * struct brcmf_mp_device - Device module paramaters.
-- *
-- * @sdiod_txglomsz: SDIO txglom size.
--@@ -47,6 +76,7 @@ extern struct brcmf_mp_global_t brcmf_mp
-- * @feature_disable: Feature_disable bitmask.
-- * @fcmode: FWS flow control.
-- * @roamoff: Firmware roaming off?
--+ * @country_codes: If available, pointer to struct for translating country codes
-- */
-- struct brcmf_mp_device {
-- int sdiod_txglomsz;
--@@ -56,6 +86,7 @@ struct brcmf_mp_device {
-- int fcmode;
-- bool roamoff;
-- bool ignore_probe_fail;
--+ struct cc_translate *country_codes;
-- };
--
-- void brcmf_mp_attach(void);
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h
--@@ -134,6 +134,8 @@
-- #define BRCMF_PFN_MAC_OUI_ONLY BIT(0)
-- #define BRCMF_PFN_SET_MAC_UNASSOC BIT(1)
--
--+#define BRCMF_MCSSET_LEN 16
--+
-- /* join preference types for join_pref iovar */
-- enum brcmf_join_pref_types {
-- BRCMF_JOIN_PREF_RSSI = 1,
--@@ -279,7 +281,7 @@ struct brcmf_bss_info_le {
-- __le32 reserved32[1]; /* Reserved for expansion of BSS properties */
-- u8 flags; /* flags */
-- u8 reserved[3]; /* Reserved for expansion of BSS properties */
--- u8 basic_mcs[MCSSET_LEN]; /* 802.11N BSS required MCS set */
--+ u8 basic_mcs[BRCMF_MCSSET_LEN]; /* 802.11N BSS required MCS set */
--
-- __le16 ie_offset; /* offset at which IEs start, from beginning */
-- __le32 ie_length; /* byte length of Information Elements */
-diff --git a/package/kernel/mac80211/patches/344-0005-brcmfmac-Add-length-checks-on-firmware-events.patch b/package/kernel/mac80211/patches/344-0005-brcmfmac-Add-length-checks-on-firmware-events.patch
-deleted file mode 100644
-index 3e2e3503b629dbdd6abba44a9c9b24e4a5aea792..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/344-0005-brcmfmac-Add-length-checks-on-firmware-events.patch
-+++ /dev/null
-@@ -1,283 +0,0 @@
--From: Hante Meuleman <meuleman@broadcom.com>
--Date: Wed, 17 Feb 2016 11:26:54 +0100
--Subject: [PATCH] brcmfmac: Add length checks on firmware events
--
--Add additional length checks on firmware events to create more
--robust code.
--
--Reviewed-by: Arend Van Spriel <arend@broadcom.com>
--Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
--Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
--Reviewed-by: Lei Zhang <leizh@broadcom.com>
--Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
--Signed-off-by: Arend van Spriel <arend@broadcom.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--@@ -3092,6 +3092,11 @@ brcmf_notify_sched_scan_results(struct b
--
-- brcmf_dbg(SCAN, "Enter\n");
--
--+ if (e->datalen < (sizeof(*pfn_result) + sizeof(*netinfo))) {
--+ brcmf_dbg(SCAN, "Event data to small. Ignore\n");
--+ return 0;
--+ }
--+
-- if (e->event_code == BRCMF_E_PFN_NET_LOST) {
-- brcmf_dbg(SCAN, "PFN NET LOST event. Do Nothing\n");
-- return 0;
--@@ -3415,6 +3420,11 @@ brcmf_wowl_nd_results(struct brcmf_if *i
--
-- brcmf_dbg(SCAN, "Enter\n");
--
--+ if (e->datalen < (sizeof(*pfn_result) + sizeof(*netinfo))) {
--+ brcmf_dbg(SCAN, "Event data to small. Ignore\n");
--+ return 0;
--+ }
--+
-- pfn_result = (struct brcmf_pno_scanresults_le *)data;
--
-- if (e->event_code == BRCMF_E_PFN_NET_LOST) {
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c
--@@ -26,50 +26,6 @@
-- #include "fwil.h"
--
-- /**
--- * struct brcm_ethhdr - broadcom specific ether header.
--- *
--- * @subtype: subtype for this packet.
--- * @length: TODO: length of appended data.
--- * @version: version indication.
--- * @oui: OUI of this packet.
--- * @usr_subtype: subtype for this OUI.
--- */
---struct brcm_ethhdr {
--- __be16 subtype;
--- __be16 length;
--- u8 version;
--- u8 oui[3];
--- __be16 usr_subtype;
---} __packed;
---
---struct brcmf_event_msg_be {
--- __be16 version;
--- __be16 flags;
--- __be32 event_type;
--- __be32 status;
--- __be32 reason;
--- __be32 auth_type;
--- __be32 datalen;
--- u8 addr[ETH_ALEN];
--- char ifname[IFNAMSIZ];
--- u8 ifidx;
--- u8 bsscfgidx;
---} __packed;
---
---/**
--- * struct brcmf_event - contents of broadcom event packet.
--- *
--- * @eth: standard ether header.
--- * @hdr: broadcom specific ether header.
--- * @msg: common part of the actual event message.
--- */
---struct brcmf_event {
--- struct ethhdr eth;
--- struct brcm_ethhdr hdr;
--- struct brcmf_event_msg_be msg;
---} __packed;
---
---/**
-- * struct brcmf_fweh_queue_item - event item on event queue.
-- *
-- * @q: list element for queuing.
--@@ -85,6 +41,7 @@ struct brcmf_fweh_queue_item {
-- u8 ifidx;
-- u8 ifaddr[ETH_ALEN];
-- struct brcmf_event_msg_be emsg;
--+ u32 datalen;
-- u8 data[0];
-- };
--
--@@ -294,6 +251,11 @@ static void brcmf_fweh_event_worker(stru
-- brcmf_dbg_hex_dump(BRCMF_EVENT_ON(), event->data,
-- min_t(u32, emsg.datalen, 64),
-- "event payload, len=%d\n", emsg.datalen);
--+ if (emsg.datalen > event->datalen) {
--+ brcmf_err("event invalid length header=%d, msg=%d\n",
--+ event->datalen, emsg.datalen);
--+ goto event_free;
--+ }
--
-- /* special handling of interface event */
-- if (event->code == BRCMF_E_IF) {
--@@ -439,7 +401,8 @@ int brcmf_fweh_activate_events(struct br
-- * dispatch the event to a registered handler (using worker).
-- */
-- void brcmf_fweh_process_event(struct brcmf_pub *drvr,
--- struct brcmf_event *event_packet)
--+ struct brcmf_event *event_packet,
--+ u32 packet_len)
-- {
-- enum brcmf_fweh_event_code code;
-- struct brcmf_fweh_info *fweh = &drvr->fweh;
--@@ -459,6 +422,9 @@ void brcmf_fweh_process_event(struct brc
-- if (code != BRCMF_E_IF && !fweh->evt_handler[code])
-- return;
--
--+ if (datalen > BRCMF_DCMD_MAXLEN)
--+ return;
--+
-- if (in_interrupt())
-- alloc_flag = GFP_ATOMIC;
--
--@@ -472,6 +438,7 @@ void brcmf_fweh_process_event(struct brc
-- /* use memcpy to get aligned event message */
-- memcpy(&event->emsg, &event_packet->msg, sizeof(event->emsg));
-- memcpy(event->data, data, datalen);
--+ event->datalen = datalen;
-- memcpy(event->ifaddr, event_packet->eth.h_dest, ETH_ALEN);
--
-- brcmf_fweh_queue_event(fweh, event);
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.h
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.h
--@@ -27,7 +27,6 @@
-- struct brcmf_pub;
-- struct brcmf_if;
-- struct brcmf_cfg80211_info;
---struct brcmf_event;
--
-- /* list of firmware events */
-- #define BRCMF_FWEH_EVENT_ENUM_DEFLIST \
--@@ -180,13 +179,55 @@ enum brcmf_fweh_event_code {
-- /**
-- * definitions for event packet validation.
-- */
---#define BRCMF_EVENT_OUI_OFFSET 19
---#define BRCM_OUI "\x00\x10\x18"
---#define DOT11_OUI_LEN 3
---#define BCMILCP_BCM_SUBTYPE_EVENT 1
--+#define BRCM_OUI "\x00\x10\x18"
--+#define BCMILCP_BCM_SUBTYPE_EVENT 1
--
--
-- /**
--+ * struct brcm_ethhdr - broadcom specific ether header.
--+ *
--+ * @subtype: subtype for this packet.
--+ * @length: TODO: length of appended data.
--+ * @version: version indication.
--+ * @oui: OUI of this packet.
--+ * @usr_subtype: subtype for this OUI.
--+ */
--+struct brcm_ethhdr {
--+ __be16 subtype;
--+ __be16 length;
--+ u8 version;
--+ u8 oui[3];
--+ __be16 usr_subtype;
--+} __packed;
--+
--+struct brcmf_event_msg_be {
--+ __be16 version;
--+ __be16 flags;
--+ __be32 event_type;
--+ __be32 status;
--+ __be32 reason;
--+ __be32 auth_type;
--+ __be32 datalen;
--+ u8 addr[ETH_ALEN];
--+ char ifname[IFNAMSIZ];
--+ u8 ifidx;
--+ u8 bsscfgidx;
--+} __packed;
--+
--+/**
--+ * struct brcmf_event - contents of broadcom event packet.
--+ *
--+ * @eth: standard ether header.
--+ * @hdr: broadcom specific ether header.
--+ * @msg: common part of the actual event message.
--+ */
--+struct brcmf_event {
--+ struct ethhdr eth;
--+ struct brcm_ethhdr hdr;
--+ struct brcmf_event_msg_be msg;
--+} __packed;
--+
--+/**
-- * struct brcmf_event_msg - firmware event message.
-- *
-- * @version: version information.
--@@ -256,34 +297,35 @@ void brcmf_fweh_unregister(struct brcmf_
-- enum brcmf_fweh_event_code code);
-- int brcmf_fweh_activate_events(struct brcmf_if *ifp);
-- void brcmf_fweh_process_event(struct brcmf_pub *drvr,
--- struct brcmf_event *event_packet);
--+ struct brcmf_event *event_packet,
--+ u32 packet_len);
-- void brcmf_fweh_p2pdev_setup(struct brcmf_if *ifp, bool ongoing);
--
-- static inline void brcmf_fweh_process_skb(struct brcmf_pub *drvr,
-- struct sk_buff *skb)
-- {
-- struct brcmf_event *event_packet;
--- u8 *data;
-- u16 usr_stype;
--
-- /* only process events when protocol matches */
-- if (skb->protocol != cpu_to_be16(ETH_P_LINK_CTL))
-- return;
--
--+ if ((skb->len + ETH_HLEN) < sizeof(*event_packet))
--+ return;
--+
-- /* check for BRCM oui match */
-- event_packet = (struct brcmf_event *)skb_mac_header(skb);
--- data = (u8 *)event_packet;
--- data += BRCMF_EVENT_OUI_OFFSET;
--- if (memcmp(BRCM_OUI, data, DOT11_OUI_LEN))
--+ if (memcmp(BRCM_OUI, &event_packet->hdr.oui[0],
--+ sizeof(event_packet->hdr.oui)))
-- return;
--
-- /* final match on usr_subtype */
--- data += DOT11_OUI_LEN;
--- usr_stype = get_unaligned_be16(data);
--+ usr_stype = get_unaligned_be16(&event_packet->hdr.usr_subtype);
-- if (usr_stype != BCMILCP_BCM_SUBTYPE_EVENT)
-- return;
--
--- brcmf_fweh_process_event(drvr, event_packet);
--+ brcmf_fweh_process_event(drvr, event_packet, skb->len + ETH_HLEN);
-- }
--
-- #endif /* FWEH_H_ */
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
--@@ -1361,6 +1361,11 @@ int brcmf_p2p_notify_action_frame_rx(str
-- u16 mgmt_type;
-- u8 action;
--
--+ if (e->datalen < sizeof(*rxframe)) {
--+ brcmf_dbg(SCAN, "Event data to small. Ignore\n");
--+ return 0;
--+ }
--+
-- ch.chspec = be16_to_cpu(rxframe->chanspec);
-- cfg->d11inf.decchspec(&ch);
-- /* Check if wpa_supplicant has registered for this frame */
--@@ -1858,6 +1863,11 @@ s32 brcmf_p2p_notify_rx_mgmt_p2p_probere
-- brcmf_dbg(INFO, "Enter: event %d reason %d\n", e->event_code,
-- e->reason);
--
--+ if (e->datalen < sizeof(*rxframe)) {
--+ brcmf_dbg(SCAN, "Event data to small. Ignore\n");
--+ return 0;
--+ }
--+
-- ch.chspec = be16_to_cpu(rxframe->chanspec);
-- cfg->d11inf.decchspec(&ch);
--
-diff --git a/package/kernel/mac80211/patches/344-0006-brcmfmac-add-neighbor-discovery-offload-ip-address-t.patch b/package/kernel/mac80211/patches/344-0006-brcmfmac-add-neighbor-discovery-offload-ip-address-t.patch
-deleted file mode 100644
-index 888ad5b05059f1d6712303671a1052f1cbdcf30c..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/344-0006-brcmfmac-add-neighbor-discovery-offload-ip-address-t.patch
-+++ /dev/null
-@@ -1,333 +0,0 @@
--From: Franky Lin <frankyl@broadcom.com>
--Date: Wed, 17 Feb 2016 11:26:55 +0100
--Subject: [PATCH] brcmfmac: add neighbor discovery offload ip address table
-- configuration
--
--Configure ipv6 address for neighbor discovery offload ip table in
--firmware obtained through ipv6 address notification callback.
--
--Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
--Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
--Signed-off-by: Franky Lin <frankyl@broadcom.com>
--Signed-off-by: Arend van Spriel <arend@broadcom.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--@@ -456,7 +456,7 @@ send_key_to_dongle(struct brcmf_if *ifp,
-- }
--
-- static s32
---brcmf_configure_arp_offload(struct brcmf_if *ifp, bool enable)
--+brcmf_configure_arp_nd_offload(struct brcmf_if *ifp, bool enable)
-- {
-- s32 err;
-- u32 mode;
--@@ -484,6 +484,15 @@ brcmf_configure_arp_offload(struct brcmf
-- enable, mode);
-- }
--
--+ err = brcmf_fil_iovar_int_set(ifp, "ndoe", enable);
--+ if (err) {
--+ brcmf_dbg(TRACE, "failed to configure (%d) ND offload err = %d\n",
--+ enable, err);
--+ err = 0;
--+ } else
--+ brcmf_dbg(TRACE, "successfully configured (%d) ND offload to 0x%x\n",
--+ enable, mode);
--+
-- return err;
-- }
--
--@@ -3543,7 +3552,7 @@ static s32 brcmf_cfg80211_resume(struct
-- brcmf_report_wowl_wakeind(wiphy, ifp);
-- brcmf_fil_iovar_int_set(ifp, "wowl_clear", 0);
-- brcmf_config_wowl_pattern(ifp, "clr", NULL, 0, NULL, 0);
--- brcmf_configure_arp_offload(ifp, true);
--+ brcmf_configure_arp_nd_offload(ifp, true);
-- brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_PM,
-- cfg->wowl.pre_pmmode);
-- cfg->wowl.active = false;
--@@ -3567,7 +3576,7 @@ static void brcmf_configure_wowl(struct
--
-- brcmf_dbg(TRACE, "Suspend, wowl config.\n");
--
--- brcmf_configure_arp_offload(ifp, false);
--+ brcmf_configure_arp_nd_offload(ifp, false);
-- brcmf_fil_cmd_int_get(ifp, BRCMF_C_GET_PM, &cfg->wowl.pre_pmmode);
-- brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_PM, PM_MAX);
--
--@@ -4336,7 +4345,7 @@ brcmf_cfg80211_start_ap(struct wiphy *wi
--
-- if (!mbss) {
-- brcmf_set_mpc(ifp, 0);
--- brcmf_configure_arp_offload(ifp, false);
--+ brcmf_configure_arp_nd_offload(ifp, false);
-- }
--
-- /* find the RSN_IE */
--@@ -4482,7 +4491,7 @@ brcmf_cfg80211_start_ap(struct wiphy *wi
-- exit:
-- if ((err) && (!mbss)) {
-- brcmf_set_mpc(ifp, 1);
--- brcmf_configure_arp_offload(ifp, true);
--+ brcmf_configure_arp_nd_offload(ifp, true);
-- }
-- return err;
-- }
--@@ -4540,7 +4549,7 @@ static int brcmf_cfg80211_stop_ap(struct
-- brcmf_err("bss_enable config failed %d\n", err);
-- }
-- brcmf_set_mpc(ifp, 1);
--- brcmf_configure_arp_offload(ifp, true);
--+ brcmf_configure_arp_nd_offload(ifp, true);
-- clear_bit(BRCMF_VIF_STATUS_AP_CREATED, &ifp->vif->sme_state);
-- brcmf_net_setcarrier(ifp, false);
--
--@@ -6287,7 +6296,7 @@ static s32 brcmf_config_dongle(struct br
-- if (err)
-- goto default_conf_out;
--
--- brcmf_configure_arp_offload(ifp, true);
--+ brcmf_configure_arp_nd_offload(ifp, true);
--
-- cfg->dongle_up = true;
-- default_conf_out:
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
--@@ -20,6 +20,8 @@
-- #include <linux/inetdevice.h>
-- #include <net/cfg80211.h>
-- #include <net/rtnetlink.h>
--+#include <net/addrconf.h>
--+#include <net/ipv6.h>
-- #include <brcmu_utils.h>
-- #include <brcmu_wifi.h>
--
--@@ -172,6 +174,35 @@ _brcmf_set_mac_address(struct work_struc
-- }
-- }
--
--+#if IS_ENABLED(CONFIG_IPV6)
--+static void _brcmf_update_ndtable(struct work_struct *work)
--+{
--+ struct brcmf_if *ifp;
--+ int i, ret;
--+
--+ ifp = container_of(work, struct brcmf_if, ndoffload_work);
--+
--+ /* clear the table in firmware */
--+ ret = brcmf_fil_iovar_data_set(ifp, "nd_hostip_clear", NULL, 0);
--+ if (ret) {
--+ brcmf_dbg(TRACE, "fail to clear nd ip table err:%d\n", ret);
--+ return;
--+ }
--+
--+ for (i = 0; i < ifp->ipv6addr_idx; i++) {
--+ ret = brcmf_fil_iovar_data_set(ifp, "nd_hostip",
--+ &ifp->ipv6_addr_tbl[i],
--+ sizeof(struct in6_addr));
--+ if (ret)
--+ brcmf_err("add nd ip err %d\n", ret);
--+ }
--+}
--+#else
--+static void _brcmf_update_ndtable(struct work_struct *work)
--+{
--+}
--+#endif
--+
-- static int brcmf_netdev_set_mac_address(struct net_device *ndev, void *addr)
-- {
-- struct brcmf_if *ifp = netdev_priv(ndev);
--@@ -685,6 +716,7 @@ int brcmf_net_attach(struct brcmf_if *if
--
-- INIT_WORK(&ifp->setmacaddr_work, _brcmf_set_mac_address);
-- INIT_WORK(&ifp->multicast_work, _brcmf_set_multicast_list);
--+ INIT_WORK(&ifp->ndoffload_work, _brcmf_update_ndtable);
--
-- if (rtnl_locked)
-- err = register_netdevice(ndev);
--@@ -884,6 +916,7 @@ static void brcmf_del_if(struct brcmf_pu
-- if (ifp->ndev->netdev_ops == &brcmf_netdev_ops_pri) {
-- cancel_work_sync(&ifp->setmacaddr_work);
-- cancel_work_sync(&ifp->multicast_work);
--+ cancel_work_sync(&ifp->ndoffload_work);
-- }
-- brcmf_net_detach(ifp->ndev);
-- } else {
--@@ -1025,6 +1058,56 @@ static int brcmf_inetaddr_changed(struct
-- }
-- #endif
--
--+#if IS_ENABLED(CONFIG_IPV6)
--+static int brcmf_inet6addr_changed(struct notifier_block *nb,
--+ unsigned long action, void *data)
--+{
--+ struct brcmf_pub *drvr = container_of(nb, struct brcmf_pub,
--+ inet6addr_notifier);
--+ struct inet6_ifaddr *ifa = data;
--+ struct brcmf_if *ifp;
--+ int i;
--+ struct in6_addr *table;
--+
--+ /* Only handle primary interface */
--+ ifp = drvr->iflist[0];
--+ if (!ifp)
--+ return NOTIFY_DONE;
--+ if (ifp->ndev != ifa->idev->dev)
--+ return NOTIFY_DONE;
--+
--+ table = ifp->ipv6_addr_tbl;
--+ for (i = 0; i < NDOL_MAX_ENTRIES; i++)
--+ if (ipv6_addr_equal(&ifa->addr, &table[i]))
--+ break;
--+
--+ switch (action) {
--+ case NETDEV_UP:
--+ if (i == NDOL_MAX_ENTRIES) {
--+ if (ifp->ipv6addr_idx < NDOL_MAX_ENTRIES) {
--+ table[ifp->ipv6addr_idx++] = ifa->addr;
--+ } else {
--+ for (i = 0; i < NDOL_MAX_ENTRIES - 1; i++)
--+ table[i] = table[i + 1];
--+ table[NDOL_MAX_ENTRIES - 1] = ifa->addr;
--+ }
--+ }
--+ break;
--+ case NETDEV_DOWN:
--+ if (i < NDOL_MAX_ENTRIES)
--+ for (; i < ifp->ipv6addr_idx; i++)
--+ table[i] = table[i + 1];
--+ break;
--+ default:
--+ break;
--+ }
--+
--+ schedule_work(&ifp->ndoffload_work);
--+
--+ return NOTIFY_OK;
--+}
--+#endif
--+
-- int brcmf_attach(struct device *dev)
-- {
-- struct brcmf_pub *drvr = NULL;
--@@ -1164,30 +1247,41 @@ int brcmf_bus_start(struct device *dev)
-- #ifdef CONFIG_INET
-- drvr->inetaddr_notifier.notifier_call = brcmf_inetaddr_changed;
-- ret = register_inetaddr_notifier(&drvr->inetaddr_notifier);
--+ if (ret)
--+ goto fail;
--+
--+#if IS_ENABLED(CONFIG_IPV6)
--+ drvr->inet6addr_notifier.notifier_call = brcmf_inet6addr_changed;
--+ ret = register_inet6addr_notifier(&drvr->inet6addr_notifier);
--+ if (ret) {
--+ unregister_inetaddr_notifier(&drvr->inetaddr_notifier);
--+ goto fail;
--+ }
-- #endif
--+#endif /* CONFIG_INET */
--+
--+ return 0;
--
-- fail:
--- if (ret < 0) {
--- brcmf_err("failed: %d\n", ret);
--- if (drvr->config) {
--- brcmf_cfg80211_detach(drvr->config);
--- drvr->config = NULL;
--- }
--- if (drvr->fws) {
--- brcmf_fws_del_interface(ifp);
--- brcmf_fws_deinit(drvr);
--- }
--- if (ifp)
--- brcmf_net_detach(ifp->ndev);
--- if (p2p_ifp)
--- brcmf_net_detach(p2p_ifp->ndev);
--- drvr->iflist[0] = NULL;
--- drvr->iflist[1] = NULL;
--- if (brcmf_ignoring_probe_fail(drvr))
--- ret = 0;
--- return ret;
--+ brcmf_err("failed: %d\n", ret);
--+ if (drvr->config) {
--+ brcmf_cfg80211_detach(drvr->config);
--+ drvr->config = NULL;
--+ }
--+ if (drvr->fws) {
--+ brcmf_fws_del_interface(ifp);
--+ brcmf_fws_deinit(drvr);
-- }
--- return 0;
--+ if (ifp)
--+ brcmf_net_detach(ifp->ndev);
--+ if (p2p_ifp)
--+ brcmf_net_detach(p2p_ifp->ndev);
--+ drvr->iflist[0] = NULL;
--+ drvr->iflist[1] = NULL;
--+ if (brcmf_ignoring_probe_fail(drvr))
--+ ret = 0;
--+
--+ return ret;
-- }
--
-- void brcmf_bus_add_txhdrlen(struct device *dev, uint len)
--@@ -1237,6 +1331,10 @@ void brcmf_detach(struct device *dev)
-- unregister_inetaddr_notifier(&drvr->inetaddr_notifier);
-- #endif
--
--+#if IS_ENABLED(CONFIG_IPV6)
--+ unregister_inet6addr_notifier(&drvr->inet6addr_notifier);
--+#endif
--+
-- /* stop firmware event handling */
-- brcmf_fweh_detach(drvr);
-- if (drvr->config)
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h
--@@ -48,6 +48,8 @@
-- */
-- #define BRCMF_DRIVER_FIRMWARE_VERSION_LEN 32
--
--+#define NDOL_MAX_ENTRIES 8
--+
-- /**
-- * struct brcmf_ampdu_rx_reorder - AMPDU receive reorder info
-- *
--@@ -143,6 +145,7 @@ struct brcmf_pub {
-- #endif
--
-- struct notifier_block inetaddr_notifier;
--+ struct notifier_block inet6addr_notifier;
-- struct brcmf_mp_device *settings;
-- };
--
--@@ -175,6 +178,7 @@ enum brcmf_netif_stop_reason {
-- * @stats: interface specific network statistics.
-- * @setmacaddr_work: worker object for setting mac address.
-- * @multicast_work: worker object for multicast provisioning.
--+ * @ndoffload_work: worker object for neighbor discovery offload configuration.
-- * @fws_desc: interface specific firmware-signalling descriptor.
-- * @ifidx: interface index in device firmware.
-- * @bsscfgidx: index of bss associated with this interface.
--@@ -191,6 +195,7 @@ struct brcmf_if {
-- struct net_device_stats stats;
-- struct work_struct setmacaddr_work;
-- struct work_struct multicast_work;
--+ struct work_struct ndoffload_work;
-- struct brcmf_fws_mac_descriptor *fws_desc;
-- int ifidx;
-- s32 bsscfgidx;
--@@ -199,6 +204,8 @@ struct brcmf_if {
-- spinlock_t netif_stop_lock;
-- atomic_t pend_8021x_cnt;
-- wait_queue_head_t pend_8021x_wait;
--+ struct in6_addr ipv6_addr_tbl[NDOL_MAX_ENTRIES];
--+ u8 ipv6addr_idx;
-- };
--
-- struct brcmf_skb_reorder_data {
-diff --git a/package/kernel/mac80211/patches/344-0007-brcmfmac-check-return-for-ARP-ip-setting-iovar.patch b/package/kernel/mac80211/patches/344-0007-brcmfmac-check-return-for-ARP-ip-setting-iovar.patch
-deleted file mode 100644
-index 68de8ed2a263a45c4d3e7c4d568801a6925b1a30..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/344-0007-brcmfmac-check-return-for-ARP-ip-setting-iovar.patch
-+++ /dev/null
-@@ -1,38 +0,0 @@
--From: Franky Lin <frankyl@broadcom.com>
--Date: Wed, 17 Feb 2016 11:26:56 +0100
--Subject: [PATCH] brcmfmac: check return for ARP ip setting iovar
--
--The return value of iovar set function should be saved and checked.
--
--Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
--Reviewed-by: Hante Meuleman <meuleman@broadcom.com>
--Signed-off-by: Franky Lin <frankyl@broadcom.com>
--Signed-off-by: Arend van Spriel <arend@broadcom.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
--@@ -1039,14 +1039,14 @@ static int brcmf_inetaddr_changed(struct
-- return NOTIFY_OK;
-- }
-- for (i = 0; i < ARPOL_MAX_ENTRIES; i++) {
--- if (addr_table[i] != 0) {
--- brcmf_fil_iovar_data_set(ifp,
--- "arp_hostip", &addr_table[i],
--- sizeof(addr_table[i]));
--- if (ret)
--- brcmf_err("add arp ip err %d\n",
--- ret);
--- }
--+ if (addr_table[i] == 0)
--+ continue;
--+ ret = brcmf_fil_iovar_data_set(ifp, "arp_hostip",
--+ &addr_table[i],
--+ sizeof(addr_table[i]));
--+ if (ret)
--+ brcmf_err("add arp ip err %d\n",
--+ ret);
-- }
-- }
-- break;
-diff --git a/package/kernel/mac80211/patches/344-0008-brcmfmac-use-device-memsize-config-from-fw-if-define.patch b/package/kernel/mac80211/patches/344-0008-brcmfmac-use-device-memsize-config-from-fw-if-define.patch
-deleted file mode 100644
-index 3de0f64d560d8a64923f5227e95cbfa2cbfc72df..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/344-0008-brcmfmac-use-device-memsize-config-from-fw-if-define.patch
-+++ /dev/null
-@@ -1,73 +0,0 @@
--From: Hante Meuleman <meuleman@broadcom.com>
--Date: Wed, 17 Feb 2016 11:26:57 +0100
--Subject: [PATCH] brcmfmac: use device memsize config from fw if defined
--
--Newer type pcie devices have memory which get shared between fw and
--hw. The division of this memory is done firmware compile time. As a
--result the ramsize as used by driver needs to be adjusted for this.
--This is done by reading the memory size from the firmware.
--
--Reviewed-by: Arend Van Spriel <arend@broadcom.com>
--Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
--Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
--Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
--Signed-off-by: Arend van Spriel <arend@broadcom.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
--@@ -207,6 +207,10 @@ static struct brcmf_firmware_mapping brc
-- #define BRCMF_PCIE_CFGREG_REG_BAR3_CONFIG 0x4F4
-- #define BRCMF_PCIE_LINK_STATUS_CTRL_ASPM_ENAB 3
--
--+/* Magic number at a magic location to find RAM size */
--+#define BRCMF_RAMSIZE_MAGIC 0x534d4152 /* SMAR */
--+#define BRCMF_RAMSIZE_OFFSET 0x6c
--+
--
-- struct brcmf_pcie_console {
-- u32 base_addr;
--@@ -1412,6 +1416,28 @@ static const struct brcmf_bus_ops brcmf_
-- };
--
--
--+static void
--+brcmf_pcie_adjust_ramsize(struct brcmf_pciedev_info *devinfo, u8 *data,
--+ u32 data_len)
--+{
--+ __le32 *field;
--+ u32 newsize;
--+
--+ if (data_len < BRCMF_RAMSIZE_OFFSET + 8)
--+ return;
--+
--+ field = (__le32 *)&data[BRCMF_RAMSIZE_OFFSET];
--+ if (le32_to_cpup(field) != BRCMF_RAMSIZE_MAGIC)
--+ return;
--+ field++;
--+ newsize = le32_to_cpup(field);
--+
--+ brcmf_dbg(PCIE, "Found ramsize info in FW, adjusting to 0x%x\n",
--+ newsize);
--+ devinfo->ci->ramsize = newsize;
--+}
--+
--+
-- static int
-- brcmf_pcie_init_share_ram_info(struct brcmf_pciedev_info *devinfo,
-- u32 sharedram_addr)
--@@ -1694,6 +1720,13 @@ static void brcmf_pcie_setup(struct devi
--
-- brcmf_pcie_attach(devinfo);
--
--+ /* Some of the firmwares have the size of the memory of the device
--+ * defined inside the firmware. This is because part of the memory in
--+ * the device is shared and the devision is determined by FW. Parse
--+ * the firmware and adjust the chip memory size now.
--+ */
--+ brcmf_pcie_adjust_ramsize(devinfo, (u8 *)fw->data, fw->size);
--+
-- ret = brcmf_pcie_download_fw_nvram(devinfo, fw, nvram, nvram_len);
-- if (ret)
-- goto fail;
-diff --git a/package/kernel/mac80211/patches/344-0009-brcmfmac-use-bar1-window-size-as-provided-by-pci-sub.patch b/package/kernel/mac80211/patches/344-0009-brcmfmac-use-bar1-window-size-as-provided-by-pci-sub.patch
-deleted file mode 100644
-index ca03ffe4b09a5b565b9da2ce4eb13949bb3623b4..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/344-0009-brcmfmac-use-bar1-window-size-as-provided-by-pci-sub.patch
-+++ /dev/null
-@@ -1,58 +0,0 @@
--From: Hante Meuleman <meuleman@broadcom.com>
--Date: Wed, 17 Feb 2016 11:26:58 +0100
--Subject: [PATCH] brcmfmac: use bar1 window size as provided by pci subsystem
--
--The PCIE bar1 window size is specified by chip. Currently the
--ioremap of bar1 was using a define which always matched the size
--of bar1, but newer chips can have a different bar1 sizes. With
--this patch the ioremap will be called with the by chip provided
--window size.
--
--Reviewed-by: Arend Van Spriel <arend@broadcom.com>
--Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
--Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
--Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
--Signed-off-by: Arend van Spriel <arend@broadcom.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
--@@ -72,7 +72,6 @@ static struct brcmf_firmware_mapping brc
--
-- #define BRCMF_PCIE_FW_UP_TIMEOUT 2000 /* msec */
--
---#define BRCMF_PCIE_TCM_MAP_SIZE (4096 * 1024)
-- #define BRCMF_PCIE_REG_MAP_SIZE (32 * 1024)
--
-- /* backplane addres space accessed by BAR0 */
--@@ -252,7 +251,6 @@ struct brcmf_pciedev_info {
-- char nvram_name[BRCMF_FW_NAME_LEN];
-- void __iomem *regs;
-- void __iomem *tcm;
--- u32 tcm_size;
-- u32 ram_base;
-- u32 ram_size;
-- struct brcmf_chip *ci;
--@@ -1592,8 +1590,7 @@ static int brcmf_pcie_get_resource(struc
-- }
--
-- devinfo->regs = ioremap_nocache(bar0_addr, BRCMF_PCIE_REG_MAP_SIZE);
--- devinfo->tcm = ioremap_nocache(bar1_addr, BRCMF_PCIE_TCM_MAP_SIZE);
--- devinfo->tcm_size = BRCMF_PCIE_TCM_MAP_SIZE;
--+ devinfo->tcm = ioremap_nocache(bar1_addr, bar1_size);
--
-- if (!devinfo->regs || !devinfo->tcm) {
-- brcmf_err("ioremap() failed (%p,%p)\n", devinfo->regs,
--@@ -1602,8 +1599,9 @@ static int brcmf_pcie_get_resource(struc
-- }
-- brcmf_dbg(PCIE, "Phys addr : reg space = %p base addr %#016llx\n",
-- devinfo->regs, (unsigned long long)bar0_addr);
--- brcmf_dbg(PCIE, "Phys addr : mem space = %p base addr %#016llx\n",
--- devinfo->tcm, (unsigned long long)bar1_addr);
--+ brcmf_dbg(PCIE, "Phys addr : mem space = %p base addr %#016llx size 0x%x\n",
--+ devinfo->tcm, (unsigned long long)bar1_addr,
--+ (unsigned int)bar1_size);
--
-- return 0;
-- }
-diff --git a/package/kernel/mac80211/patches/344-0010-brcmfmac-add-support-for-the-PCIE-4366c0-chip.patch b/package/kernel/mac80211/patches/344-0010-brcmfmac-add-support-for-the-PCIE-4366c0-chip.patch
-deleted file mode 100644
-index e4a8f305cf5a8d9029ad5619ef8bcbc10a425ddd..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/344-0010-brcmfmac-add-support-for-the-PCIE-4366c0-chip.patch
-+++ /dev/null
-@@ -1,34 +0,0 @@
--From: Hante Meuleman <meuleman@broadcom.com>
--Date: Wed, 17 Feb 2016 11:26:59 +0100
--Subject: [PATCH] brcmfmac: add support for the PCIE 4366c0 chip
--
--A newer version of the 4366 PCIE chip has been released. Add
--support for this version of the chip.
--
--Reviewed-by: Arend Van Spriel <arend@broadcom.com>
--Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
--Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
--Signed-off-by: Arend van Spriel <arend@broadcom.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
--@@ -53,6 +53,7 @@ BRCMF_FW_NVRAM_DEF(4358, "brcmfmac4358-p
-- BRCMF_FW_NVRAM_DEF(4359, "brcmfmac4359-pcie.bin", "brcmfmac4359-pcie.txt");
-- BRCMF_FW_NVRAM_DEF(4365B, "brcmfmac4365b-pcie.bin", "brcmfmac4365b-pcie.txt");
-- BRCMF_FW_NVRAM_DEF(4366B, "brcmfmac4366b-pcie.bin", "brcmfmac4366b-pcie.txt");
--+BRCMF_FW_NVRAM_DEF(4366C, "brcmfmac4366c-pcie.bin", "brcmfmac4366c-pcie.txt");
-- BRCMF_FW_NVRAM_DEF(4371, "brcmfmac4371-pcie.bin", "brcmfmac4371-pcie.txt");
--
-- static struct brcmf_firmware_mapping brcmf_pcie_fwnames[] = {
--@@ -66,7 +67,8 @@ static struct brcmf_firmware_mapping brc
-- BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4358_CHIP_ID, 0xFFFFFFFF, 4358),
-- BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4359_CHIP_ID, 0xFFFFFFFF, 4359),
-- BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4365_CHIP_ID, 0xFFFFFFFF, 4365B),
--- BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4366_CHIP_ID, 0xFFFFFFFF, 4366B),
--+ BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4366_CHIP_ID, 0x0000000F, 4366B),
--+ BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4366_CHIP_ID, 0xFFFFFFF0, 4366C),
-- BRCMF_FW_NVRAM_ENTRY(BRCM_CC_4371_CHIP_ID, 0xFFFFFFFF, 4371),
-- };
--
-diff --git a/package/kernel/mac80211/patches/344-0011-brcmfmac-remove-pcie-gen1-support.patch b/package/kernel/mac80211/patches/344-0011-brcmfmac-remove-pcie-gen1-support.patch
-deleted file mode 100644
-index f99f6dbf07660777a50fda006c049027ef88b16d..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/344-0011-brcmfmac-remove-pcie-gen1-support.patch
-+++ /dev/null
-@@ -1,221 +0,0 @@
--From: Hante Meuleman <meuleman@broadcom.com>
--Date: Wed, 17 Feb 2016 11:27:00 +0100
--Subject: [PATCH] brcmfmac: remove pcie gen1 support
--
--The PCIE bus driver supports older gen1 (v1) chips, but there is no
--actual device which is using this older pcie core which is supported
--by brcmfmac. Remove all gen1 related code.
--
--Reviewed-by: Arend Van Spriel <arend@broadcom.com>
--Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
--Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
--Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
--Signed-off-by: Arend van Spriel <arend@broadcom.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
--@@ -100,9 +100,6 @@ static struct brcmf_firmware_mapping brc
-- #define BRCMF_PCIE_PCIE2REG_CONFIGDATA 0x124
-- #define BRCMF_PCIE_PCIE2REG_H2D_MAILBOX 0x140
--
---#define BRCMF_PCIE_GENREV1 1
---#define BRCMF_PCIE_GENREV2 2
---
-- #define BRCMF_PCIE2_INTA 0x01
-- #define BRCMF_PCIE2_INTB 0x02
--
--@@ -257,9 +254,7 @@ struct brcmf_pciedev_info {
-- u32 ram_size;
-- struct brcmf_chip *ci;
-- u32 coreid;
--- u32 generic_corerev;
-- struct brcmf_pcie_shared_info shared;
--- void (*ringbell)(struct brcmf_pciedev_info *devinfo);
-- wait_queue_head_t mbdata_resp_wait;
-- bool mbdata_completed;
-- bool irq_allocated;
--@@ -746,68 +741,22 @@ static void brcmf_pcie_bus_console_read(
-- }
--
--
---static __used void brcmf_pcie_ringbell_v1(struct brcmf_pciedev_info *devinfo)
---{
--- u32 reg_value;
---
--- brcmf_dbg(PCIE, "RING !\n");
--- reg_value = brcmf_pcie_read_reg32(devinfo,
--- BRCMF_PCIE_PCIE2REG_MAILBOXINT);
--- reg_value |= BRCMF_PCIE2_INTB;
--- brcmf_pcie_write_reg32(devinfo, BRCMF_PCIE_PCIE2REG_MAILBOXINT,
--- reg_value);
---}
---
---
---static void brcmf_pcie_ringbell_v2(struct brcmf_pciedev_info *devinfo)
---{
--- brcmf_dbg(PCIE, "RING !\n");
--- /* Any arbitrary value will do, lets use 1 */
--- brcmf_pcie_write_reg32(devinfo, BRCMF_PCIE_PCIE2REG_H2D_MAILBOX, 1);
---}
---
---
-- static void brcmf_pcie_intr_disable(struct brcmf_pciedev_info *devinfo)
-- {
--- if (devinfo->generic_corerev == BRCMF_PCIE_GENREV1)
--- pci_write_config_dword(devinfo->pdev, BRCMF_PCIE_REG_INTMASK,
--- 0);
--- else
--- brcmf_pcie_write_reg32(devinfo, BRCMF_PCIE_PCIE2REG_MAILBOXMASK,
--- 0);
--+ brcmf_pcie_write_reg32(devinfo, BRCMF_PCIE_PCIE2REG_MAILBOXMASK, 0);
-- }
--
--
-- static void brcmf_pcie_intr_enable(struct brcmf_pciedev_info *devinfo)
-- {
--- if (devinfo->generic_corerev == BRCMF_PCIE_GENREV1)
--- pci_write_config_dword(devinfo->pdev, BRCMF_PCIE_REG_INTMASK,
--- BRCMF_PCIE_INT_DEF);
--- else
--- brcmf_pcie_write_reg32(devinfo, BRCMF_PCIE_PCIE2REG_MAILBOXMASK,
--- BRCMF_PCIE_MB_INT_D2H_DB |
--- BRCMF_PCIE_MB_INT_FN0_0 |
--- BRCMF_PCIE_MB_INT_FN0_1);
--+ brcmf_pcie_write_reg32(devinfo, BRCMF_PCIE_PCIE2REG_MAILBOXMASK,
--+ BRCMF_PCIE_MB_INT_D2H_DB |
--+ BRCMF_PCIE_MB_INT_FN0_0 |
--+ BRCMF_PCIE_MB_INT_FN0_1);
-- }
--
--
---static irqreturn_t brcmf_pcie_quick_check_isr_v1(int irq, void *arg)
---{
--- struct brcmf_pciedev_info *devinfo = (struct brcmf_pciedev_info *)arg;
--- u32 status;
---
--- status = 0;
--- pci_read_config_dword(devinfo->pdev, BRCMF_PCIE_REG_INTSTATUS, &status);
--- if (status) {
--- brcmf_pcie_intr_disable(devinfo);
--- brcmf_dbg(PCIE, "Enter\n");
--- return IRQ_WAKE_THREAD;
--- }
--- return IRQ_NONE;
---}
---
---
---static irqreturn_t brcmf_pcie_quick_check_isr_v2(int irq, void *arg)
--+static irqreturn_t brcmf_pcie_quick_check_isr(int irq, void *arg)
-- {
-- struct brcmf_pciedev_info *devinfo = (struct brcmf_pciedev_info *)arg;
--
--@@ -820,29 +769,7 @@ static irqreturn_t brcmf_pcie_quick_chec
-- }
--
--
---static irqreturn_t brcmf_pcie_isr_thread_v1(int irq, void *arg)
---{
--- struct brcmf_pciedev_info *devinfo = (struct brcmf_pciedev_info *)arg;
--- const struct pci_dev *pdev = devinfo->pdev;
--- u32 status;
---
--- devinfo->in_irq = true;
--- status = 0;
--- pci_read_config_dword(pdev, BRCMF_PCIE_REG_INTSTATUS, &status);
--- brcmf_dbg(PCIE, "Enter %x\n", status);
--- if (status) {
--- pci_write_config_dword(pdev, BRCMF_PCIE_REG_INTSTATUS, status);
--- if (devinfo->state == BRCMFMAC_PCIE_STATE_UP)
--- brcmf_proto_msgbuf_rx_trigger(&devinfo->pdev->dev);
--- }
--- if (devinfo->state == BRCMFMAC_PCIE_STATE_UP)
--- brcmf_pcie_intr_enable(devinfo);
--- devinfo->in_irq = false;
--- return IRQ_HANDLED;
---}
---
---
---static irqreturn_t brcmf_pcie_isr_thread_v2(int irq, void *arg)
--+static irqreturn_t brcmf_pcie_isr_thread(int irq, void *arg)
-- {
-- struct brcmf_pciedev_info *devinfo = (struct brcmf_pciedev_info *)arg;
-- u32 status;
--@@ -879,28 +806,14 @@ static int brcmf_pcie_request_irq(struct
-- brcmf_pcie_intr_disable(devinfo);
--
-- brcmf_dbg(PCIE, "Enter\n");
--- /* is it a v1 or v2 implementation */
--+
-- pci_enable_msi(pdev);
--- if (devinfo->generic_corerev == BRCMF_PCIE_GENREV1) {
--- if (request_threaded_irq(pdev->irq,
--- brcmf_pcie_quick_check_isr_v1,
--- brcmf_pcie_isr_thread_v1,
--- IRQF_SHARED, "brcmf_pcie_intr",
--- devinfo)) {
--- pci_disable_msi(pdev);
--- brcmf_err("Failed to request IRQ %d\n", pdev->irq);
--- return -EIO;
--- }
--- } else {
--- if (request_threaded_irq(pdev->irq,
--- brcmf_pcie_quick_check_isr_v2,
--- brcmf_pcie_isr_thread_v2,
--- IRQF_SHARED, "brcmf_pcie_intr",
--- devinfo)) {
--- pci_disable_msi(pdev);
--- brcmf_err("Failed to request IRQ %d\n", pdev->irq);
--- return -EIO;
--- }
--+ if (request_threaded_irq(pdev->irq, brcmf_pcie_quick_check_isr,
--+ brcmf_pcie_isr_thread, IRQF_SHARED,
--+ "brcmf_pcie_intr", devinfo)) {
--+ pci_disable_msi(pdev);
--+ brcmf_err("Failed to request IRQ %d\n", pdev->irq);
--+ return -EIO;
-- }
-- devinfo->irq_allocated = true;
-- return 0;
--@@ -931,16 +844,9 @@ static void brcmf_pcie_release_irq(struc
-- if (devinfo->in_irq)
-- brcmf_err("Still in IRQ (processing) !!!\n");
--
--- if (devinfo->generic_corerev == BRCMF_PCIE_GENREV1) {
--- status = 0;
--- pci_read_config_dword(pdev, BRCMF_PCIE_REG_INTSTATUS, &status);
--- pci_write_config_dword(pdev, BRCMF_PCIE_REG_INTSTATUS, status);
--- } else {
--- status = brcmf_pcie_read_reg32(devinfo,
--- BRCMF_PCIE_PCIE2REG_MAILBOXINT);
--- brcmf_pcie_write_reg32(devinfo, BRCMF_PCIE_PCIE2REG_MAILBOXINT,
--- status);
--- }
--+ status = brcmf_pcie_read_reg32(devinfo, BRCMF_PCIE_PCIE2REG_MAILBOXINT);
--+ brcmf_pcie_write_reg32(devinfo, BRCMF_PCIE_PCIE2REG_MAILBOXINT, status);
--+
-- devinfo->irq_allocated = false;
-- }
--
--@@ -989,7 +895,9 @@ static int brcmf_pcie_ring_mb_ring_bell(
-- if (devinfo->state != BRCMFMAC_PCIE_STATE_UP)
-- return -EIO;
--
--- devinfo->ringbell(devinfo);
--+ brcmf_dbg(PCIE, "RING !\n");
--+ /* Any arbitrary value will do, lets use 1 */
--+ brcmf_pcie_write_reg32(devinfo, BRCMF_PCIE_PCIE2REG_H2D_MAILBOX, 1);
--
-- return 0;
-- }
--@@ -1503,9 +1411,6 @@ static int brcmf_pcie_download_fw_nvram(
-- u32 address;
-- u32 resetintr;
--
--- devinfo->ringbell = brcmf_pcie_ringbell_v2;
--- devinfo->generic_corerev = BRCMF_PCIE_GENREV2;
---
-- brcmf_dbg(PCIE, "Halt ARM.\n");
-- err = brcmf_pcie_enter_download_state(devinfo);
-- if (err)
-diff --git a/package/kernel/mac80211/patches/344-0012-brcmfmac-increase-timeout-for-tx-eapol.patch b/package/kernel/mac80211/patches/344-0012-brcmfmac-increase-timeout-for-tx-eapol.patch
-deleted file mode 100644
-index 4adfc2dc644ab901dae25abcbd2e3c4845802bb5..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/344-0012-brcmfmac-increase-timeout-for-tx-eapol.patch
-+++ /dev/null
-@@ -1,30 +0,0 @@
--From: Hante Meuleman <meuleman@broadcom.com>
--Date: Wed, 17 Feb 2016 11:27:01 +0100
--Subject: [PATCH] brcmfmac: increase timeout for tx eapol
--
--When keys get set and updated this has to happen after eapol got
--transmitted (without key or old key) before the key can be updated.
--To make sure the order of sending eapol and configuring key is done
--correctly a timeout for tx of eapol is applied. This timeout is set
--to 50 msec, which is not always enough. Especially in AP mode and
--key updates the timeout may need to be much longer because client(s)
--can be in powersave. Increase the timeout from 50 to 950 msec.
--
--Reviewed-by: Arend Van Spriel <arend@broadcom.com>
--Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
--Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
--Signed-off-by: Arend van Spriel <arend@broadcom.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
--@@ -42,7 +42,7 @@ MODULE_AUTHOR("Broadcom Corporation");
-- MODULE_DESCRIPTION("Broadcom 802.11 wireless LAN fullmac driver.");
-- MODULE_LICENSE("Dual BSD/GPL");
--
---#define MAX_WAIT_FOR_8021X_TX msecs_to_jiffies(50)
--+#define MAX_WAIT_FOR_8021X_TX msecs_to_jiffies(950)
--
-- /* AMPDU rx reordering definitions */
-- #define BRCMF_RXREORDER_FLOWID_OFFSET 0
-diff --git a/package/kernel/mac80211/patches/344-0013-brcmfmac-move-module-init-and-exit-to-common.patch b/package/kernel/mac80211/patches/344-0013-brcmfmac-move-module-init-and-exit-to-common.patch
-deleted file mode 100644
-index bd62781188c37c339ab5eafb8434b6a5d07677bd..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/344-0013-brcmfmac-move-module-init-and-exit-to-common.patch
-+++ /dev/null
-@@ -1,135 +0,0 @@
--From: Hante Meuleman <meuleman@broadcom.com>
--Date: Wed, 17 Feb 2016 11:27:02 +0100
--Subject: [PATCH] brcmfmac: move module init and exit to common
--
--In preparation of module parameters for all devices the module init
--and exit routines are moved to the common file.
--
--Reviewed-by: Arend Van Spriel <arend@broadcom.com>
--Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
--Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
--Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
--Signed-off-by: Arend van Spriel <arend@broadcom.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
--@@ -28,6 +28,10 @@
-- #include "tracepoint.h"
-- #include "common.h"
--
--+MODULE_AUTHOR("Broadcom Corporation");
--+MODULE_DESCRIPTION("Broadcom 802.11 wireless LAN fullmac driver.");
--+MODULE_LICENSE("Dual BSD/GPL");
--+
-- const u8 ALLFFMAC[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
--
-- #define BRCMF_DEFAULT_SCAN_CHANNEL_TIME 40
--@@ -221,7 +225,7 @@ void __brcmf_dbg(u32 level, const char *
-- }
-- #endif
--
---void brcmf_mp_attach(void)
--+static void brcmf_mp_attach(void)
-- {
-- strlcpy(brcmf_mp_global.firmware_path, brcmf_firmware_path,
-- BRCMF_FW_ALTPATH_LEN);
--@@ -249,3 +253,33 @@ void brcmf_mp_device_detach(struct brcmf
-- kfree(drvr->settings);
-- }
--
--+static int __init brcmfmac_module_init(void)
--+{
--+ int err;
--+
--+ /* Initialize debug system first */
--+ brcmf_debugfs_init();
--+
--+#ifdef CPTCFG_BRCMFMAC_SDIO
--+ brcmf_sdio_init();
--+#endif
--+ /* Initialize global module paramaters */
--+ brcmf_mp_attach();
--+
--+ /* Continue the initialization by registering the different busses */
--+ err = brcmf_core_init();
--+ if (err)
--+ brcmf_debugfs_exit();
--+
--+ return err;
--+}
--+
--+static void __exit brcmfmac_module_exit(void)
--+{
--+ brcmf_core_exit();
--+ brcmf_debugfs_exit();
--+}
--+
--+module_init(brcmfmac_module_init);
--+module_exit(brcmfmac_module_exit);
--+
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.h
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.h
--@@ -89,7 +89,6 @@ struct brcmf_mp_device {
-- struct cc_translate *country_codes;
-- };
--
---void brcmf_mp_attach(void);
-- int brcmf_mp_device_attach(struct brcmf_pub *drvr);
-- void brcmf_mp_device_detach(struct brcmf_pub *drvr);
-- #ifdef DEBUG
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
--@@ -38,10 +38,6 @@
-- #include "pcie.h"
-- #include "common.h"
--
---MODULE_AUTHOR("Broadcom Corporation");
---MODULE_DESCRIPTION("Broadcom 802.11 wireless LAN fullmac driver.");
---MODULE_LICENSE("Dual BSD/GPL");
---
-- #define MAX_WAIT_FOR_8021X_TX msecs_to_jiffies(950)
--
-- /* AMPDU rx reordering definitions */
--@@ -1422,19 +1418,15 @@ static void brcmf_driver_register(struct
-- }
-- static DECLARE_WORK(brcmf_driver_work, brcmf_driver_register);
--
---static int __init brcmfmac_module_init(void)
--+int __init brcmf_core_init(void)
-- {
--- brcmf_debugfs_init();
---#ifdef CPTCFG_BRCMFMAC_SDIO
--- brcmf_sdio_init();
---#endif
-- if (!schedule_work(&brcmf_driver_work))
-- return -EBUSY;
--
-- return 0;
-- }
--
---static void __exit brcmfmac_module_exit(void)
--+void __exit brcmf_core_exit(void)
-- {
-- cancel_work_sync(&brcmf_driver_work);
--
--@@ -1447,8 +1439,5 @@ static void __exit brcmfmac_module_exit(
-- #ifdef CPTCFG_BRCMFMAC_PCIE
-- brcmf_pcie_exit();
-- #endif
--- brcmf_debugfs_exit();
-- }
--
---module_init(brcmfmac_module_init);
---module_exit(brcmfmac_module_exit);
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h
--@@ -227,5 +227,7 @@ void brcmf_txflowblock_if(struct brcmf_i
-- void brcmf_txfinalize(struct brcmf_if *ifp, struct sk_buff *txp, bool success);
-- void brcmf_netif_rx(struct brcmf_if *ifp, struct sk_buff *skb);
-- void brcmf_net_setcarrier(struct brcmf_if *ifp, bool on);
--+int __init brcmf_core_init(void);
--+void __exit brcmf_core_exit(void);
--
-- #endif /* BRCMFMAC_CORE_H */
-diff --git a/package/kernel/mac80211/patches/344-0014-brcmfmac-add-wowl-gtk-rekeying-offload-support.patch b/package/kernel/mac80211/patches/344-0014-brcmfmac-add-wowl-gtk-rekeying-offload-support.patch
-deleted file mode 100644
-index 577ca8ed2837b3c480be022067e7b8389f13af01..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/344-0014-brcmfmac-add-wowl-gtk-rekeying-offload-support.patch
-+++ /dev/null
-@@ -1,260 +0,0 @@
--From: Hante Meuleman <meuleman@broadcom.com>
--Date: Wed, 17 Feb 2016 11:27:03 +0100
--Subject: [PATCH] brcmfmac: add wowl gtk rekeying offload support
--
--This patch adds support for gtk rekeying offload and for gtk
--rekeying failure during wowl mode.
--
--Reviewed-by: Arend Van Spriel <arend@broadcom.com>
--Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
--Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
--Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
--Signed-off-by: Arend van Spriel <arend@broadcom.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--@@ -3526,6 +3526,10 @@ static void brcmf_report_wowl_wakeind(st
-- else
-- wakeup_data.net_detect = cfg->wowl.nd_info;
-- }
--+ if (wakeind & BRCMF_WOWL_GTK_FAILURE) {
--+ brcmf_dbg(INFO, "WOWL Wake indicator: BRCMF_WOWL_GTK_FAILURE\n");
--+ wakeup_data.gtk_rekey_failure = true;
--+ }
-- } else {
-- wakeup = NULL;
-- }
--@@ -3607,6 +3611,8 @@ static void brcmf_configure_wowl(struct
-- brcmf_fweh_register(cfg->pub, BRCMF_E_PFN_NET_FOUND,
-- brcmf_wowl_nd_results);
-- }
--+ if (wowl->gtk_rekey_failure)
--+ wowl_config |= BRCMF_WOWL_GTK_FAILURE;
-- if (!test_bit(BRCMF_VIF_STATUS_CONNECTED, &ifp->vif->sme_state))
-- wowl_config |= BRCMF_WOWL_UNASSOC;
--
--@@ -4874,7 +4880,32 @@ static int brcmf_cfg80211_tdls_oper(stru
-- return ret;
-- }
--
---static struct cfg80211_ops wl_cfg80211_ops = {
--+#ifdef CONFIG_PM
--+static int
--+brcmf_cfg80211_set_rekey_data(struct wiphy *wiphy, struct net_device *ndev,
--+ struct cfg80211_gtk_rekey_data *gtk)
--+{
--+ struct brcmf_if *ifp = netdev_priv(ndev);
--+ struct brcmf_gtk_keyinfo_le gtk_le;
--+ int ret;
--+
--+ brcmf_dbg(TRACE, "Enter, bssidx=%d\n", ifp->bsscfgidx);
--+
--+ memcpy(gtk_le.kck, gtk->kck, sizeof(gtk_le.kck));
--+ memcpy(gtk_le.kek, gtk->kek, sizeof(gtk_le.kek));
--+ memcpy(gtk_le.replay_counter, gtk->replay_ctr,
--+ sizeof(gtk_le.replay_counter));
--+
--+ ret = brcmf_fil_iovar_data_set(ifp, "gtk_key_info", >k_le,
--+ sizeof(gtk_le));
--+ if (ret < 0)
--+ brcmf_err("gtk_key_info iovar failed: ret=%d\n", ret);
--+
--+ return ret;
--+}
--+#endif
--+
--+static struct cfg80211_ops brcmf_cfg80211_ops = {
-- .add_virtual_intf = brcmf_cfg80211_add_iface,
-- .del_virtual_intf = brcmf_cfg80211_del_iface,
-- .change_virtual_intf = brcmf_cfg80211_change_iface,
--@@ -6139,19 +6170,18 @@ static void brcmf_wiphy_wowl_params(stru
-- {
-- #ifdef CONFIG_PM
-- struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
--- s32 err;
--- u32 wowl_cap;
--
-- if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_PNO)) {
--- err = brcmf_fil_iovar_int_get(ifp, "wowl_cap", &wowl_cap);
--- if (!err) {
--- if (wowl_cap & BRCMF_WOWL_PFN_FOUND) {
--- brcmf_wowlan_support.flags |=
--- WIPHY_WOWLAN_NET_DETECT;
--- init_waitqueue_head(&cfg->wowl.nd_data_wait);
--- }
--+ if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_WOWL_ND)) {
--+ brcmf_wowlan_support.flags |= WIPHY_WOWLAN_NET_DETECT;
--+ init_waitqueue_head(&cfg->wowl.nd_data_wait);
-- }
-- }
--+ if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_WOWL_GTK)) {
--+ brcmf_wowlan_support.flags |= WIPHY_WOWLAN_SUPPORTS_GTK_REKEY;
--+ brcmf_wowlan_support.flags |= WIPHY_WOWLAN_GTK_REKEY_FAILURE;
--+ }
--+
-- wiphy->wowlan = &brcmf_wowlan_support;
-- #endif
-- }
--@@ -6538,6 +6568,7 @@ struct brcmf_cfg80211_info *brcmf_cfg802
-- struct net_device *ndev = brcmf_get_ifp(drvr, 0)->ndev;
-- struct brcmf_cfg80211_info *cfg;
-- struct wiphy *wiphy;
--+ struct cfg80211_ops *ops;
-- struct brcmf_cfg80211_vif *vif;
-- struct brcmf_if *ifp;
-- s32 err = 0;
--@@ -6549,8 +6580,17 @@ struct brcmf_cfg80211_info *brcmf_cfg802
-- return NULL;
-- }
--
--+ ops = kzalloc(sizeof(*ops), GFP_KERNEL);
--+ if (!ops)
--+ return NULL;
--+
--+ memcpy(ops, &brcmf_cfg80211_ops, sizeof(*ops));
-- ifp = netdev_priv(ndev);
--- wiphy = wiphy_new(&wl_cfg80211_ops, sizeof(struct brcmf_cfg80211_info));
--+#ifdef CONFIG_PM
--+ if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_WOWL_GTK))
--+ ops->set_rekey_data = brcmf_cfg80211_set_rekey_data;
--+#endif
--+ wiphy = wiphy_new(ops, sizeof(struct brcmf_cfg80211_info));
-- if (!wiphy) {
-- brcmf_err("Could not allocate wiphy device\n");
-- return NULL;
--@@ -6560,6 +6600,7 @@ struct brcmf_cfg80211_info *brcmf_cfg802
--
-- cfg = wiphy_priv(wiphy);
-- cfg->wiphy = wiphy;
--+ cfg->ops = ops;
-- cfg->pub = drvr;
-- init_vif_event(&cfg->vif_event);
-- INIT_LIST_HEAD(&cfg->vif_list);
--@@ -6686,6 +6727,7 @@ priv_out:
-- ifp->vif = NULL;
-- wiphy_out:
-- brcmf_free_wiphy(wiphy);
--+ kfree(ops);
-- return NULL;
-- }
--
--@@ -6696,6 +6738,7 @@ void brcmf_cfg80211_detach(struct brcmf_
--
-- brcmf_btcoex_detach(cfg);
-- wiphy_unregister(cfg->wiphy);
--+ kfree(cfg->ops);
-- wl_deinit_priv(cfg);
-- brcmf_free_wiphy(cfg->wiphy);
-- }
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h
--@@ -256,6 +256,7 @@ struct brcmf_cfg80211_wowl {
-- * struct brcmf_cfg80211_info - dongle private data of cfg80211 interface
-- *
-- * @wiphy: wiphy object for cfg80211 interface.
--+ * @ops: pointer to copy of ops as registered with wiphy object.
-- * @conf: dongle configuration.
-- * @p2p: peer-to-peer specific information.
-- * @btcoex: Bluetooth coexistence information.
--@@ -288,6 +289,7 @@ struct brcmf_cfg80211_wowl {
-- */
-- struct brcmf_cfg80211_info {
-- struct wiphy *wiphy;
--+ struct cfg80211_ops *ops;
-- struct brcmf_cfg80211_conf *conf;
-- struct brcmf_p2p_info p2p;
-- struct brcmf_btcoex_info *btcoex;
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c
--@@ -136,6 +136,7 @@ void brcmf_feat_attach(struct brcmf_pub
-- {
-- struct brcmf_if *ifp = brcmf_get_ifp(drvr, 0);
-- struct brcmf_pno_macaddr_le pfn_mac;
--+ u32 wowl_cap;
-- s32 err;
--
-- brcmf_feat_firmware_capabilities(ifp);
--@@ -143,6 +144,17 @@ void brcmf_feat_attach(struct brcmf_pub
-- brcmf_feat_iovar_int_get(ifp, BRCMF_FEAT_PNO, "pfn");
-- if (drvr->bus_if->wowl_supported)
-- brcmf_feat_iovar_int_get(ifp, BRCMF_FEAT_WOWL, "wowl");
--+ if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_WOWL)) {
--+ err = brcmf_fil_iovar_int_get(ifp, "wowl_cap", &wowl_cap);
--+ if (!err) {
--+ if (wowl_cap & BRCMF_WOWL_PFN_FOUND)
--+ ifp->drvr->feat_flags |=
--+ BIT(BRCMF_FEAT_WOWL_ND);
--+ if (wowl_cap & BRCMF_WOWL_GTK_FAILURE)
--+ ifp->drvr->feat_flags |=
--+ BIT(BRCMF_FEAT_WOWL_GTK);
--+ }
--+ }
-- /* MBSS does not work for 43362 */
-- if (drvr->bus_if->chip == BRCM_CC_43362_CHIP_ID)
-- ifp->drvr->feat_flags &= ~BIT(BRCMF_FEAT_MBSS);
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.h
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.h
--@@ -27,6 +27,8 @@
-- * RSDB: Real Simultaneous Dual Band
-- * TDLS: Tunneled Direct Link Setup
-- * SCAN_RANDOM_MAC: Random MAC during (net detect) scheduled scan.
--+ * WOWL_ND: WOWL net detect (PNO)
--+ * WOWL_GTK: (WOWL) GTK rekeying offload
-- */
-- #define BRCMF_FEAT_LIST \
-- BRCMF_FEAT_DEF(MBSS) \
--@@ -36,7 +38,9 @@
-- BRCMF_FEAT_DEF(P2P) \
-- BRCMF_FEAT_DEF(RSDB) \
-- BRCMF_FEAT_DEF(TDLS) \
--- BRCMF_FEAT_DEF(SCAN_RANDOM_MAC)
--+ BRCMF_FEAT_DEF(SCAN_RANDOM_MAC) \
--+ BRCMF_FEAT_DEF(WOWL_ND) \
--+ BRCMF_FEAT_DEF(WOWL_GTK)
--
-- /*
-- * Quirks:
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h
--@@ -111,7 +111,9 @@
-- /* Wakeup if received matched secured pattern: */
-- #define BRCMF_WOWL_SECURE (1 << 25)
-- /* Wakeup on finding preferred network */
---#define BRCMF_WOWL_PFN_FOUND (1 << 26)
--+#define BRCMF_WOWL_PFN_FOUND (1 << 27)
--+/* Wakeup on receiving pairwise key EAP packets: */
--+#define WIPHY_WOWL_EAP_PK (1 << 28)
-- /* Link Down indication in WoWL mode: */
-- #define BRCMF_WOWL_LINKDOWN (1 << 31)
--
--@@ -136,6 +138,10 @@
--
-- #define BRCMF_MCSSET_LEN 16
--
--+#define BRCMF_RSN_KCK_LENGTH 16
--+#define BRCMF_RSN_KEK_LENGTH 16
--+#define BRCMF_RSN_REPLAY_LEN 8
--+
-- /* join preference types for join_pref iovar */
-- enum brcmf_join_pref_types {
-- BRCMF_JOIN_PREF_RSSI = 1,
--@@ -789,4 +795,17 @@ struct brcmf_pktcnt_le {
-- __le32 rx_ocast_good_pkt;
-- };
--
--+/**
--+ * struct brcmf_gtk_keyinfo_le - GTP rekey data
--+ *
--+ * @kck: key confirmation key.
--+ * @kek: key encryption key.
--+ * @replay_counter: replay counter.
--+ */
--+struct brcmf_gtk_keyinfo_le {
--+ u8 kck[BRCMF_RSN_KCK_LENGTH];
--+ u8 kek[BRCMF_RSN_KEK_LENGTH];
--+ u8 replay_counter[BRCMF_RSN_REPLAY_LEN];
--+};
--+
-- #endif /* FWIL_TYPES_H_ */
-diff --git a/package/kernel/mac80211/patches/344-0015-brcmfmac-move-platform-data-retrieval-code-to-common.patch b/package/kernel/mac80211/patches/344-0015-brcmfmac-move-platform-data-retrieval-code-to-common.patch
-deleted file mode 100644
-index 2685238925444a4d76cfb14d5ec85e69b9b686f1..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/344-0015-brcmfmac-move-platform-data-retrieval-code-to-common.patch
-+++ /dev/null
-@@ -1,385 +0,0 @@
--From: Hante Meuleman <meuleman@broadcom.com>
--Date: Wed, 17 Feb 2016 11:27:04 +0100
--Subject: [PATCH] brcmfmac: move platform data retrieval code to common
--
--In preparation of module parameters for all devices the module
--platform data retrieval is moved from sdio to common. It is still
--only used for sdio devices.
--
--Reviewed-by: Arend Van Spriel <arend@broadcom.com>
--Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
--Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
--Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
--Signed-off-by: Arend van Spriel <arend@broadcom.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
--@@ -27,8 +27,6 @@
-- #include <linux/mmc/sdio_func.h>
-- #include <linux/mmc/card.h>
-- #include <linux/mmc/host.h>
---#include <linux/platform_device.h>
---#include <linux/platform_data/brcmfmac-sdio.h>
-- #include <linux/pm_runtime.h>
-- #include <linux/suspend.h>
-- #include <linux/errno.h>
--@@ -46,7 +44,6 @@
-- #include "bus.h"
-- #include "debug.h"
-- #include "sdio.h"
---#include "of.h"
-- #include "core.h"
-- #include "common.h"
--
--@@ -106,18 +103,18 @@ static void brcmf_sdiod_dummy_irqhandler
--
-- int brcmf_sdiod_intr_register(struct brcmf_sdio_dev *sdiodev)
-- {
--+ struct brcmfmac_sdio_platform_data *pdata;
-- int ret = 0;
-- u8 data;
-- u32 addr, gpiocontrol;
-- unsigned long flags;
--
--- if ((sdiodev->pdata) && (sdiodev->pdata->oob_irq_supported)) {
--+ pdata = sdiodev->pdata;
--+ if ((pdata) && (pdata->oob_irq_supported)) {
-- brcmf_dbg(SDIO, "Enter, register OOB IRQ %d\n",
--- sdiodev->pdata->oob_irq_nr);
--- ret = request_irq(sdiodev->pdata->oob_irq_nr,
--- brcmf_sdiod_oob_irqhandler,
--- sdiodev->pdata->oob_irq_flags,
--- "brcmf_oob_intr",
--+ pdata->oob_irq_nr);
--+ ret = request_irq(pdata->oob_irq_nr, brcmf_sdiod_oob_irqhandler,
--+ pdata->oob_irq_flags, "brcmf_oob_intr",
-- &sdiodev->func[1]->dev);
-- if (ret != 0) {
-- brcmf_err("request_irq failed %d\n", ret);
--@@ -129,7 +126,7 @@ int brcmf_sdiod_intr_register(struct brc
-- sdiodev->irq_en = true;
-- spin_unlock_irqrestore(&sdiodev->irq_en_lock, flags);
--
--- ret = enable_irq_wake(sdiodev->pdata->oob_irq_nr);
--+ ret = enable_irq_wake(pdata->oob_irq_nr);
-- if (ret != 0) {
-- brcmf_err("enable_irq_wake failed %d\n", ret);
-- return ret;
--@@ -158,7 +155,7 @@ int brcmf_sdiod_intr_register(struct brc
--
-- /* redirect, configure and enable io for interrupt signal */
-- data = SDIO_SEPINT_MASK | SDIO_SEPINT_OE;
--- if (sdiodev->pdata->oob_irq_flags & IRQF_TRIGGER_HIGH)
--+ if (pdata->oob_irq_flags & IRQF_TRIGGER_HIGH)
-- data |= SDIO_SEPINT_ACT_HI;
-- brcmf_sdiod_regwb(sdiodev, SDIO_CCCR_BRCM_SEPINT, data, &ret);
--
--@@ -176,9 +173,12 @@ int brcmf_sdiod_intr_register(struct brc
--
-- int brcmf_sdiod_intr_unregister(struct brcmf_sdio_dev *sdiodev)
-- {
--+ struct brcmfmac_sdio_platform_data *pdata;
--+
-- brcmf_dbg(SDIO, "Entering\n");
--
--- if ((sdiodev->pdata) && (sdiodev->pdata->oob_irq_supported)) {
--+ pdata = sdiodev->pdata;
--+ if ((pdata) && (pdata->oob_irq_supported)) {
-- sdio_claim_host(sdiodev->func[1]);
-- brcmf_sdiod_regwb(sdiodev, SDIO_CCCR_BRCM_SEPINT, 0, NULL);
-- brcmf_sdiod_regwb(sdiodev, SDIO_CCCR_IENx, 0, NULL);
--@@ -187,11 +187,10 @@ int brcmf_sdiod_intr_unregister(struct b
-- if (sdiodev->oob_irq_requested) {
-- sdiodev->oob_irq_requested = false;
-- if (sdiodev->irq_wake) {
--- disable_irq_wake(sdiodev->pdata->oob_irq_nr);
--+ disable_irq_wake(pdata->oob_irq_nr);
-- sdiodev->irq_wake = false;
-- }
--- free_irq(sdiodev->pdata->oob_irq_nr,
--- &sdiodev->func[1]->dev);
--+ free_irq(pdata->oob_irq_nr, &sdiodev->func[1]->dev);
-- sdiodev->irq_en = false;
-- }
-- } else {
--@@ -1103,8 +1102,6 @@ static const struct sdio_device_id brcmf
-- };
-- MODULE_DEVICE_TABLE(sdio, brcmf_sdmmc_ids);
--
---static struct brcmfmac_sdio_platform_data *brcmfmac_sdio_pdata;
---
--
-- static void brcmf_sdiod_acpi_set_power_manageable(struct device *dev,
-- int val)
--@@ -1167,10 +1164,7 @@ static int brcmf_ops_sdio_probe(struct s
-- dev_set_drvdata(&func->dev, bus_if);
-- dev_set_drvdata(&sdiodev->func[1]->dev, bus_if);
-- sdiodev->dev = &sdiodev->func[1]->dev;
--- sdiodev->pdata = brcmfmac_sdio_pdata;
---
--- if (!sdiodev->pdata)
--- brcmf_of_probe(sdiodev);
--+ sdiodev->pdata = brcmf_get_module_param(sdiodev->dev);
--
-- #ifdef CONFIG_PM_SLEEP
-- /* wowl can be supported when KEEP_POWER is true and (WAKE_SDIO_IRQ
--@@ -1296,7 +1290,7 @@ static const struct dev_pm_ops brcmf_sdi
-- static struct sdio_driver brcmf_sdmmc_driver = {
-- .probe = brcmf_ops_sdio_probe,
-- .remove = brcmf_ops_sdio_remove,
--- .name = BRCMFMAC_SDIO_PDATA_NAME,
--+ .name = KBUILD_MODNAME,
-- .id_table = brcmf_sdmmc_ids,
-- .drv = {
-- .owner = THIS_MODULE,
--@@ -1306,37 +1300,6 @@ static struct sdio_driver brcmf_sdmmc_dr
-- },
-- };
--
---static int __init brcmf_sdio_pd_probe(struct platform_device *pdev)
---{
--- brcmf_dbg(SDIO, "Enter\n");
---
--- brcmfmac_sdio_pdata = dev_get_platdata(&pdev->dev);
---
--- if (brcmfmac_sdio_pdata->power_on)
--- brcmfmac_sdio_pdata->power_on();
---
--- return 0;
---}
---
---static int brcmf_sdio_pd_remove(struct platform_device *pdev)
---{
--- brcmf_dbg(SDIO, "Enter\n");
---
--- if (brcmfmac_sdio_pdata->power_off)
--- brcmfmac_sdio_pdata->power_off();
---
--- sdio_unregister_driver(&brcmf_sdmmc_driver);
---
--- return 0;
---}
---
---static struct platform_driver brcmf_sdio_pd = {
--- .remove = brcmf_sdio_pd_remove,
--- .driver = {
--- .name = BRCMFMAC_SDIO_PDATA_NAME,
--- }
---};
---
-- void brcmf_sdio_register(void)
-- {
-- int ret;
--@@ -1350,19 +1313,6 @@ void brcmf_sdio_exit(void)
-- {
-- brcmf_dbg(SDIO, "Enter\n");
--
--- if (brcmfmac_sdio_pdata)
--- platform_driver_unregister(&brcmf_sdio_pd);
--- else
--- sdio_unregister_driver(&brcmf_sdmmc_driver);
--+ sdio_unregister_driver(&brcmf_sdmmc_driver);
-- }
--
---void __init brcmf_sdio_init(void)
---{
--- int ret;
---
--- brcmf_dbg(SDIO, "Enter\n");
---
--- ret = platform_driver_probe(&brcmf_sdio_pd, brcmf_sdio_pd_probe);
--- if (ret == -ENODEV)
--- brcmf_dbg(SDIO, "No platform data available.\n");
---}
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
--@@ -27,6 +27,7 @@
-- #include "fwil_types.h"
-- #include "tracepoint.h"
-- #include "common.h"
--+#include "of.h"
--
-- MODULE_AUTHOR("Broadcom Corporation");
-- MODULE_DESCRIPTION("Broadcom 802.11 wireless LAN fullmac driver.");
--@@ -79,6 +80,7 @@ module_param_named(ignore_probe_fail, br
-- MODULE_PARM_DESC(ignore_probe_fail, "always succeed probe for debugging");
-- #endif
--
--+static struct brcmfmac_sdio_platform_data *brcmfmac_pdata;
-- struct brcmf_mp_global_t brcmf_mp_global;
--
-- int brcmf_c_preinit_dcmds(struct brcmf_if *ifp)
--@@ -231,6 +233,13 @@ static void brcmf_mp_attach(void)
-- BRCMF_FW_ALTPATH_LEN);
-- }
--
--+struct brcmfmac_sdio_platform_data *brcmf_get_module_param(struct device *dev)
--+{
--+ if (!brcmfmac_pdata)
--+ brcmf_of_probe(dev, &brcmfmac_pdata);
--+ return brcmfmac_pdata;
--+}
--+
-- int brcmf_mp_device_attach(struct brcmf_pub *drvr)
-- {
-- drvr->settings = kzalloc(sizeof(*drvr->settings), GFP_ATOMIC);
--@@ -253,6 +262,35 @@ void brcmf_mp_device_detach(struct brcmf
-- kfree(drvr->settings);
-- }
--
--+static int __init brcmf_common_pd_probe(struct platform_device *pdev)
--+{
--+ brcmf_dbg(INFO, "Enter\n");
--+
--+ brcmfmac_pdata = dev_get_platdata(&pdev->dev);
--+
--+ if (brcmfmac_pdata->power_on)
--+ brcmfmac_pdata->power_on();
--+
--+ return 0;
--+}
--+
--+static int brcmf_common_pd_remove(struct platform_device *pdev)
--+{
--+ brcmf_dbg(INFO, "Enter\n");
--+
--+ if (brcmfmac_pdata->power_off)
--+ brcmfmac_pdata->power_off();
--+
--+ return 0;
--+}
--+
--+static struct platform_driver brcmf_pd = {
--+ .remove = brcmf_common_pd_remove,
--+ .driver = {
--+ .name = BRCMFMAC_SDIO_PDATA_NAME,
--+ }
--+};
--+
-- static int __init brcmfmac_module_init(void)
-- {
-- int err;
--@@ -260,16 +298,21 @@ static int __init brcmfmac_module_init(v
-- /* Initialize debug system first */
-- brcmf_debugfs_init();
--
---#ifdef CPTCFG_BRCMFMAC_SDIO
--- brcmf_sdio_init();
---#endif
--+ /* Get the platform data (if available) for our devices */
--+ err = platform_driver_probe(&brcmf_pd, brcmf_common_pd_probe);
--+ if (err == -ENODEV)
--+ brcmf_dbg(INFO, "No platform data available.\n");
--+
-- /* Initialize global module paramaters */
-- brcmf_mp_attach();
--
-- /* Continue the initialization by registering the different busses */
-- err = brcmf_core_init();
--- if (err)
--+ if (err) {
-- brcmf_debugfs_exit();
--+ if (brcmfmac_pdata)
--+ platform_driver_unregister(&brcmf_pd);
--+ }
--
-- return err;
-- }
--@@ -277,6 +320,8 @@ static int __init brcmfmac_module_init(v
-- static void __exit brcmfmac_module_exit(void)
-- {
-- brcmf_core_exit();
--+ if (brcmfmac_pdata)
--+ platform_driver_unregister(&brcmf_pd);
-- brcmf_debugfs_exit();
-- }
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.h
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.h
--@@ -15,6 +15,8 @@
-- #ifndef BRCMFMAC_COMMON_H
-- #define BRCMFMAC_COMMON_H
--
--+#include <linux/platform_device.h>
--+#include <linux/platform_data/brcmfmac-sdio.h>
-- #include "fwil_types.h"
--
-- extern const u8 ALLFFMAC[ETH_ALEN];
--@@ -89,6 +91,7 @@ struct brcmf_mp_device {
-- struct cc_translate *country_codes;
-- };
--
--+struct brcmfmac_sdio_platform_data *brcmf_get_module_param(struct device *dev);
-- int brcmf_mp_device_attach(struct brcmf_pub *drvr);
-- void brcmf_mp_device_detach(struct brcmf_pub *drvr);
-- #ifdef DEBUG
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c
--@@ -16,17 +16,16 @@
-- #include <linux/init.h>
-- #include <linux/of.h>
-- #include <linux/of_irq.h>
---#include <linux/mmc/card.h>
---#include <linux/platform_data/brcmfmac-sdio.h>
---#include <linux/mmc/sdio_func.h>
--
-- #include <defs.h>
-- #include "debug.h"
---#include "sdio.h"
--+#include "core.h"
--+#include "common.h"
--+#include "of.h"
--
---void brcmf_of_probe(struct brcmf_sdio_dev *sdiodev)
--+void
--+brcmf_of_probe(struct device *dev, struct brcmfmac_sdio_platform_data **sdio)
-- {
--- struct device *dev = sdiodev->dev;
-- struct device_node *np = dev->of_node;
-- int irq;
-- u32 irqf;
--@@ -35,12 +34,12 @@ void brcmf_of_probe(struct brcmf_sdio_de
-- if (!np || !of_device_is_compatible(np, "brcm,bcm4329-fmac"))
-- return;
--
--- sdiodev->pdata = devm_kzalloc(dev, sizeof(*sdiodev->pdata), GFP_KERNEL);
--- if (!sdiodev->pdata)
--+ *sdio = devm_kzalloc(dev, sizeof(*sdio), GFP_KERNEL);
--+ if (!(*sdio))
-- return;
--
-- if (of_property_read_u32(np, "brcm,drive-strength", &val) == 0)
--- sdiodev->pdata->drive_strength = val;
--+ (*sdio)->drive_strength = val;
--
-- /* make sure there are interrupts defined in the node */
-- if (!of_find_property(np, "interrupts", NULL))
--@@ -53,7 +52,7 @@ void brcmf_of_probe(struct brcmf_sdio_de
-- }
-- irqf = irqd_get_trigger_type(irq_get_irq_data(irq));
--
--- sdiodev->pdata->oob_irq_supported = true;
--- sdiodev->pdata->oob_irq_nr = irq;
--- sdiodev->pdata->oob_irq_flags = irqf;
--+ (*sdio)->oob_irq_supported = true;
--+ (*sdio)->oob_irq_nr = irq;
--+ (*sdio)->oob_irq_flags = irqf;
-- }
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.h
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.h
--@@ -14,9 +14,11 @@
-- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-- */
-- #ifdef CONFIG_OF
---void brcmf_of_probe(struct brcmf_sdio_dev *sdiodev);
--+void
--+brcmf_of_probe(struct device *dev, struct brcmfmac_sdio_platform_data **sdio);
-- #else
---static void brcmf_of_probe(struct brcmf_sdio_dev *sdiodev)
--+static void brcmf_of_probe(struct device *dev,
--+ struct brcmfmac_sdio_platform_data **sdio)
-- {
-- }
-- #endif /* CONFIG_OF */
-diff --git a/package/kernel/mac80211/patches/344-0016-brcmfmac-keep-ARP-and-ND-offload-enabled-during-WOWL.patch b/package/kernel/mac80211/patches/344-0016-brcmfmac-keep-ARP-and-ND-offload-enabled-during-WOWL.patch
-deleted file mode 100644
-index 4e789cfc5a6cfc82c584bb59bd7dd4a7a058377b..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/344-0016-brcmfmac-keep-ARP-and-ND-offload-enabled-during-WOWL.patch
-+++ /dev/null
-@@ -1,69 +0,0 @@
--From: Hante Meuleman <meuleman@broadcom.com>
--Date: Wed, 17 Feb 2016 11:27:05 +0100
--Subject: [PATCH] brcmfmac: keep ARP and ND offload enabled during WOWL
--
--Currently ARP and ND (IPv6 Neigbor Discovery) offload get disabled
--on entering suspend. However when firmwares support the wowl_cap
--iovar then these offload routines can be kept enabled as they
--will work during WOWL as well.
--
--Reviewed-by: Arend Van Spriel <arend@broadcom.com>
--Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
--Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
--Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
--Signed-off-by: Arend van Spriel <arend@broadcom.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--@@ -3556,7 +3556,8 @@ static s32 brcmf_cfg80211_resume(struct
-- brcmf_report_wowl_wakeind(wiphy, ifp);
-- brcmf_fil_iovar_int_set(ifp, "wowl_clear", 0);
-- brcmf_config_wowl_pattern(ifp, "clr", NULL, 0, NULL, 0);
--- brcmf_configure_arp_nd_offload(ifp, true);
--+ if (!brcmf_feat_is_enabled(ifp, BRCMF_FEAT_WOWL_ARP_ND))
--+ brcmf_configure_arp_nd_offload(ifp, true);
-- brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_PM,
-- cfg->wowl.pre_pmmode);
-- cfg->wowl.active = false;
--@@ -3580,7 +3581,8 @@ static void brcmf_configure_wowl(struct
--
-- brcmf_dbg(TRACE, "Suspend, wowl config.\n");
--
--- brcmf_configure_arp_nd_offload(ifp, false);
--+ if (!brcmf_feat_is_enabled(ifp, BRCMF_FEAT_WOWL_ARP_ND))
--+ brcmf_configure_arp_nd_offload(ifp, false);
-- brcmf_fil_cmd_int_get(ifp, BRCMF_C_GET_PM, &cfg->wowl.pre_pmmode);
-- brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_PM, PM_MAX);
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c
--@@ -147,6 +147,7 @@ void brcmf_feat_attach(struct brcmf_pub
-- if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_WOWL)) {
-- err = brcmf_fil_iovar_int_get(ifp, "wowl_cap", &wowl_cap);
-- if (!err) {
--+ ifp->drvr->feat_flags |= BIT(BRCMF_FEAT_WOWL_ARP_ND);
-- if (wowl_cap & BRCMF_WOWL_PFN_FOUND)
-- ifp->drvr->feat_flags |=
-- BIT(BRCMF_FEAT_WOWL_ND);
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.h
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.h
--@@ -29,6 +29,7 @@
-- * SCAN_RANDOM_MAC: Random MAC during (net detect) scheduled scan.
-- * WOWL_ND: WOWL net detect (PNO)
-- * WOWL_GTK: (WOWL) GTK rekeying offload
--+ * WOWL_ARP_ND: ARP and Neighbor Discovery offload support during WOWL.
-- */
-- #define BRCMF_FEAT_LIST \
-- BRCMF_FEAT_DEF(MBSS) \
--@@ -40,7 +41,8 @@
-- BRCMF_FEAT_DEF(TDLS) \
-- BRCMF_FEAT_DEF(SCAN_RANDOM_MAC) \
-- BRCMF_FEAT_DEF(WOWL_ND) \
--- BRCMF_FEAT_DEF(WOWL_GTK)
--+ BRCMF_FEAT_DEF(WOWL_GTK) \
--+ BRCMF_FEAT_DEF(WOWL_ARP_ND)
--
-- /*
-- * Quirks:
-diff --git a/package/kernel/mac80211/patches/344-0017-brcmfmac-switch-to-new-platform-data.patch b/package/kernel/mac80211/patches/344-0017-brcmfmac-switch-to-new-platform-data.patch
-deleted file mode 100644
-index 37b68552cc8ce99d021930f5fc78692a7ba92f06..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/344-0017-brcmfmac-switch-to-new-platform-data.patch
-+++ /dev/null
-@@ -1,734 +0,0 @@
--From: Hante Meuleman <meuleman@broadcom.com>
--Date: Wed, 17 Feb 2016 11:27:07 +0100
--Subject: [PATCH] brcmfmac: switch to new platform data
--
--Platform data is only available for sdio. With this patch a new
--platform data structure is being used which allows for platform
--data for any device and configurable per device. This patch only
--switches to the new structure and adds support for SDIO devices.
--
--Reviewed-by: Arend Van Spriel <arend@broadcom.com>
--Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
--Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
--Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
--Signed-off-by: Arend van Spriel <arend@broadcom.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
--@@ -103,7 +103,7 @@ static void brcmf_sdiod_dummy_irqhandler
--
-- int brcmf_sdiod_intr_register(struct brcmf_sdio_dev *sdiodev)
-- {
--- struct brcmfmac_sdio_platform_data *pdata;
--+ struct brcmfmac_sdio_pd *pdata;
-- int ret = 0;
-- u8 data;
-- u32 addr, gpiocontrol;
--@@ -173,7 +173,7 @@ int brcmf_sdiod_intr_register(struct brc
--
-- int brcmf_sdiod_intr_unregister(struct brcmf_sdio_dev *sdiodev)
-- {
--- struct brcmfmac_sdio_platform_data *pdata;
--+ struct brcmfmac_sdio_pd *pdata;
--
-- brcmf_dbg(SDIO, "Entering\n");
--
--@@ -1164,17 +1164,6 @@ static int brcmf_ops_sdio_probe(struct s
-- dev_set_drvdata(&func->dev, bus_if);
-- dev_set_drvdata(&sdiodev->func[1]->dev, bus_if);
-- sdiodev->dev = &sdiodev->func[1]->dev;
--- sdiodev->pdata = brcmf_get_module_param(sdiodev->dev);
---
---#ifdef CONFIG_PM_SLEEP
--- /* wowl can be supported when KEEP_POWER is true and (WAKE_SDIO_IRQ
--- * is true or when platform data OOB irq is true).
--- */
--- if ((sdio_get_host_pm_caps(sdiodev->func[1]) & MMC_PM_KEEP_POWER) &&
--- ((sdio_get_host_pm_caps(sdiodev->func[1]) & MMC_PM_WAKE_SDIO_IRQ) ||
--- (sdiodev->pdata && sdiodev->pdata->oob_irq_supported)))
--- bus_if->wowl_supported = true;
---#endif
--
-- brcmf_sdiod_change_state(sdiodev, BRCMF_SDIOD_DOWN);
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--@@ -6459,8 +6459,8 @@ int brcmf_cfg80211_wait_vif_event(struct
-- static s32 brcmf_translate_country_code(struct brcmf_pub *drvr, char alpha2[2],
-- struct brcmf_fil_country_le *ccreq)
-- {
--- struct cc_translate *country_codes;
--- struct cc_entry *cc;
--+ struct brcmfmac_pd_cc *country_codes;
--+ struct brcmfmac_pd_cc_entry *cc;
-- s32 found_index;
-- int i;
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
--@@ -80,7 +80,7 @@ module_param_named(ignore_probe_fail, br
-- MODULE_PARM_DESC(ignore_probe_fail, "always succeed probe for debugging");
-- #endif
--
---static struct brcmfmac_sdio_platform_data *brcmfmac_pdata;
--+static struct brcmfmac_platform_data *brcmfmac_pdata;
-- struct brcmf_mp_global_t brcmf_mp_global;
--
-- int brcmf_c_preinit_dcmds(struct brcmf_if *ifp)
--@@ -229,15 +229,46 @@ void __brcmf_dbg(u32 level, const char *
--
-- static void brcmf_mp_attach(void)
-- {
--+ /* If module param firmware path is set then this will always be used,
--+ * if not set then if available use the platform data version. To make
--+ * sure it gets initialized at all, always copy the module param version
--+ */
-- strlcpy(brcmf_mp_global.firmware_path, brcmf_firmware_path,
-- BRCMF_FW_ALTPATH_LEN);
--+ if ((brcmfmac_pdata) && (brcmfmac_pdata->fw_alternative_path) &&
--+ (brcmf_mp_global.firmware_path[0] == '\0')) {
--+ strlcpy(brcmf_mp_global.firmware_path,
--+ brcmfmac_pdata->fw_alternative_path,
--+ BRCMF_FW_ALTPATH_LEN);
--+ }
-- }
--
---struct brcmfmac_sdio_platform_data *brcmf_get_module_param(struct device *dev)
---{
--- if (!brcmfmac_pdata)
--- brcmf_of_probe(dev, &brcmfmac_pdata);
--- return brcmfmac_pdata;
--+struct brcmfmac_sdio_pd *brcmf_get_module_param(struct device *dev,
--+ enum brcmf_bus_type bus_type,
--+ u32 chip, u32 chiprev)
--+{
--+ struct brcmfmac_sdio_pd *pdata;
--+ struct brcmfmac_pd_device *device_pd;
--+ int i;
--+
--+ if (brcmfmac_pdata) {
--+ for (i = 0; i < brcmfmac_pdata->device_count; i++) {
--+ device_pd = &brcmfmac_pdata->devices[i];
--+ if ((device_pd->bus_type == bus_type) &&
--+ (device_pd->id == chip) &&
--+ ((device_pd->rev == chiprev) ||
--+ (device_pd->rev == -1))) {
--+ brcmf_dbg(INFO, "Platform data for device found\n");
--+ if (device_pd->bus_type == BRCMF_BUSTYPE_SDIO)
--+ return &device_pd->bus.sdio;
--+ break;
--+ }
--+ }
--+ }
--+ pdata = NULL;
--+ brcmf_of_probe(dev, &pdata);
--+
--+ return pdata;
-- }
--
-- int brcmf_mp_device_attach(struct brcmf_pub *drvr)
--@@ -287,7 +318,7 @@ static int brcmf_common_pd_remove(struct
-- static struct platform_driver brcmf_pd = {
-- .remove = brcmf_common_pd_remove,
-- .driver = {
--- .name = BRCMFMAC_SDIO_PDATA_NAME,
--+ .name = BRCMFMAC_PDATA_NAME,
-- }
-- };
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.h
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.h
--@@ -16,7 +16,7 @@
-- #define BRCMFMAC_COMMON_H
--
-- #include <linux/platform_device.h>
---#include <linux/platform_data/brcmfmac-sdio.h>
--+#include <linux/platform_data/brcmfmac.h>
-- #include "fwil_types.h"
--
-- extern const u8 ALLFFMAC[ETH_ALEN];
--@@ -43,33 +43,6 @@ struct brcmf_mp_global_t {
-- extern struct brcmf_mp_global_t brcmf_mp_global;
--
-- /**
--- * struct cc_entry - Struct for translating user space country code (iso3166) to
--- * firmware country code and revision.
--- *
--- * @iso3166: iso3166 alpha 2 country code string.
--- * @cc: firmware country code string.
--- * @rev: firmware country code revision.
--- */
---struct cc_entry {
--- char iso3166[BRCMF_COUNTRY_BUF_SZ];
--- char cc[BRCMF_COUNTRY_BUF_SZ];
--- s32 rev;
---};
---
---/**
--- * struct cc_translate - Struct for translating country codes as set by user
--- * space to a country code and rev which can be used by
--- * firmware.
--- *
--- * @table_size: number of entries in table (> 0)
--- * @table: dynamic array of 1 or more elements with translation information.
--- */
---struct cc_translate {
--- int table_size;
--- struct cc_entry table[0];
---};
---
---/**
-- * struct brcmf_mp_device - Device module paramaters.
-- *
-- * @sdiod_txglomsz: SDIO txglom size.
--@@ -88,10 +61,12 @@ struct brcmf_mp_device {
-- int fcmode;
-- bool roamoff;
-- bool ignore_probe_fail;
--- struct cc_translate *country_codes;
--+ struct brcmfmac_pd_cc *country_codes;
-- };
--
---struct brcmfmac_sdio_platform_data *brcmf_get_module_param(struct device *dev);
--+struct brcmfmac_sdio_pd *brcmf_get_module_param(struct device *dev,
--+ enum brcmf_bus_type bus_type,
--+ u32 chip, u32 chiprev);
-- int brcmf_mp_device_attach(struct brcmf_pub *drvr);
-- void brcmf_mp_device_detach(struct brcmf_pub *drvr);
-- #ifdef DEBUG
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c
--@@ -23,8 +23,7 @@
-- #include "common.h"
-- #include "of.h"
--
---void
---brcmf_of_probe(struct device *dev, struct brcmfmac_sdio_platform_data **sdio)
--+void brcmf_of_probe(struct device *dev, struct brcmfmac_sdio_pd **sdio)
-- {
-- struct device_node *np = dev->of_node;
-- int irq;
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.h
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.h
--@@ -15,10 +15,9 @@
-- */
-- #ifdef CONFIG_OF
-- void
---brcmf_of_probe(struct device *dev, struct brcmfmac_sdio_platform_data **sdio);
--+brcmf_of_probe(struct device *dev, struct brcmfmac_sdio_pd **sdio);
-- #else
---static void brcmf_of_probe(struct device *dev,
--- struct brcmfmac_sdio_platform_data **sdio)
--+static void brcmf_of_probe(struct device *dev, struct brcmfmac_sdio_pd **sdio)
-- {
-- }
-- #endif /* CONFIG_OF */
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
--@@ -33,8 +33,6 @@
-- #include <linux/bcma/bcma.h>
-- #include <linux/debugfs.h>
-- #include <linux/vmalloc.h>
---#include <linux/platform_data/brcmfmac-sdio.h>
---#include <linux/moduleparam.h>
-- #include <asm/unaligned.h>
-- #include <defs.h>
-- #include <brcmu_wifi.h>
--@@ -44,6 +42,8 @@
-- #include "sdio.h"
-- #include "chip.h"
-- #include "firmware.h"
--+#include "core.h"
--+#include "common.h"
--
-- #define DCMD_RESP_TIMEOUT msecs_to_jiffies(2500)
-- #define CTL_DONE_TIMEOUT msecs_to_jiffies(2500)
--@@ -3775,26 +3775,28 @@ static const struct brcmf_buscore_ops br
-- static bool
-- brcmf_sdio_probe_attach(struct brcmf_sdio *bus)
-- {
--+ struct brcmf_sdio_dev *sdiodev;
-- u8 clkctl = 0;
-- int err = 0;
-- int reg_addr;
-- u32 reg_val;
-- u32 drivestrength;
--
--- sdio_claim_host(bus->sdiodev->func[1]);
--+ sdiodev = bus->sdiodev;
--+ sdio_claim_host(sdiodev->func[1]);
--
-- pr_debug("F1 signature read @0x18000000=0x%4x\n",
--- brcmf_sdiod_regrl(bus->sdiodev, SI_ENUM_BASE, NULL));
--+ brcmf_sdiod_regrl(sdiodev, SI_ENUM_BASE, NULL));
--
-- /*
-- * Force PLL off until brcmf_chip_attach()
-- * programs PLL control regs
-- */
--
--- brcmf_sdiod_regwb(bus->sdiodev, SBSDIO_FUNC1_CHIPCLKCSR,
--+ brcmf_sdiod_regwb(sdiodev, SBSDIO_FUNC1_CHIPCLKCSR,
-- BRCMF_INIT_CLKCTL1, &err);
-- if (!err)
--- clkctl = brcmf_sdiod_regrb(bus->sdiodev,
--+ clkctl = brcmf_sdiod_regrb(sdiodev,
-- SBSDIO_FUNC1_CHIPCLKCSR, &err);
--
-- if (err || ((clkctl & ~SBSDIO_AVBITS) != BRCMF_INIT_CLKCTL1)) {
--@@ -3803,50 +3805,77 @@ brcmf_sdio_probe_attach(struct brcmf_sdi
-- goto fail;
-- }
--
--- bus->ci = brcmf_chip_attach(bus->sdiodev, &brcmf_sdio_buscore_ops);
--+ bus->ci = brcmf_chip_attach(sdiodev, &brcmf_sdio_buscore_ops);
-- if (IS_ERR(bus->ci)) {
-- brcmf_err("brcmf_chip_attach failed!\n");
-- bus->ci = NULL;
-- goto fail;
-- }
--+ sdiodev->pdata = brcmf_get_module_param(sdiodev->dev,
--+ BRCMF_BUSTYPE_SDIO,
--+ bus->ci->chip,
--+ bus->ci->chiprev);
--+ /* platform specific configuration:
--+ * alignments must be at least 4 bytes for ADMA
--+ */
--+ bus->head_align = ALIGNMENT;
--+ bus->sgentry_align = ALIGNMENT;
--+ if (sdiodev->pdata) {
--+ if (sdiodev->pdata->sd_head_align > ALIGNMENT)
--+ bus->head_align = sdiodev->pdata->sd_head_align;
--+ if (sdiodev->pdata->sd_sgentry_align > ALIGNMENT)
--+ bus->sgentry_align = sdiodev->pdata->sd_sgentry_align;
--+ }
--+ /* allocate scatter-gather table. sg support
--+ * will be disabled upon allocation failure.
--+ */
--+ brcmf_sdiod_sgtable_alloc(sdiodev);
--+
--+#ifdef CONFIG_PM_SLEEP
--+ /* wowl can be supported when KEEP_POWER is true and (WAKE_SDIO_IRQ
--+ * is true or when platform data OOB irq is true).
--+ */
--+ if ((sdio_get_host_pm_caps(sdiodev->func[1]) & MMC_PM_KEEP_POWER) &&
--+ ((sdio_get_host_pm_caps(sdiodev->func[1]) & MMC_PM_WAKE_SDIO_IRQ) ||
--+ (sdiodev->pdata && sdiodev->pdata->oob_irq_supported)))
--+ sdiodev->bus_if->wowl_supported = true;
--+#endif
--
-- if (brcmf_sdio_kso_init(bus)) {
-- brcmf_err("error enabling KSO\n");
-- goto fail;
-- }
--
--- if ((bus->sdiodev->pdata) && (bus->sdiodev->pdata->drive_strength))
--- drivestrength = bus->sdiodev->pdata->drive_strength;
--+ if ((sdiodev->pdata) && (sdiodev->pdata->drive_strength))
--+ drivestrength = sdiodev->pdata->drive_strength;
-- else
-- drivestrength = DEFAULT_SDIO_DRIVE_STRENGTH;
--- brcmf_sdio_drivestrengthinit(bus->sdiodev, bus->ci, drivestrength);
--+ brcmf_sdio_drivestrengthinit(sdiodev, bus->ci, drivestrength);
--
-- /* Set card control so an SDIO card reset does a WLAN backplane reset */
--- reg_val = brcmf_sdiod_regrb(bus->sdiodev,
--- SDIO_CCCR_BRCM_CARDCTRL, &err);
--+ reg_val = brcmf_sdiod_regrb(sdiodev, SDIO_CCCR_BRCM_CARDCTRL, &err);
-- if (err)
-- goto fail;
--
-- reg_val |= SDIO_CCCR_BRCM_CARDCTRL_WLANRESET;
--
--- brcmf_sdiod_regwb(bus->sdiodev,
--- SDIO_CCCR_BRCM_CARDCTRL, reg_val, &err);
--+ brcmf_sdiod_regwb(sdiodev, SDIO_CCCR_BRCM_CARDCTRL, reg_val, &err);
-- if (err)
-- goto fail;
--
-- /* set PMUControl so a backplane reset does PMU state reload */
-- reg_addr = CORE_CC_REG(brcmf_chip_get_pmu(bus->ci)->base, pmucontrol);
--- reg_val = brcmf_sdiod_regrl(bus->sdiodev, reg_addr, &err);
--+ reg_val = brcmf_sdiod_regrl(sdiodev, reg_addr, &err);
-- if (err)
-- goto fail;
--
-- reg_val |= (BCMA_CC_PMU_CTL_RES_RELOAD << BCMA_CC_PMU_CTL_RES_SHIFT);
--
--- brcmf_sdiod_regwl(bus->sdiodev, reg_addr, reg_val, &err);
--+ brcmf_sdiod_regwl(sdiodev, reg_addr, reg_val, &err);
-- if (err)
-- goto fail;
--
--- sdio_release_host(bus->sdiodev->func[1]);
--+ sdio_release_host(sdiodev->func[1]);
--
-- brcmu_pktq_init(&bus->txq, (PRIOMASK + 1), TXQLEN);
--
--@@ -3867,7 +3896,7 @@ brcmf_sdio_probe_attach(struct brcmf_sdi
-- return true;
--
-- fail:
--- sdio_release_host(bus->sdiodev->func[1]);
--+ sdio_release_host(sdiodev->func[1]);
-- return false;
-- }
--
--@@ -4045,18 +4074,6 @@ struct brcmf_sdio *brcmf_sdio_probe(stru
-- bus->txminmax = BRCMF_TXMINMAX;
-- bus->tx_seq = SDPCM_SEQ_WRAP - 1;
--
--- /* platform specific configuration:
--- * alignments must be at least 4 bytes for ADMA
--- */
--- bus->head_align = ALIGNMENT;
--- bus->sgentry_align = ALIGNMENT;
--- if (sdiodev->pdata) {
--- if (sdiodev->pdata->sd_head_align > ALIGNMENT)
--- bus->head_align = sdiodev->pdata->sd_head_align;
--- if (sdiodev->pdata->sd_sgentry_align > ALIGNMENT)
--- bus->sgentry_align = sdiodev->pdata->sd_sgentry_align;
--- }
---
-- /* single-threaded workqueue */
-- wq = alloc_ordered_workqueue("brcmf_wq/%s", WQ_MEM_RECLAIM,
-- dev_name(&sdiodev->func[1]->dev));
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h
--@@ -184,7 +184,7 @@ struct brcmf_sdio_dev {
-- struct brcmf_sdio *bus;
-- struct device *dev;
-- struct brcmf_bus *bus_if;
--- struct brcmfmac_sdio_platform_data *pdata;
--+ struct brcmfmac_sdio_pd *pdata;
-- bool oob_irq_requested;
-- bool irq_en; /* irq enable flags */
-- spinlock_t irq_en_lock;
----- a/include/linux/platform_data/brcmfmac-sdio.h
--+++ /dev/null
--@@ -1,135 +0,0 @@
---/*
--- * Copyright (c) 2013 Broadcom Corporation
--- *
--- * Permission to use, copy, modify, and/or distribute this software for any
--- * purpose with or without fee is hereby granted, provided that the above
--- * copyright notice and this permission notice appear in all copies.
--- *
--- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
--- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
--- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
--- * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
--- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
--- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
--- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
--- */
---
---#ifndef _LINUX_BRCMFMAC_PLATFORM_H
---#define _LINUX_BRCMFMAC_PLATFORM_H
---
---/*
--- * Platform specific driver functions and data. Through the platform specific
--- * device data functions can be provided to help the brcmfmac driver to
--- * operate with the device in combination with the used platform.
--- *
--- * Use the platform data in the following (similar) way:
--- *
--- *
---#include <brcmfmac_platform.h>
---
---
---static void brcmfmac_power_on(void)
---{
---}
---
---static void brcmfmac_power_off(void)
---{
---}
---
---static void brcmfmac_reset(void)
---{
---}
---
---static struct brcmfmac_sdio_platform_data brcmfmac_sdio_pdata = {
--- .power_on = brcmfmac_power_on,
--- .power_off = brcmfmac_power_off,
--- .reset = brcmfmac_reset
---};
---
---static struct platform_device brcmfmac_device = {
--- .name = BRCMFMAC_SDIO_PDATA_NAME,
--- .id = PLATFORM_DEVID_NONE,
--- .dev.platform_data = &brcmfmac_sdio_pdata
---};
---
---void __init brcmfmac_init_pdata(void)
---{
--- brcmfmac_sdio_pdata.oob_irq_supported = true;
--- brcmfmac_sdio_pdata.oob_irq_nr = gpio_to_irq(GPIO_BRCMF_SDIO_OOB);
--- brcmfmac_sdio_pdata.oob_irq_flags = IORESOURCE_IRQ |
--- IORESOURCE_IRQ_HIGHLEVEL;
--- platform_device_register(&brcmfmac_device);
---}
--- *
--- *
--- * Note: the brcmfmac can be loaded as module or be statically built-in into
--- * the kernel. If built-in then do note that it uses module_init (and
--- * module_exit) routines which equal device_initcall. So if you intend to
--- * create a module with the platform specific data for the brcmfmac and have
--- * it built-in to the kernel then use a higher initcall then device_initcall
--- * (see init.h). If this is not done then brcmfmac will load without problems
--- * but will not pickup the platform data.
--- *
--- * When the driver does not "detect" platform driver data then it will continue
--- * without reporting anything and just assume there is no data needed. Which is
--- * probably true for most platforms.
--- *
--- * Explanation of the platform_data fields:
--- *
--- * drive_strength: is the preferred drive_strength to be used for the SDIO
--- * pins. If 0 then a default value will be used. This is the target drive
--- * strength, the exact drive strength which will be used depends on the
--- * capabilities of the device.
--- *
--- * oob_irq_supported: does the board have support for OOB interrupts. SDIO
--- * in-band interrupts are relatively slow and for having less overhead on
--- * interrupt processing an out of band interrupt can be used. If the HW
--- * supports this then enable this by setting this field to true and configure
--- * the oob related fields.
--- *
--- * oob_irq_nr, oob_irq_flags: the OOB interrupt information. The values are
--- * used for registering the irq using request_irq function.
--- *
--- * broken_sg_support: flag for broken sg list support of SDIO host controller.
--- * Set this to true if the SDIO host controller has higher align requirement
--- * than 32 bytes for each scatterlist item.
--- *
--- * sd_head_align: alignment requirement for start of data buffer
--- *
--- * sd_sgentry_align: length alignment requirement for each sg entry
--- *
--- * power_on: This function is called by the brcmfmac when the module gets
--- * loaded. This can be particularly useful for low power devices. The platform
--- * spcific routine may for example decide to power up the complete device.
--- * If there is no use-case for this function then provide NULL.
--- *
--- * power_off: This function is called by the brcmfmac when the module gets
--- * unloaded. At this point the device can be powered down or otherwise be reset.
--- * So if an actual power_off is not supported but reset is then reset the device
--- * when this function gets called. This can be particularly useful for low power
--- * devices. If there is no use-case for this function (either power-down or
--- * reset) then provide NULL.
--- *
--- * reset: This function can get called if the device communication broke down.
--- * This functionality is particularly useful in case of SDIO type devices. It is
--- * possible to reset a dongle via sdio data interface, but it requires that
--- * this is fully functional. This function is chip/module specific and this
--- * function should return only after the complete reset has completed.
--- */
---
---#define BRCMFMAC_SDIO_PDATA_NAME "brcmfmac_sdio"
---
---struct brcmfmac_sdio_platform_data {
--- unsigned int drive_strength;
--- bool oob_irq_supported;
--- unsigned int oob_irq_nr;
--- unsigned long oob_irq_flags;
--- bool broken_sg_support;
--- unsigned short sd_head_align;
--- unsigned short sd_sgentry_align;
--- void (*power_on)(void);
--- void (*power_off)(void);
--- void (*reset)(void);
---};
---
---#endif /* _LINUX_BRCMFMAC_PLATFORM_H */
----- /dev/null
--+++ b/include/linux/platform_data/brcmfmac.h
--@@ -0,0 +1,185 @@
--+/*
--+ * Copyright (c) 201 Broadcom Corporation
--+ *
--+ * Permission to use, copy, modify, and/or distribute this software for any
--+ * purpose with or without fee is hereby granted, provided that the above
--+ * copyright notice and this permission notice appear in all copies.
--+ *
--+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
--+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
--+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
--+ * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
--+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
--+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
--+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
--+ */
--+
--+#ifndef _LINUX_BRCMFMAC_PLATFORM_H
--+#define _LINUX_BRCMFMAC_PLATFORM_H
--+
--+
--+#define BRCMFMAC_PDATA_NAME "brcmfmac"
--+
--+#define BRCMFMAC_COUNTRY_BUF_SZ 4
--+
--+
--+/*
--+ * Platform specific driver functions and data. Through the platform specific
--+ * device data functions and data can be provided to help the brcmfmac driver to
--+ * operate with the device in combination with the used platform.
--+ */
--+
--+
--+/**
--+ * Note: the brcmfmac can be loaded as module or be statically built-in into
--+ * the kernel. If built-in then do note that it uses module_init (and
--+ * module_exit) routines which equal device_initcall. So if you intend to
--+ * create a module with the platform specific data for the brcmfmac and have
--+ * it built-in to the kernel then use a higher initcall then device_initcall
--+ * (see init.h). If this is not done then brcmfmac will load without problems
--+ * but will not pickup the platform data.
--+ *
--+ * When the driver does not "detect" platform driver data then it will continue
--+ * without reporting anything and just assume there is no data needed. Which is
--+ * probably true for most platforms.
--+ */
--+
--+/**
--+ * enum brcmf_bus_type - Bus type identifier. Currently SDIO, USB and PCIE are
--+ * supported.
--+ */
--+enum brcmf_bus_type {
--+ BRCMF_BUSTYPE_SDIO,
--+ BRCMF_BUSTYPE_USB,
--+ BRCMF_BUSTYPE_PCIE
--+};
--+
--+
--+/**
--+ * struct brcmfmac_sdio_pd - SDIO Device specific platform data.
--+ *
--+ * @txglomsz: SDIO txglom size. Use 0 if default of driver is to be
--+ * used.
--+ * @drive_strength: is the preferred drive_strength to be used for the SDIO
--+ * pins. If 0 then a default value will be used. This is
--+ * the target drive strength, the exact drive strength
--+ * which will be used depends on the capabilities of the
--+ * device.
--+ * @oob_irq_supported: does the board have support for OOB interrupts. SDIO
--+ * in-band interrupts are relatively slow and for having
--+ * less overhead on interrupt processing an out of band
--+ * interrupt can be used. If the HW supports this then
--+ * enable this by setting this field to true and configure
--+ * the oob related fields.
--+ * @oob_irq_nr,
--+ * @oob_irq_flags: the OOB interrupt information. The values are used for
--+ * registering the irq using request_irq function.
--+ * @broken_sg_support: flag for broken sg list support of SDIO host controller.
--+ * Set this to true if the SDIO host controller has higher
--+ * align requirement than 32 bytes for each scatterlist
--+ * item.
--+ * @sd_head_align: alignment requirement for start of data buffer.
--+ * @sd_sgentry_align: length alignment requirement for each sg entry.
--+ * @reset: This function can get called if the device communication
--+ * broke down. This functionality is particularly useful in
--+ * case of SDIO type devices. It is possible to reset a
--+ * dongle via sdio data interface, but it requires that
--+ * this is fully functional. This function is chip/module
--+ * specific and this function should return only after the
--+ * complete reset has completed.
--+ */
--+struct brcmfmac_sdio_pd {
--+ int txglomsz;
--+ unsigned int drive_strength;
--+ bool oob_irq_supported;
--+ unsigned int oob_irq_nr;
--+ unsigned long oob_irq_flags;
--+ bool broken_sg_support;
--+ unsigned short sd_head_align;
--+ unsigned short sd_sgentry_align;
--+ void (*reset)(void);
--+};
--+
--+/**
--+ * struct brcmfmac_pd_cc_entry - Struct for translating user space country code
--+ * (iso3166) to firmware country code and
--+ * revision.
--+ *
--+ * @iso3166: iso3166 alpha 2 country code string.
--+ * @cc: firmware country code string.
--+ * @rev: firmware country code revision.
--+ */
--+struct brcmfmac_pd_cc_entry {
--+ char iso3166[BRCMFMAC_COUNTRY_BUF_SZ];
--+ char cc[BRCMFMAC_COUNTRY_BUF_SZ];
--+ s32 rev;
--+};
--+
--+/**
--+ * struct brcmfmac_pd_cc - Struct for translating country codes as set by user
--+ * space to a country code and rev which can be used by
--+ * firmware.
--+ *
--+ * @table_size: number of entries in table (> 0)
--+ * @table: array of 1 or more elements with translation information.
--+ */
--+struct brcmfmac_pd_cc {
--+ int table_size;
--+ struct brcmfmac_pd_cc_entry table[0];
--+};
--+
--+/**
--+ * struct brcmfmac_pd_device - Device specific platform data. (id/rev/bus_type)
--+ * is the unique identifier of the device.
--+ *
--+ * @id: ID of the device for which this data is. In case of SDIO
--+ * or PCIE this is the chipid as identified by chip.c In
--+ * case of USB this is the chipid as identified by the
--+ * device query.
--+ * @rev: chip revision, see id.
--+ * @bus_type: The type of bus. Some chipid/rev exist for different bus
--+ * types. Each bus type has its own set of settings.
--+ * @feature_disable: Bitmask of features to disable (override), See feature.c
--+ * in brcmfmac for details.
--+ * @country_codes: If available, pointer to struct for translating country
--+ * codes.
--+ * @bus: Bus specific (union) device settings. Currently only
--+ * SDIO.
--+ */
--+struct brcmfmac_pd_device {
--+ unsigned int id;
--+ unsigned int rev;
--+ enum brcmf_bus_type bus_type;
--+ unsigned int feature_disable;
--+ struct brcmfmac_pd_cc *country_codes;
--+ union {
--+ struct brcmfmac_sdio_pd sdio;
--+ } bus;
--+};
--+
--+/**
--+ * struct brcmfmac_platform_data - BRCMFMAC specific platform data.
--+ *
--+ * @power_on: This function is called by the brcmfmac driver when the module
--+ * gets loaded. This can be particularly useful for low power
--+ * devices. The platform spcific routine may for example decide to
--+ * power up the complete device. If there is no use-case for this
--+ * function then provide NULL.
--+ * @power_off: This function is called by the brcmfmac when the module gets
--+ * unloaded. At this point the devices can be powered down or
--+ * otherwise be reset. So if an actual power_off is not supported
--+ * but reset is supported by the devices then reset the devices
--+ * when this function gets called. This can be particularly useful
--+ * for low power devices. If there is no use-case for this
--+ * function then provide NULL.
--+ */
--+struct brcmfmac_platform_data {
--+ void (*power_on)(void);
--+ void (*power_off)(void);
--+ char *fw_alternative_path;
--+ int device_count;
--+ struct brcmfmac_pd_device devices[0];
--+};
--+
--+
--+#endif /* _LINUX_BRCMFMAC_PLATFORM_H */
-diff --git a/package/kernel/mac80211/patches/344-0018-brcmfmac-merge-platform-data-and-module-paramaters.patch b/package/kernel/mac80211/patches/344-0018-brcmfmac-merge-platform-data-and-module-paramaters.patch
-deleted file mode 100644
-index 34341d7f1866bde09e839f128d14a2b40e54453f..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/344-0018-brcmfmac-merge-platform-data-and-module-paramaters.patch
-+++ /dev/null
-@@ -1,607 +0,0 @@
--From: Hante Meuleman <meuleman@broadcom.com>
--Date: Wed, 17 Feb 2016 11:27:08 +0100
--Subject: [PATCH] brcmfmac: merge platform data and module paramaters
--
--Merge module parameters and platform data in one struct. This is the
--last step to move to the new platform data per device. Now parameters
--of platform data will be merged with module parameters per device.
--
--Reviewed-by: Arend Van Spriel <arend@broadcom.com>
--Reviewed-by: Franky (Zhenhui) Lin <frankyl@broadcom.com>
--Reviewed-by: Pieter-Paul Giesberts <pieterpg@broadcom.com>
--Signed-off-by: Hante Meuleman <meuleman@broadcom.com>
--Signed-off-by: Arend van Spriel <arend@broadcom.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
--@@ -109,8 +109,8 @@ int brcmf_sdiod_intr_register(struct brc
-- u32 addr, gpiocontrol;
-- unsigned long flags;
--
--- pdata = sdiodev->pdata;
--- if ((pdata) && (pdata->oob_irq_supported)) {
--+ pdata = &sdiodev->settings->bus.sdio;
--+ if (pdata->oob_irq_supported) {
-- brcmf_dbg(SDIO, "Enter, register OOB IRQ %d\n",
-- pdata->oob_irq_nr);
-- ret = request_irq(pdata->oob_irq_nr, brcmf_sdiod_oob_irqhandler,
--@@ -177,8 +177,8 @@ int brcmf_sdiod_intr_unregister(struct b
--
-- brcmf_dbg(SDIO, "Entering\n");
--
--- pdata = sdiodev->pdata;
--- if ((pdata) && (pdata->oob_irq_supported)) {
--+ pdata = &sdiodev->settings->bus.sdio;
--+ if (pdata->oob_irq_supported) {
-- sdio_claim_host(sdiodev->func[1]);
-- brcmf_sdiod_regwb(sdiodev, SDIO_CCCR_BRCM_SEPINT, 0, NULL);
-- brcmf_sdiod_regwb(sdiodev, SDIO_CCCR_IENx, 0, NULL);
--@@ -522,7 +522,7 @@ static int brcmf_sdiod_sglist_rw(struct
-- target_list = pktlist;
-- /* for host with broken sg support, prepare a page aligned list */
-- __skb_queue_head_init(&local_list);
--- if (sdiodev->pdata && sdiodev->pdata->broken_sg_support && !write) {
--+ if (!write && sdiodev->settings->bus.sdio.broken_sg_support) {
-- req_sz = 0;
-- skb_queue_walk(pktlist, pkt_next)
-- req_sz += pkt_next->len;
--@@ -629,7 +629,7 @@ static int brcmf_sdiod_sglist_rw(struct
-- }
-- }
--
--- if (sdiodev->pdata && sdiodev->pdata->broken_sg_support && !write) {
--+ if (!write && sdiodev->settings->bus.sdio.broken_sg_support) {
-- local_pkt_next = local_list.next;
-- orig_offset = 0;
-- skb_queue_walk(pktlist, pkt_next) {
--@@ -900,7 +900,7 @@ void brcmf_sdiod_sgtable_alloc(struct br
-- return;
--
-- nents = max_t(uint, BRCMF_DEFAULT_RXGLOM_SIZE,
--- sdiodev->bus_if->drvr->settings->sdiod_txglomsz);
--+ sdiodev->settings->bus.sdio.txglomsz);
-- nents += (nents >> 4) + 1;
--
-- WARN_ON(nents > sdiodev->max_segment_count);
--@@ -912,7 +912,7 @@ void brcmf_sdiod_sgtable_alloc(struct br
-- sdiodev->sg_support = false;
-- }
--
--- sdiodev->txglomsz = sdiodev->bus_if->drvr->settings->sdiod_txglomsz;
--+ sdiodev->txglomsz = sdiodev->settings->bus.sdio.txglomsz;
-- }
--
-- #ifdef CONFIG_PM_SLEEP
--@@ -1246,8 +1246,8 @@ static int brcmf_ops_sdio_suspend(struct
--
-- sdio_flags = MMC_PM_KEEP_POWER;
-- if (sdiodev->wowl_enabled) {
--- if (sdiodev->pdata->oob_irq_supported)
--- enable_irq_wake(sdiodev->pdata->oob_irq_nr);
--+ if (sdiodev->settings->bus.sdio.oob_irq_supported)
--+ enable_irq_wake(sdiodev->settings->bus.sdio.oob_irq_nr);
-- else
-- sdio_flags |= MMC_PM_WAKE_SDIO_IRQ;
-- }
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h
--@@ -43,6 +43,8 @@ enum brcmf_bus_protocol_type {
-- BRCMF_PROTO_MSGBUF
-- };
--
--+struct brcmf_mp_device;
--+
-- struct brcmf_bus_dcmd {
-- char *name;
-- char *param;
--@@ -217,7 +219,7 @@ bool brcmf_c_prec_enq(struct device *dev
-- void brcmf_rx_frame(struct device *dev, struct sk_buff *rxp);
--
-- /* Indication from bus module regarding presence/insertion of dongle. */
---int brcmf_attach(struct device *dev);
--+int brcmf_attach(struct device *dev, struct brcmf_mp_device *settings);
-- /* Indication from bus module regarding removal/absence of dongle */
-- void brcmf_detach(struct device *dev);
-- /* Indication from bus module that dongle should be reset */
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
--@@ -243,14 +243,35 @@ static void brcmf_mp_attach(void)
-- }
-- }
--
---struct brcmfmac_sdio_pd *brcmf_get_module_param(struct device *dev,
--- enum brcmf_bus_type bus_type,
--- u32 chip, u32 chiprev)
--+struct brcmf_mp_device *brcmf_get_module_param(struct device *dev,
--+ enum brcmf_bus_type bus_type,
--+ u32 chip, u32 chiprev)
-- {
--- struct brcmfmac_sdio_pd *pdata;
--+ struct brcmf_mp_device *settings;
-- struct brcmfmac_pd_device *device_pd;
--+ bool found;
-- int i;
--
--+ brcmf_dbg(INFO, "Enter, bus=%d, chip=%d, rev=%d\n", bus_type, chip,
--+ chiprev);
--+ settings = kzalloc(sizeof(*settings), GFP_ATOMIC);
--+ if (!settings)
--+ return NULL;
--+
--+ /* start by using the module paramaters */
--+ settings->p2p_enable = !!brcmf_p2p_enable;
--+ settings->feature_disable = brcmf_feature_disable;
--+ settings->fcmode = brcmf_fcmode;
--+ settings->roamoff = !!brcmf_roamoff;
--+#ifdef DEBUG
--+ settings->ignore_probe_fail = !!brcmf_ignore_probe_fail;
--+#endif
--+
--+ if (bus_type == BRCMF_BUSTYPE_SDIO)
--+ settings->bus.sdio.txglomsz = brcmf_sdiod_txglomsz;
--+
--+ /* See if there is any device specific platform data configured */
--+ found = false;
-- if (brcmfmac_pdata) {
-- for (i = 0; i < brcmfmac_pdata->device_count; i++) {
-- device_pd = &brcmfmac_pdata->devices[i];
--@@ -259,38 +280,29 @@ struct brcmfmac_sdio_pd *brcmf_get_modul
-- ((device_pd->rev == chiprev) ||
-- (device_pd->rev == -1))) {
-- brcmf_dbg(INFO, "Platform data for device found\n");
--+ settings->country_codes =
--+ device_pd->country_codes;
-- if (device_pd->bus_type == BRCMF_BUSTYPE_SDIO)
--- return &device_pd->bus.sdio;
--+ memcpy(&settings->bus.sdio,
--+ &device_pd->bus.sdio,
--+ sizeof(settings->bus.sdio));
--+ found = true;
-- break;
-- }
-- }
-- }
--- pdata = NULL;
--- brcmf_of_probe(dev, &pdata);
---
--- return pdata;
---}
---
---int brcmf_mp_device_attach(struct brcmf_pub *drvr)
---{
--- drvr->settings = kzalloc(sizeof(*drvr->settings), GFP_ATOMIC);
--- if (!drvr->settings)
--- return -ENOMEM;
---
--- drvr->settings->sdiod_txglomsz = brcmf_sdiod_txglomsz;
--- drvr->settings->p2p_enable = !!brcmf_p2p_enable;
--- drvr->settings->feature_disable = brcmf_feature_disable;
--- drvr->settings->fcmode = brcmf_fcmode;
--- drvr->settings->roamoff = !!brcmf_roamoff;
---#ifdef DEBUG
--- drvr->settings->ignore_probe_fail = !!brcmf_ignore_probe_fail;
---#endif
--- return 0;
--+ if ((bus_type == BRCMF_BUSTYPE_SDIO) && (!found)) {
--+ /* No platform data for this device. In case of SDIO try OF
--+ * (Open Firwmare) Device Tree.
--+ */
--+ brcmf_of_probe(dev, &settings->bus.sdio);
--+ }
--+ return settings;
-- }
--
---void brcmf_mp_device_detach(struct brcmf_pub *drvr)
--+void brcmf_release_module_param(struct brcmf_mp_device *module_param)
-- {
--- kfree(drvr->settings);
--+ kfree(module_param);
-- }
--
-- static int __init brcmf_common_pd_probe(struct platform_device *pdev)
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.h
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.h
--@@ -45,41 +45,30 @@ extern struct brcmf_mp_global_t brcmf_mp
-- /**
-- * struct brcmf_mp_device - Device module paramaters.
-- *
--- * @sdiod_txglomsz: SDIO txglom size.
--- * @joinboost_5g_rssi: 5g rssi booost for preferred join selection.
-- * @p2p_enable: Legacy P2P0 enable (old wpa_supplicant).
-- * @feature_disable: Feature_disable bitmask.
-- * @fcmode: FWS flow control.
-- * @roamoff: Firmware roaming off?
--+ * @ignore_probe_fail: Ignore probe failure.
-- * @country_codes: If available, pointer to struct for translating country codes
--+ * @bus: Bus specific platform data. Only SDIO at the mmoment.
-- */
-- struct brcmf_mp_device {
--- int sdiod_txglomsz;
--- int joinboost_5g_rssi;
--- bool p2p_enable;
--- int feature_disable;
--- int fcmode;
--- bool roamoff;
--- bool ignore_probe_fail;
--+ bool p2p_enable;
--+ unsigned int feature_disable;
--+ int fcmode;
--+ bool roamoff;
--+ bool ignore_probe_fail;
-- struct brcmfmac_pd_cc *country_codes;
--+ union {
--+ struct brcmfmac_sdio_pd sdio;
--+ } bus;
-- };
--
---struct brcmfmac_sdio_pd *brcmf_get_module_param(struct device *dev,
--- enum brcmf_bus_type bus_type,
--- u32 chip, u32 chiprev);
---int brcmf_mp_device_attach(struct brcmf_pub *drvr);
---void brcmf_mp_device_detach(struct brcmf_pub *drvr);
---#ifdef DEBUG
---static inline bool brcmf_ignoring_probe_fail(struct brcmf_pub *drvr)
---{
--- return drvr->settings->ignore_probe_fail;
---}
---#else
---static inline bool brcmf_ignoring_probe_fail(struct brcmf_pub *drvr)
---{
--- return false;
---}
---#endif
--+struct brcmf_mp_device *brcmf_get_module_param(struct device *dev,
--+ enum brcmf_bus_type bus_type,
--+ u32 chip, u32 chiprev);
--+void brcmf_release_module_param(struct brcmf_mp_device *module_param);
--
-- /* Sets dongle media info (drv_version, mac address). */
-- int brcmf_c_preinit_dcmds(struct brcmf_if *ifp);
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
--@@ -1104,7 +1104,7 @@ static int brcmf_inet6addr_changed(struc
-- }
-- #endif
--
---int brcmf_attach(struct device *dev)
--+int brcmf_attach(struct device *dev, struct brcmf_mp_device *settings)
-- {
-- struct brcmf_pub *drvr = NULL;
-- int ret = 0;
--@@ -1126,10 +1126,7 @@ int brcmf_attach(struct device *dev)
-- drvr->hdrlen = 0;
-- drvr->bus_if = dev_get_drvdata(dev);
-- drvr->bus_if->drvr = drvr;
---
--- /* Initialize device specific settings */
--- if (brcmf_mp_device_attach(drvr))
--- goto fail;
--+ drvr->settings = settings;
--
-- /* attach debug facilities */
-- brcmf_debug_attach(drvr);
--@@ -1274,7 +1271,7 @@ fail:
-- brcmf_net_detach(p2p_ifp->ndev);
-- drvr->iflist[0] = NULL;
-- drvr->iflist[1] = NULL;
--- if (brcmf_ignoring_probe_fail(drvr))
--+ if (drvr->settings->ignore_probe_fail)
-- ret = 0;
--
-- return ret;
--@@ -1350,8 +1347,6 @@ void brcmf_detach(struct device *dev)
--
-- brcmf_proto_detach(drvr);
--
--- brcmf_mp_device_detach(drvr);
---
-- brcmf_debug_detach(drvr);
-- bus_if->drvr = NULL;
-- kfree(drvr);
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.c
--@@ -23,7 +23,7 @@
-- #include "common.h"
-- #include "of.h"
--
---void brcmf_of_probe(struct device *dev, struct brcmfmac_sdio_pd **sdio)
--+void brcmf_of_probe(struct device *dev, struct brcmfmac_sdio_pd *sdio)
-- {
-- struct device_node *np = dev->of_node;
-- int irq;
--@@ -33,12 +33,8 @@ void brcmf_of_probe(struct device *dev,
-- if (!np || !of_device_is_compatible(np, "brcm,bcm4329-fmac"))
-- return;
--
--- *sdio = devm_kzalloc(dev, sizeof(*sdio), GFP_KERNEL);
--- if (!(*sdio))
--- return;
---
-- if (of_property_read_u32(np, "brcm,drive-strength", &val) == 0)
--- (*sdio)->drive_strength = val;
--+ sdio->drive_strength = val;
--
-- /* make sure there are interrupts defined in the node */
-- if (!of_find_property(np, "interrupts", NULL))
--@@ -51,7 +47,7 @@ void brcmf_of_probe(struct device *dev,
-- }
-- irqf = irqd_get_trigger_type(irq_get_irq_data(irq));
--
--- (*sdio)->oob_irq_supported = true;
--- (*sdio)->oob_irq_nr = irq;
--- (*sdio)->oob_irq_flags = irqf;
--+ sdio->oob_irq_supported = true;
--+ sdio->oob_irq_nr = irq;
--+ sdio->oob_irq_flags = irqf;
-- }
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.h
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/of.h
--@@ -14,10 +14,9 @@
-- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-- */
-- #ifdef CONFIG_OF
---void
---brcmf_of_probe(struct device *dev, struct brcmfmac_sdio_pd **sdio);
--+void brcmf_of_probe(struct device *dev, struct brcmfmac_sdio_pd *sdio);
-- #else
---static void brcmf_of_probe(struct device *dev, struct brcmfmac_sdio_pd **sdio)
--+static void brcmf_of_probe(struct device *dev, struct brcmfmac_sdio_pd *sdio)
-- {
-- }
-- #endif /* CONFIG_OF */
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
--@@ -37,6 +37,8 @@
-- #include "pcie.h"
-- #include "firmware.h"
-- #include "chip.h"
--+#include "core.h"
--+#include "common.h"
--
--
-- enum brcmf_pcie_state {
--@@ -266,6 +268,7 @@ struct brcmf_pciedev_info {
-- u16 (*read_ptr)(struct brcmf_pciedev_info *devinfo, u32 mem_offset);
-- void (*write_ptr)(struct brcmf_pciedev_info *devinfo, u32 mem_offset,
-- u16 value);
--+ struct brcmf_mp_device *settings;
-- };
--
-- struct brcmf_pcie_ringbuf {
--@@ -1525,16 +1528,16 @@ static void brcmf_pcie_release_resource(
-- }
--
--
---static int brcmf_pcie_attach_bus(struct device *dev)
--+static int brcmf_pcie_attach_bus(struct brcmf_pciedev_info *devinfo)
-- {
-- int ret;
--
-- /* Attach to the common driver interface */
--- ret = brcmf_attach(dev);
--+ ret = brcmf_attach(&devinfo->pdev->dev, devinfo->settings);
-- if (ret) {
-- brcmf_err("brcmf_attach failed\n");
-- } else {
--- ret = brcmf_bus_start(dev);
--+ ret = brcmf_bus_start(&devinfo->pdev->dev);
-- if (ret)
-- brcmf_err("dongle is not responding\n");
-- }
--@@ -1672,7 +1675,7 @@ static void brcmf_pcie_setup(struct devi
-- init_waitqueue_head(&devinfo->mbdata_resp_wait);
--
-- brcmf_pcie_intr_enable(devinfo);
--- if (brcmf_pcie_attach_bus(bus->dev) == 0)
--+ if (brcmf_pcie_attach_bus(devinfo) == 0)
-- return;
--
-- brcmf_pcie_bus_console_read(devinfo);
--@@ -1716,6 +1719,15 @@ brcmf_pcie_probe(struct pci_dev *pdev, c
-- goto fail;
-- }
--
--+ devinfo->settings = brcmf_get_module_param(&devinfo->pdev->dev,
--+ BRCMF_BUSTYPE_PCIE,
--+ devinfo->ci->chip,
--+ devinfo->ci->chiprev);
--+ if (!devinfo->settings) {
--+ ret = -ENOMEM;
--+ goto fail;
--+ }
--+
-- bus = kzalloc(sizeof(*bus), GFP_KERNEL);
-- if (!bus) {
-- ret = -ENOMEM;
--@@ -1760,6 +1772,8 @@ fail:
-- brcmf_pcie_release_resource(devinfo);
-- if (devinfo->ci)
-- brcmf_chip_detach(devinfo->ci);
--+ if (devinfo->settings)
--+ brcmf_release_module_param(devinfo->settings);
-- kfree(pcie_bus_dev);
-- kfree(devinfo);
-- return ret;
--@@ -1799,6 +1813,8 @@ brcmf_pcie_remove(struct pci_dev *pdev)
--
-- if (devinfo->ci)
-- brcmf_chip_detach(devinfo->ci);
--+ if (devinfo->settings)
--+ brcmf_release_module_param(devinfo->settings);
--
-- kfree(devinfo);
-- dev_set_drvdata(&pdev->dev, NULL);
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
--@@ -2442,15 +2442,17 @@ static void brcmf_sdio_bus_stop(struct d
--
-- static inline void brcmf_sdio_clrintr(struct brcmf_sdio *bus)
-- {
--+ struct brcmf_sdio_dev *sdiodev;
-- unsigned long flags;
--
--- if (bus->sdiodev->oob_irq_requested) {
--- spin_lock_irqsave(&bus->sdiodev->irq_en_lock, flags);
--- if (!bus->sdiodev->irq_en && !atomic_read(&bus->ipend)) {
--- enable_irq(bus->sdiodev->pdata->oob_irq_nr);
--- bus->sdiodev->irq_en = true;
--+ sdiodev = bus->sdiodev;
--+ if (sdiodev->oob_irq_requested) {
--+ spin_lock_irqsave(&sdiodev->irq_en_lock, flags);
--+ if (!sdiodev->irq_en && !atomic_read(&bus->ipend)) {
--+ enable_irq(sdiodev->settings->bus.sdio.oob_irq_nr);
--+ sdiodev->irq_en = true;
-- }
--- spin_unlock_irqrestore(&bus->sdiodev->irq_en_lock, flags);
--+ spin_unlock_irqrestore(&sdiodev->irq_en_lock, flags);
-- }
-- }
--
--@@ -3394,9 +3396,7 @@ static int brcmf_sdio_bus_preinit(struct
-- sizeof(u32));
-- } else {
-- /* otherwise, set txglomalign */
--- value = 4;
--- if (sdiodev->pdata)
--- value = sdiodev->pdata->sd_sgentry_align;
--+ value = sdiodev->settings->bus.sdio.sd_sgentry_align;
-- /* SDIO ADMA requires at least 32 bit alignment */
-- value = max_t(u32, value, 4);
-- err = brcmf_iovar_data_set(dev, "bus:txglomalign", &value,
--@@ -3811,21 +3811,25 @@ brcmf_sdio_probe_attach(struct brcmf_sdi
-- bus->ci = NULL;
-- goto fail;
-- }
--- sdiodev->pdata = brcmf_get_module_param(sdiodev->dev,
--+ sdiodev->settings = brcmf_get_module_param(sdiodev->dev,
-- BRCMF_BUSTYPE_SDIO,
-- bus->ci->chip,
-- bus->ci->chiprev);
--+ if (!sdiodev->settings) {
--+ brcmf_err("Failed to get device parameters\n");
--+ goto fail;
--+ }
-- /* platform specific configuration:
-- * alignments must be at least 4 bytes for ADMA
-- */
-- bus->head_align = ALIGNMENT;
-- bus->sgentry_align = ALIGNMENT;
--- if (sdiodev->pdata) {
--- if (sdiodev->pdata->sd_head_align > ALIGNMENT)
--- bus->head_align = sdiodev->pdata->sd_head_align;
--- if (sdiodev->pdata->sd_sgentry_align > ALIGNMENT)
--- bus->sgentry_align = sdiodev->pdata->sd_sgentry_align;
--- }
--+ if (sdiodev->settings->bus.sdio.sd_head_align > ALIGNMENT)
--+ bus->head_align = sdiodev->settings->bus.sdio.sd_head_align;
--+ if (sdiodev->settings->bus.sdio.sd_sgentry_align > ALIGNMENT)
--+ bus->sgentry_align =
--+ sdiodev->settings->bus.sdio.sd_sgentry_align;
--+
-- /* allocate scatter-gather table. sg support
-- * will be disabled upon allocation failure.
-- */
--@@ -3837,7 +3841,7 @@ brcmf_sdio_probe_attach(struct brcmf_sdi
-- */
-- if ((sdio_get_host_pm_caps(sdiodev->func[1]) & MMC_PM_KEEP_POWER) &&
-- ((sdio_get_host_pm_caps(sdiodev->func[1]) & MMC_PM_WAKE_SDIO_IRQ) ||
--- (sdiodev->pdata && sdiodev->pdata->oob_irq_supported)))
--+ (sdiodev->settings->bus.sdio.oob_irq_supported)))
-- sdiodev->bus_if->wowl_supported = true;
-- #endif
--
--@@ -3846,8 +3850,8 @@ brcmf_sdio_probe_attach(struct brcmf_sdi
-- goto fail;
-- }
--
--- if ((sdiodev->pdata) && (sdiodev->pdata->drive_strength))
--- drivestrength = sdiodev->pdata->drive_strength;
--+ if (sdiodev->settings->bus.sdio.drive_strength)
--+ drivestrength = sdiodev->settings->bus.sdio.drive_strength;
-- else
-- drivestrength = DEFAULT_SDIO_DRIVE_STRENGTH;
-- brcmf_sdio_drivestrengthinit(sdiodev, bus->ci, drivestrength);
--@@ -4124,7 +4128,7 @@ struct brcmf_sdio *brcmf_sdio_probe(stru
-- bus->tx_hdrlen = SDPCM_HWHDR_LEN + SDPCM_SWHDR_LEN;
--
-- /* Attach to the common layer, reserve hdr space */
--- ret = brcmf_attach(bus->sdiodev->dev);
--+ ret = brcmf_attach(bus->sdiodev->dev, bus->sdiodev->settings);
-- if (ret != 0) {
-- brcmf_err("brcmf_attach failed\n");
-- goto fail;
--@@ -4228,6 +4232,8 @@ void brcmf_sdio_remove(struct brcmf_sdio
-- }
-- brcmf_chip_detach(bus->ci);
-- }
--+ if (bus->sdiodev->settings)
--+ brcmf_release_module_param(bus->sdiodev->settings);
--
-- kfree(bus->rxbuf);
-- kfree(bus->hdrbuf);
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.h
--@@ -184,7 +184,7 @@ struct brcmf_sdio_dev {
-- struct brcmf_sdio *bus;
-- struct device *dev;
-- struct brcmf_bus *bus_if;
--- struct brcmfmac_sdio_pd *pdata;
--+ struct brcmf_mp_device *settings;
-- bool oob_irq_requested;
-- bool irq_en; /* irq enable flags */
-- spinlock_t irq_en_lock;
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
--@@ -27,6 +27,8 @@
-- #include "debug.h"
-- #include "firmware.h"
-- #include "usb.h"
--+#include "core.h"
--+#include "common.h"
--
--
-- #define IOCTL_RESP_TIMEOUT msecs_to_jiffies(2000)
--@@ -171,6 +173,7 @@ struct brcmf_usbdev_info {
-- struct urb *bulk_urb; /* used for FW download */
--
-- bool wowl_enabled;
--+ struct brcmf_mp_device *settings;
-- };
--
-- static void brcmf_usb_rx_refill(struct brcmf_usbdev_info *devinfo,
--@@ -1027,6 +1030,9 @@ static void brcmf_usb_detach(struct brcm
--
-- kfree(devinfo->tx_reqs);
-- kfree(devinfo->rx_reqs);
--+
--+ if (devinfo->settings)
--+ brcmf_release_module_param(devinfo->settings);
-- }
--
--
--@@ -1136,7 +1142,7 @@ static int brcmf_usb_bus_setup(struct br
-- int ret;
--
-- /* Attach to the common driver interface */
--- ret = brcmf_attach(devinfo->dev);
--+ ret = brcmf_attach(devinfo->dev, devinfo->settings);
-- if (ret) {
-- brcmf_err("brcmf_attach failed\n");
-- return ret;
--@@ -1223,6 +1229,14 @@ static int brcmf_usb_probe_cb(struct brc
-- bus->wowl_supported = true;
-- #endif
--
--+ devinfo->settings = brcmf_get_module_param(bus->dev, BRCMF_BUSTYPE_USB,
--+ bus_pub->devid,
--+ bus_pub->chiprev);
--+ if (!devinfo->settings) {
--+ ret = -ENOMEM;
--+ goto fail;
--+ }
--+
-- if (!brcmf_usb_dlneeded(devinfo)) {
-- ret = brcmf_usb_bus_setup(devinfo);
-- if (ret)
-diff --git a/package/kernel/mac80211/patches/344-0019-brcmfmac-integrate-add_keyext-in-add_key.patch b/package/kernel/mac80211/patches/344-0019-brcmfmac-integrate-add_keyext-in-add_key.patch
-deleted file mode 100644
-index eb680fccfc4695e3c676ed39593e57ffd60d908f..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/344-0019-brcmfmac-integrate-add_keyext-in-add_key.patch
-+++ /dev/null
-@@ -1,227 +0,0 @@
--From: Hante Meuleman <hante.meuleman@broadcom.com>
--Date: Wed, 17 Feb 2016 11:27:09 +0100
--Subject: [PATCH] brcmfmac: integrate add_keyext in add_key
--
--brcmf_add_keyext is called when a key is configured for a specific
--mac address. This function is very similar to the calling function
--brcmf_add_key. Integrate this function and also use existing del_key
--function in case key is to be cleared.
--
--Reviewed-by: Arend Van Spriel <arend.van@broadcom.com>
--Reviewed-by: Franky (Zhenhui) Lin <franky.lin@broadcom.com>
--Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
--Signed-off-by: Hante Meuleman <hante.meuleman@broadcom.com>
--Signed-off-by: Arend van Spriel <arend@broadcom.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--@@ -2073,84 +2073,34 @@ done:
-- }
--
-- static s32
---brcmf_add_keyext(struct wiphy *wiphy, struct net_device *ndev,
--- u8 key_idx, const u8 *mac_addr, struct key_params *params)
--+brcmf_cfg80211_del_key(struct wiphy *wiphy, struct net_device *ndev,
--+ u8 key_idx, bool pairwise, const u8 *mac_addr)
-- {
-- struct brcmf_if *ifp = netdev_priv(ndev);
-- struct brcmf_wsec_key key;
-- s32 err = 0;
--- u8 keybuf[8];
--+
--+ brcmf_dbg(TRACE, "Enter\n");
--+ if (!check_vif_up(ifp->vif))
--+ return -EIO;
--+
--+ if (key_idx >= BRCMF_MAX_DEFAULT_KEYS) {
--+ /* we ignore this key index in this case */
--+ return -EINVAL;
--+ }
--
-- memset(&key, 0, sizeof(key));
--- key.index = (u32) key_idx;
--- /* Instead of bcast for ea address for default wep keys,
--- driver needs it to be Null */
--- if (!is_multicast_ether_addr(mac_addr))
--- memcpy((char *)&key.ea, (void *)mac_addr, ETH_ALEN);
--- key.len = (u32) params->key_len;
--- /* check for key index change */
--- if (key.len == 0) {
--- /* key delete */
--- err = send_key_to_dongle(ifp, &key);
--- if (err)
--- brcmf_err("key delete error (%d)\n", err);
--- } else {
--- if (key.len > sizeof(key.data)) {
--- brcmf_err("Invalid key length (%d)\n", key.len);
--- return -EINVAL;
--- }
--
--- brcmf_dbg(CONN, "Setting the key index %d\n", key.index);
--- memcpy(key.data, params->key, key.len);
--+ key.index = (u32)key_idx;
--+ key.flags = BRCMF_PRIMARY_KEY;
--+ key.algo = CRYPTO_ALGO_OFF;
--
--- if (!brcmf_is_apmode(ifp->vif) &&
--- (params->cipher == WLAN_CIPHER_SUITE_TKIP)) {
--- brcmf_dbg(CONN, "Swapping RX/TX MIC key\n");
--- memcpy(keybuf, &key.data[24], sizeof(keybuf));
--- memcpy(&key.data[24], &key.data[16], sizeof(keybuf));
--- memcpy(&key.data[16], keybuf, sizeof(keybuf));
--- }
--+ brcmf_dbg(CONN, "key index (%d)\n", key_idx);
--
--- /* if IW_ENCODE_EXT_RX_SEQ_VALID set */
--- if (params->seq && params->seq_len == 6) {
--- /* rx iv */
--- u8 *ivptr;
--- ivptr = (u8 *) params->seq;
--- key.rxiv.hi = (ivptr[5] << 24) | (ivptr[4] << 16) |
--- (ivptr[3] << 8) | ivptr[2];
--- key.rxiv.lo = (ivptr[1] << 8) | ivptr[0];
--- key.iv_initialized = true;
--- }
--+ /* Set the new key/index */
--+ err = send_key_to_dongle(ifp, &key);
--
--- switch (params->cipher) {
--- case WLAN_CIPHER_SUITE_WEP40:
--- key.algo = CRYPTO_ALGO_WEP1;
--- brcmf_dbg(CONN, "WLAN_CIPHER_SUITE_WEP40\n");
--- break;
--- case WLAN_CIPHER_SUITE_WEP104:
--- key.algo = CRYPTO_ALGO_WEP128;
--- brcmf_dbg(CONN, "WLAN_CIPHER_SUITE_WEP104\n");
--- break;
--- case WLAN_CIPHER_SUITE_TKIP:
--- key.algo = CRYPTO_ALGO_TKIP;
--- brcmf_dbg(CONN, "WLAN_CIPHER_SUITE_TKIP\n");
--- break;
--- case WLAN_CIPHER_SUITE_AES_CMAC:
--- key.algo = CRYPTO_ALGO_AES_CCM;
--- brcmf_dbg(CONN, "WLAN_CIPHER_SUITE_AES_CMAC\n");
--- break;
--- case WLAN_CIPHER_SUITE_CCMP:
--- key.algo = CRYPTO_ALGO_AES_CCM;
--- brcmf_dbg(CONN, "WLAN_CIPHER_SUITE_CCMP\n");
--- break;
--- default:
--- brcmf_err("Invalid cipher (0x%x)\n", params->cipher);
--- return -EINVAL;
--- }
--- err = send_key_to_dongle(ifp, &key);
--- if (err)
--- brcmf_err("wsec_key error (%d)\n", err);
--- }
--+ brcmf_dbg(TRACE, "Exit\n");
-- return err;
-- }
--
--@@ -2163,8 +2113,9 @@ brcmf_cfg80211_add_key(struct wiphy *wip
-- struct brcmf_wsec_key *key;
-- s32 val;
-- s32 wsec;
--- s32 err = 0;
--+ s32 err;
-- u8 keybuf[8];
--+ bool ext_key;
--
-- brcmf_dbg(TRACE, "Enter\n");
-- brcmf_dbg(CONN, "key index (%d)\n", key_idx);
--@@ -2177,27 +2128,32 @@ brcmf_cfg80211_add_key(struct wiphy *wip
-- return -EINVAL;
-- }
--
--- if (mac_addr &&
--- (params->cipher != WLAN_CIPHER_SUITE_WEP40) &&
--- (params->cipher != WLAN_CIPHER_SUITE_WEP104)) {
--- brcmf_dbg(TRACE, "Exit");
--- return brcmf_add_keyext(wiphy, ndev, key_idx, mac_addr, params);
--- }
---
--- key = &ifp->vif->profile.key[key_idx];
--- memset(key, 0, sizeof(*key));
--+ if (params->key_len == 0)
--+ return brcmf_cfg80211_del_key(wiphy, ndev, key_idx, pairwise,
--+ mac_addr);
--
-- if (params->key_len > sizeof(key->data)) {
-- brcmf_err("Too long key length (%u)\n", params->key_len);
--- err = -EINVAL;
--- goto done;
--+ return -EINVAL;
--+ }
--+
--+ ext_key = false;
--+ if (mac_addr && (params->cipher != WLAN_CIPHER_SUITE_WEP40) &&
--+ (params->cipher != WLAN_CIPHER_SUITE_WEP104)) {
--+ brcmf_dbg(TRACE, "Ext key, mac %pM", mac_addr);
--+ ext_key = true;
-- }
--+
--+ key = &ifp->vif->profile.key[key_idx];
--+ memset(key, 0, sizeof(*key));
--+ if ((ext_key) && (!is_multicast_ether_addr(mac_addr)))
--+ memcpy((char *)&key->ea, (void *)mac_addr, ETH_ALEN);
-- key->len = params->key_len;
-- key->index = key_idx;
---
-- memcpy(key->data, params->key, key->len);
--+ if (!ext_key)
--+ key->flags = BRCMF_PRIMARY_KEY;
--
--- key->flags = BRCMF_PRIMARY_KEY;
-- switch (params->cipher) {
-- case WLAN_CIPHER_SUITE_WEP40:
-- key->algo = CRYPTO_ALGO_WEP1;
--@@ -2237,7 +2193,7 @@ brcmf_cfg80211_add_key(struct wiphy *wip
-- }
--
-- err = send_key_to_dongle(ifp, key);
--- if (err)
--+ if (ext_key || err)
-- goto done;
--
-- err = brcmf_fil_bsscfg_int_get(ifp, "wsec", &wsec);
--@@ -2256,38 +2212,6 @@ done:
-- brcmf_dbg(TRACE, "Exit\n");
-- return err;
-- }
---
---static s32
---brcmf_cfg80211_del_key(struct wiphy *wiphy, struct net_device *ndev,
--- u8 key_idx, bool pairwise, const u8 *mac_addr)
---{
--- struct brcmf_if *ifp = netdev_priv(ndev);
--- struct brcmf_wsec_key key;
--- s32 err = 0;
---
--- brcmf_dbg(TRACE, "Enter\n");
--- if (!check_vif_up(ifp->vif))
--- return -EIO;
---
--- if (key_idx >= BRCMF_MAX_DEFAULT_KEYS) {
--- /* we ignore this key index in this case */
--- return -EINVAL;
--- }
---
--- memset(&key, 0, sizeof(key));
---
--- key.index = (u32) key_idx;
--- key.flags = BRCMF_PRIMARY_KEY;
--- key.algo = CRYPTO_ALGO_OFF;
---
--- brcmf_dbg(CONN, "key index (%d)\n", key_idx);
---
--- /* Set the new key/index */
--- err = send_key_to_dongle(ifp, &key);
---
--- brcmf_dbg(TRACE, "Exit\n");
--- return err;
---}
--
-- static s32
-- brcmf_cfg80211_get_key(struct wiphy *wiphy, struct net_device *ndev,
-diff --git a/package/kernel/mac80211/patches/344-0020-brcmfmac-add-802.11w-management-frame-protection-sup.patch b/package/kernel/mac80211/patches/344-0020-brcmfmac-add-802.11w-management-frame-protection-sup.patch
-deleted file mode 100644
-index c20d40c049724d71cf65170872be9e3a0c3ff21a..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/344-0020-brcmfmac-add-802.11w-management-frame-protection-sup.patch
-+++ /dev/null
-@@ -1,509 +0,0 @@
--From: Hante Meuleman <hante.meuleman@broadcom.com>
--Date: Wed, 17 Feb 2016 11:27:10 +0100
--Subject: [PATCH] brcmfmac: add 802.11w management frame protection support
--
--Add full support for both AP and STA for management frame protection.
--
--Reviewed-by: Arend Van Spriel <arend.van@broadcom.com>
--Reviewed-by: Franky (Zhenhui) Lin <franky.lin@broadcom.com>
--Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
--Signed-off-by: Hante Meuleman <hante.meuleman@broadcom.com>
--Signed-off-by: Arend van Spriel <arend@broadcom.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--@@ -72,8 +72,13 @@
-- #define RSN_AKM_NONE 0 /* None (IBSS) */
-- #define RSN_AKM_UNSPECIFIED 1 /* Over 802.1x */
-- #define RSN_AKM_PSK 2 /* Pre-shared Key */
--+#define RSN_AKM_SHA256_1X 5 /* SHA256, 802.1X */
--+#define RSN_AKM_SHA256_PSK 6 /* SHA256, Pre-shared Key */
-- #define RSN_CAP_LEN 2 /* Length of RSN capabilities */
---#define RSN_CAP_PTK_REPLAY_CNTR_MASK 0x000C
--+#define RSN_CAP_PTK_REPLAY_CNTR_MASK (BIT(2) | BIT(3))
--+#define RSN_CAP_MFPR_MASK BIT(6)
--+#define RSN_CAP_MFPC_MASK BIT(7)
--+#define RSN_PMKID_COUNT_LEN 2
--
-- #define VNDR_IE_CMD_LEN 4 /* length of the set command
-- * string :"add", "del" (+ NUL)
--@@ -211,12 +216,19 @@ static const struct ieee80211_regdomain
-- REG_RULE(5470-10, 5850+10, 80, 6, 20, 0), }
-- };
--
---static const u32 __wl_cipher_suites[] = {
--+/* Note: brcmf_cipher_suites is an array of int defining which cipher suites
--+ * are supported. A pointer to this array and the number of entries is passed
--+ * on to upper layers. AES_CMAC defines whether or not the driver supports MFP.
--+ * So the cipher suite AES_CMAC has to be the last one in the array, and when
--+ * device does not support MFP then the number of suites will be decreased by 1
--+ */
--+static const u32 brcmf_cipher_suites[] = {
-- WLAN_CIPHER_SUITE_WEP40,
-- WLAN_CIPHER_SUITE_WEP104,
-- WLAN_CIPHER_SUITE_TKIP,
-- WLAN_CIPHER_SUITE_CCMP,
--- WLAN_CIPHER_SUITE_AES_CMAC,
--+ /* Keep as last entry: */
--+ WLAN_CIPHER_SUITE_AES_CMAC
-- };
--
-- /* Vendor specific ie. id = 221, oui and type defines exact ie */
--@@ -1533,7 +1545,7 @@ static s32 brcmf_set_auth_type(struct ne
--
-- static s32
-- brcmf_set_wsec_mode(struct net_device *ndev,
--- struct cfg80211_connect_params *sme, bool mfp)
--+ struct cfg80211_connect_params *sme)
-- {
-- struct brcmf_cfg80211_profile *profile = ndev_to_prof(ndev);
-- struct brcmf_cfg80211_security *sec;
--@@ -1592,10 +1604,7 @@ brcmf_set_wsec_mode(struct net_device *n
-- sme->privacy)
-- pval = AES_ENABLED;
--
--- if (mfp)
--- wsec = pval | gval | MFP_CAPABLE;
--- else
--- wsec = pval | gval;
--+ wsec = pval | gval;
-- err = brcmf_fil_bsscfg_int_set(netdev_priv(ndev), "wsec", wsec);
-- if (err) {
-- brcmf_err("error (%d)\n", err);
--@@ -1612,56 +1621,100 @@ brcmf_set_wsec_mode(struct net_device *n
-- static s32
-- brcmf_set_key_mgmt(struct net_device *ndev, struct cfg80211_connect_params *sme)
-- {
--- struct brcmf_cfg80211_profile *profile = ndev_to_prof(ndev);
--- struct brcmf_cfg80211_security *sec;
--- s32 val = 0;
--- s32 err = 0;
--+ struct brcmf_if *ifp = netdev_priv(ndev);
--+ s32 val;
--+ s32 err;
--+ const struct brcmf_tlv *rsn_ie;
--+ const u8 *ie;
--+ u32 ie_len;
--+ u32 offset;
--+ u16 rsn_cap;
--+ u32 mfp;
--+ u16 count;
--
--- if (sme->crypto.n_akm_suites) {
--- err = brcmf_fil_bsscfg_int_get(netdev_priv(ndev),
--- "wpa_auth", &val);
--- if (err) {
--- brcmf_err("could not get wpa_auth (%d)\n", err);
--- return err;
--+ if (!sme->crypto.n_akm_suites)
--+ return 0;
--+
--+ err = brcmf_fil_bsscfg_int_get(netdev_priv(ndev), "wpa_auth", &val);
--+ if (err) {
--+ brcmf_err("could not get wpa_auth (%d)\n", err);
--+ return err;
--+ }
--+ if (val & (WPA_AUTH_PSK | WPA_AUTH_UNSPECIFIED)) {
--+ switch (sme->crypto.akm_suites[0]) {
--+ case WLAN_AKM_SUITE_8021X:
--+ val = WPA_AUTH_UNSPECIFIED;
--+ break;
--+ case WLAN_AKM_SUITE_PSK:
--+ val = WPA_AUTH_PSK;
--+ break;
--+ default:
--+ brcmf_err("invalid cipher group (%d)\n",
--+ sme->crypto.cipher_group);
--+ return -EINVAL;
-- }
--- if (val & (WPA_AUTH_PSK | WPA_AUTH_UNSPECIFIED)) {
--- switch (sme->crypto.akm_suites[0]) {
--- case WLAN_AKM_SUITE_8021X:
--- val = WPA_AUTH_UNSPECIFIED;
--- break;
--- case WLAN_AKM_SUITE_PSK:
--- val = WPA_AUTH_PSK;
--- break;
--- default:
--- brcmf_err("invalid cipher group (%d)\n",
--- sme->crypto.cipher_group);
--- return -EINVAL;
--- }
--- } else if (val & (WPA2_AUTH_PSK | WPA2_AUTH_UNSPECIFIED)) {
--- switch (sme->crypto.akm_suites[0]) {
--- case WLAN_AKM_SUITE_8021X:
--- val = WPA2_AUTH_UNSPECIFIED;
--- break;
--- case WLAN_AKM_SUITE_PSK:
--- val = WPA2_AUTH_PSK;
--- break;
--- default:
--- brcmf_err("invalid cipher group (%d)\n",
--- sme->crypto.cipher_group);
--- return -EINVAL;
--- }
--+ } else if (val & (WPA2_AUTH_PSK | WPA2_AUTH_UNSPECIFIED)) {
--+ switch (sme->crypto.akm_suites[0]) {
--+ case WLAN_AKM_SUITE_8021X:
--+ val = WPA2_AUTH_UNSPECIFIED;
--+ break;
--+ case WLAN_AKM_SUITE_8021X_SHA256:
--+ val = WPA2_AUTH_1X_SHA256;
--+ break;
--+ case WLAN_AKM_SUITE_PSK_SHA256:
--+ val = WPA2_AUTH_PSK_SHA256;
--+ break;
--+ case WLAN_AKM_SUITE_PSK:
--+ val = WPA2_AUTH_PSK;
--+ break;
--+ default:
--+ brcmf_err("invalid cipher group (%d)\n",
--+ sme->crypto.cipher_group);
--+ return -EINVAL;
-- }
--+ }
--
--- brcmf_dbg(CONN, "setting wpa_auth to %d\n", val);
--- err = brcmf_fil_bsscfg_int_set(netdev_priv(ndev),
--- "wpa_auth", val);
--- if (err) {
--- brcmf_err("could not set wpa_auth (%d)\n", err);
--- return err;
--- }
--+ if (!brcmf_feat_is_enabled(ifp, BRCMF_FEAT_MFP))
--+ goto skip_mfp_config;
--+ /* The MFP mode (1 or 2) needs to be determined, parse IEs. The
--+ * IE will not be verified, just a quick search for MFP config
--+ */
--+ rsn_ie = brcmf_parse_tlvs((const u8 *)sme->ie, sme->ie_len,
--+ WLAN_EID_RSN);
--+ if (!rsn_ie)
--+ goto skip_mfp_config;
--+ ie = (const u8 *)rsn_ie;
--+ ie_len = rsn_ie->len + TLV_HDR_LEN;
--+ /* Skip unicast suite */
--+ offset = TLV_HDR_LEN + WPA_IE_VERSION_LEN + WPA_IE_MIN_OUI_LEN;
--+ if (offset + WPA_IE_SUITE_COUNT_LEN >= ie_len)
--+ goto skip_mfp_config;
--+ /* Skip multicast suite */
--+ count = ie[offset] + (ie[offset + 1] << 8);
--+ offset += WPA_IE_SUITE_COUNT_LEN + (count * WPA_IE_MIN_OUI_LEN);
--+ if (offset + WPA_IE_SUITE_COUNT_LEN >= ie_len)
--+ goto skip_mfp_config;
--+ /* Skip auth key management suite(s) */
--+ count = ie[offset] + (ie[offset + 1] << 8);
--+ offset += WPA_IE_SUITE_COUNT_LEN + (count * WPA_IE_MIN_OUI_LEN);
--+ if (offset + WPA_IE_SUITE_COUNT_LEN > ie_len)
--+ goto skip_mfp_config;
--+ /* Ready to read capabilities */
--+ mfp = BRCMF_MFP_NONE;
--+ rsn_cap = ie[offset] + (ie[offset + 1] << 8);
--+ if (rsn_cap & RSN_CAP_MFPR_MASK)
--+ mfp = BRCMF_MFP_REQUIRED;
--+ else if (rsn_cap & RSN_CAP_MFPC_MASK)
--+ mfp = BRCMF_MFP_CAPABLE;
--+ brcmf_fil_bsscfg_int_set(netdev_priv(ndev), "mfp", mfp);
--+
--+skip_mfp_config:
--+ brcmf_dbg(CONN, "setting wpa_auth to %d\n", val);
--+ err = brcmf_fil_bsscfg_int_set(netdev_priv(ndev), "wpa_auth", val);
--+ if (err) {
--+ brcmf_err("could not set wpa_auth (%d)\n", err);
--+ return err;
-- }
--- sec = &profile->sec;
--- sec->wpa_auth = sme->crypto.akm_suites[0];
--
-- return err;
-- }
--@@ -1827,7 +1880,7 @@ brcmf_cfg80211_connect(struct wiphy *wip
-- goto done;
-- }
--
--- err = brcmf_set_wsec_mode(ndev, sme, sme->mfp == NL80211_MFP_REQUIRED);
--+ err = brcmf_set_wsec_mode(ndev, sme);
-- if (err) {
-- brcmf_err("wl_set_set_cipher failed (%d)\n", err);
-- goto done;
--@@ -2077,10 +2130,12 @@ brcmf_cfg80211_del_key(struct wiphy *wip
-- u8 key_idx, bool pairwise, const u8 *mac_addr)
-- {
-- struct brcmf_if *ifp = netdev_priv(ndev);
--- struct brcmf_wsec_key key;
--- s32 err = 0;
--+ struct brcmf_wsec_key *key;
--+ s32 err;
--
-- brcmf_dbg(TRACE, "Enter\n");
--+ brcmf_dbg(CONN, "key index (%d)\n", key_idx);
--+
-- if (!check_vif_up(ifp->vif))
-- return -EIO;
--
--@@ -2089,16 +2144,19 @@ brcmf_cfg80211_del_key(struct wiphy *wip
-- return -EINVAL;
-- }
--
--- memset(&key, 0, sizeof(key));
--+ key = &ifp->vif->profile.key[key_idx];
--
--- key.index = (u32)key_idx;
--- key.flags = BRCMF_PRIMARY_KEY;
--- key.algo = CRYPTO_ALGO_OFF;
--+ if (key->algo == CRYPTO_ALGO_OFF) {
--+ brcmf_dbg(CONN, "Ignore clearing of (never configured) key\n");
--+ return -EINVAL;
--+ }
--
--- brcmf_dbg(CONN, "key index (%d)\n", key_idx);
--+ memset(key, 0, sizeof(*key));
--+ key->index = (u32)key_idx;
--+ key->flags = BRCMF_PRIMARY_KEY;
--
--- /* Set the new key/index */
--- err = send_key_to_dongle(ifp, &key);
--+ /* Clear the key/index */
--+ err = send_key_to_dongle(ifp, key);
--
-- brcmf_dbg(TRACE, "Exit\n");
-- return err;
--@@ -2106,8 +2164,8 @@ brcmf_cfg80211_del_key(struct wiphy *wip
--
-- static s32
-- brcmf_cfg80211_add_key(struct wiphy *wiphy, struct net_device *ndev,
--- u8 key_idx, bool pairwise, const u8 *mac_addr,
--- struct key_params *params)
--+ u8 key_idx, bool pairwise, const u8 *mac_addr,
--+ struct key_params *params)
-- {
-- struct brcmf_if *ifp = netdev_priv(ndev);
-- struct brcmf_wsec_key *key;
--@@ -2214,9 +2272,10 @@ done:
-- }
--
-- static s32
---brcmf_cfg80211_get_key(struct wiphy *wiphy, struct net_device *ndev,
--- u8 key_idx, bool pairwise, const u8 *mac_addr, void *cookie,
--- void (*callback) (void *cookie, struct key_params * params))
--+brcmf_cfg80211_get_key(struct wiphy *wiphy, struct net_device *ndev, u8 key_idx,
--+ bool pairwise, const u8 *mac_addr, void *cookie,
--+ void (*callback)(void *cookie,
--+ struct key_params *params))
-- {
-- struct key_params params;
-- struct brcmf_if *ifp = netdev_priv(ndev);
--@@ -2268,8 +2327,15 @@ done:
--
-- static s32
-- brcmf_cfg80211_config_default_mgmt_key(struct wiphy *wiphy,
--- struct net_device *ndev, u8 key_idx)
--+ struct net_device *ndev, u8 key_idx)
-- {
--+ struct brcmf_if *ifp = netdev_priv(ndev);
--+
--+ brcmf_dbg(TRACE, "Enter key_idx %d\n", key_idx);
--+
--+ if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_MFP))
--+ return 0;
--+
-- brcmf_dbg(INFO, "Not supported\n");
--
-- return -EOPNOTSUPP;
--@@ -3769,7 +3835,7 @@ brcmf_configure_wpaie(struct brcmf_if *i
-- u32 auth = 0; /* d11 open authentication */
-- u16 count;
-- s32 err = 0;
--- s32 len = 0;
--+ s32 len;
-- u32 i;
-- u32 wsec;
-- u32 pval = 0;
--@@ -3779,6 +3845,7 @@ brcmf_configure_wpaie(struct brcmf_if *i
-- u8 *data;
-- u16 rsn_cap;
-- u32 wme_bss_disable;
--+ u32 mfp;
--
-- brcmf_dbg(TRACE, "Enter\n");
-- if (wpa_ie == NULL)
--@@ -3893,19 +3960,53 @@ brcmf_configure_wpaie(struct brcmf_if *i
-- is_rsn_ie ? (wpa_auth |= WPA2_AUTH_PSK) :
-- (wpa_auth |= WPA_AUTH_PSK);
-- break;
--+ case RSN_AKM_SHA256_PSK:
--+ brcmf_dbg(TRACE, "RSN_AKM_MFP_PSK\n");
--+ wpa_auth |= WPA2_AUTH_PSK_SHA256;
--+ break;
--+ case RSN_AKM_SHA256_1X:
--+ brcmf_dbg(TRACE, "RSN_AKM_MFP_1X\n");
--+ wpa_auth |= WPA2_AUTH_1X_SHA256;
--+ break;
-- default:
-- brcmf_err("Ivalid key mgmt info\n");
-- }
-- offset++;
-- }
--
--+ mfp = BRCMF_MFP_NONE;
-- if (is_rsn_ie) {
-- wme_bss_disable = 1;
-- if ((offset + RSN_CAP_LEN) <= len) {
-- rsn_cap = data[offset] + (data[offset + 1] << 8);
-- if (rsn_cap & RSN_CAP_PTK_REPLAY_CNTR_MASK)
-- wme_bss_disable = 0;
--+ if (rsn_cap & RSN_CAP_MFPR_MASK) {
--+ brcmf_dbg(TRACE, "MFP Required\n");
--+ mfp = BRCMF_MFP_REQUIRED;
--+ /* Firmware only supports mfp required in
--+ * combination with WPA2_AUTH_PSK_SHA256 or
--+ * WPA2_AUTH_1X_SHA256.
--+ */
--+ if (!(wpa_auth & (WPA2_AUTH_PSK_SHA256 |
--+ WPA2_AUTH_1X_SHA256))) {
--+ err = -EINVAL;
--+ goto exit;
--+ }
--+ /* Firmware has requirement that WPA2_AUTH_PSK/
--+ * WPA2_AUTH_UNSPECIFIED be set, if SHA256 OUI
--+ * is to be included in the rsn ie.
--+ */
--+ if (wpa_auth & WPA2_AUTH_PSK_SHA256)
--+ wpa_auth |= WPA2_AUTH_PSK;
--+ else if (wpa_auth & WPA2_AUTH_1X_SHA256)
--+ wpa_auth |= WPA2_AUTH_UNSPECIFIED;
--+ } else if (rsn_cap & RSN_CAP_MFPC_MASK) {
--+ brcmf_dbg(TRACE, "MFP Capable\n");
--+ mfp = BRCMF_MFP_CAPABLE;
--+ }
-- }
--+ offset += RSN_CAP_LEN;
-- /* set wme_bss_disable to sync RSN Capabilities */
-- err = brcmf_fil_bsscfg_int_set(ifp, "wme_bss_disable",
-- wme_bss_disable);
--@@ -3913,6 +4014,21 @@ brcmf_configure_wpaie(struct brcmf_if *i
-- brcmf_err("wme_bss_disable error %d\n", err);
-- goto exit;
-- }
--+
--+ /* Skip PMKID cnt as it is know to be 0 for AP. */
--+ offset += RSN_PMKID_COUNT_LEN;
--+
--+ /* See if there is BIP wpa suite left for MFP */
--+ if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_MFP) &&
--+ ((offset + WPA_IE_MIN_OUI_LEN) <= len)) {
--+ err = brcmf_fil_bsscfg_data_set(ifp, "bip",
--+ &data[offset],
--+ WPA_IE_MIN_OUI_LEN);
--+ if (err < 0) {
--+ brcmf_err("bip error %d\n", err);
--+ goto exit;
--+ }
--+ }
-- }
-- /* FOR WPS , set SES_OW_ENABLED */
-- wsec = (pval | gval | SES_OW_ENABLED);
--@@ -3929,6 +4045,16 @@ brcmf_configure_wpaie(struct brcmf_if *i
-- brcmf_err("wsec error %d\n", err);
-- goto exit;
-- }
--+ /* Configure MFP, this needs to go after wsec otherwise the wsec command
--+ * will overwrite the values set by MFP
--+ */
--+ if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_MFP)) {
--+ err = brcmf_fil_bsscfg_int_set(ifp, "mfp", mfp);
--+ if (err < 0) {
--+ brcmf_err("mfp error %d\n", err);
--+ goto exit;
--+ }
--+ }
-- /* set upper-layer auth */
-- err = brcmf_fil_bsscfg_int_set(ifp, "wpa_auth", wpa_auth);
-- if (err < 0) {
--@@ -6149,8 +6275,10 @@ static int brcmf_setup_wiphy(struct wiph
-- wiphy->n_addresses = i;
--
-- wiphy->signal_type = CFG80211_SIGNAL_TYPE_MBM;
--- wiphy->cipher_suites = __wl_cipher_suites;
--- wiphy->n_cipher_suites = ARRAY_SIZE(__wl_cipher_suites);
--+ wiphy->cipher_suites = brcmf_cipher_suites;
--+ wiphy->n_cipher_suites = ARRAY_SIZE(brcmf_cipher_suites);
--+ if (!brcmf_feat_is_enabled(ifp, BRCMF_FEAT_MFP))
--+ wiphy->n_cipher_suites--;
-- wiphy->flags |= WIPHY_FLAG_PS_ON_BY_DEFAULT |
-- WIPHY_FLAG_OFFCHAN_TX |
-- WIPHY_FLAG_HAS_REMAIN_ON_CHANNEL;
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h
--@@ -72,7 +72,7 @@
--
-- #define BRCMF_VNDR_IE_P2PAF_SHIFT 12
--
---#define BRCMF_MAX_DEFAULT_KEYS 4
--+#define BRCMF_MAX_DEFAULT_KEYS 6
--
-- /* beacon loss timeout defaults */
-- #define BRCMF_DEFAULT_BCN_TIMEOUT_ROAM_ON 2
--@@ -107,7 +107,6 @@ struct brcmf_cfg80211_security {
-- u32 auth_type;
-- u32 cipher_pairwise;
-- u32 cipher_group;
--- u32 wpa_auth;
-- };
--
-- /**
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.c
--@@ -161,6 +161,7 @@ void brcmf_feat_attach(struct brcmf_pub
-- ifp->drvr->feat_flags &= ~BIT(BRCMF_FEAT_MBSS);
-- brcmf_feat_iovar_int_get(ifp, BRCMF_FEAT_RSDB, "rsdb_mode");
-- brcmf_feat_iovar_int_get(ifp, BRCMF_FEAT_TDLS, "tdls_enable");
--+ brcmf_feat_iovar_int_get(ifp, BRCMF_FEAT_MFP, "mfp");
--
-- pfn_mac.version = BRCMF_PFN_MACADDR_CFG_VER;
-- err = brcmf_fil_iovar_data_get(ifp, "pfn_macaddr", &pfn_mac,
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.h
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/feature.h
--@@ -30,6 +30,7 @@
-- * WOWL_ND: WOWL net detect (PNO)
-- * WOWL_GTK: (WOWL) GTK rekeying offload
-- * WOWL_ARP_ND: ARP and Neighbor Discovery offload support during WOWL.
--+ * MFP: 802.11w Management Frame Protection.
-- */
-- #define BRCMF_FEAT_LIST \
-- BRCMF_FEAT_DEF(MBSS) \
--@@ -42,7 +43,8 @@
-- BRCMF_FEAT_DEF(SCAN_RANDOM_MAC) \
-- BRCMF_FEAT_DEF(WOWL_ND) \
-- BRCMF_FEAT_DEF(WOWL_GTK) \
--- BRCMF_FEAT_DEF(WOWL_ARP_ND)
--+ BRCMF_FEAT_DEF(WOWL_ARP_ND) \
--+ BRCMF_FEAT_DEF(MFP)
--
-- /*
-- * Quirks:
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwil_types.h
--@@ -142,6 +142,10 @@
-- #define BRCMF_RSN_KEK_LENGTH 16
-- #define BRCMF_RSN_REPLAY_LEN 8
--
--+#define BRCMF_MFP_NONE 0
--+#define BRCMF_MFP_CAPABLE 1
--+#define BRCMF_MFP_REQUIRED 2
--+
-- /* join preference types for join_pref iovar */
-- enum brcmf_join_pref_types {
-- BRCMF_JOIN_PREF_RSSI = 1,
----- a/drivers/net/wireless/broadcom/brcm80211/include/brcmu_wifi.h
--+++ b/drivers/net/wireless/broadcom/brcm80211/include/brcmu_wifi.h
--@@ -236,6 +236,8 @@ static inline bool ac_bitmap_tst(u8 bitm
-- #define WPA2_AUTH_RESERVED3 0x0200
-- #define WPA2_AUTH_RESERVED4 0x0400
-- #define WPA2_AUTH_RESERVED5 0x0800
--+#define WPA2_AUTH_1X_SHA256 0x1000 /* 1X with SHA256 key derivation */
--+#define WPA2_AUTH_PSK_SHA256 0x8000 /* PSK with SHA256 key derivation */
--
-- #define DOT11_DEFAULT_RTS_LEN 2347
-- #define DOT11_DEFAULT_FRAG_LEN 2346
-diff --git a/package/kernel/mac80211/patches/345-brcmfmac-Remove-waitqueue_active-check.patch b/package/kernel/mac80211/patches/345-brcmfmac-Remove-waitqueue_active-check.patch
-deleted file mode 100644
-index 39f438321e833984ef54d3f653f95c01ed041c47..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/345-brcmfmac-Remove-waitqueue_active-check.patch
-+++ /dev/null
-@@ -1,54 +0,0 @@
--From: Hui Wang <hui.wang@canonical.com>
--Date: Wed, 9 Mar 2016 15:25:26 +0800
--Subject: [PATCH] brcmfmac: Remove waitqueue_active check
--
--We met a problem of pm_suspend when repeated closing/opening the lid
--on a Lenovo laptop (1/20 reproduce rate), below is the log:
--
--[ 199.735876] PM: Entering mem sleep
--[ 199.750516] e1000e: EEE TX LPI TIMER: 00000011
--[ 199.856638] Trying to free nonexistent resource <000000000000d000-000000000000d0ff>
--[ 201.753566] brcmfmac: brcmf_pcie_suspend: Timeout on response for entering D3 substate
--[ 201.753581] pci_legacy_suspend(): brcmf_pcie_suspend+0x0/0x1f0 [brcmfmac] returns -5
--[ 201.753585] dpm_run_callback(): pci_pm_suspend+0x0/0x160 returns -5
--[ 201.753589] PM: Device 0000:04:00.0 failed to suspend async: error -5
--
--Through debugging, we found when problem happens, it is not the device
--fails to enter D3, but the signal D3_ACK comes too early to pass the
--waitqueue_active() check.
--
--Just like this:
--brcmf_pcie_send_mb_data(devinfo, BRCMF_H2D_HOST_D3_INFORM);
--// signal is triggered here
--wait_event_timeout(devinfo->mbdata_resp_wait, devinfo->mbdata_completed,
-- BRCMF_PCIE_MBDATA_TIMEOUT);
--
--So far I think it is safe to remove waitqueue_active check since there
--is only one place to trigger this signal (sending
--BRCMF_H2D_HOST_D3_INFORM). And it is not a problem calling wake_up
--event earlier than calling wait_event.
--
--Cc: Brett Rudley <brudley@broadcom.com>
--Cc: Hante Meuleman <meuleman@broadcom.com>
--Cc: Franky (Zhenhui) Lin <frankyl@broadcom.com>
--Cc: Pieter-Paul Giesberts <pieterpg@broadcom.com>
--Cc: Arend van Spriel <arend@broadcom.com>
--Signed-off-by: Hui Wang <hui.wang@canonical.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
--@@ -677,10 +677,8 @@ static void brcmf_pcie_handle_mb_data(st
-- brcmf_dbg(PCIE, "D2H_MB_DATA: DEEP SLEEP EXIT\n");
-- if (dtoh_mb_data & BRCMF_D2H_DEV_D3_ACK) {
-- brcmf_dbg(PCIE, "D2H_MB_DATA: D3 ACK\n");
--- if (waitqueue_active(&devinfo->mbdata_resp_wait)) {
--- devinfo->mbdata_completed = true;
--- wake_up(&devinfo->mbdata_resp_wait);
--- }
--+ devinfo->mbdata_completed = true;
--+ wake_up(&devinfo->mbdata_resp_wait);
-- }
-- }
--
-diff --git a/package/kernel/mac80211/patches/346-brcmfmac-uninitialized-ret-variable.patch b/package/kernel/mac80211/patches/346-brcmfmac-uninitialized-ret-variable.patch
-deleted file mode 100644
-index 3c9ed425da0cb5140149f2c220d029e792ff41b7..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/346-brcmfmac-uninitialized-ret-variable.patch
-+++ /dev/null
-@@ -1,21 +0,0 @@
--From: Dan Carpenter <dan.carpenter@oracle.com>
--Date: Tue, 15 Mar 2016 10:06:10 +0300
--Subject: [PATCH] brcmfmac: uninitialized "ret" variable
--
--There is an error path where "ret" isn't initialized.
--
--Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
--@@ -250,7 +250,7 @@ static int brcmf_sdiod_request_data(stru
-- u32 addr, u8 regsz, void *data, bool write)
-- {
-- struct sdio_func *func;
--- int ret;
--+ int ret = -EINVAL;
--
-- brcmf_dbg(SDIO, "rw=%d, func=%d, addr=0x%05x, nbytes=%d\n",
-- write, fn, addr, regsz);
-diff --git a/package/kernel/mac80211/patches/347-brcmfmac-sdio-remove-unused-variable-retry_limit.patch b/package/kernel/mac80211/patches/347-brcmfmac-sdio-remove-unused-variable-retry_limit.patch
-deleted file mode 100644
-index d1deb6ee5ce73cb1a6ecc9775360c422113cd0b4..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/347-brcmfmac-sdio-remove-unused-variable-retry_limit.patch
-+++ /dev/null
-@@ -1,24 +0,0 @@
--From: Colin Ian King <colin.king@canonical.com>
--Date: Sun, 20 Mar 2016 17:34:52 +0000
--Subject: [PATCH] brcmfmac: sdio: remove unused variable retry_limit
--
--retry_limit has never been used during the life of this driver, so
--we may as well remove it as it is redundant.
--
--Signed-off-by: Colin Ian King <colin.king@canonical.com>
--Reviewed-by: Julian Calaby <julian.calaby@gmail.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
--@@ -535,9 +535,6 @@ static int qcount[NUMPRIO];
--
-- #define RETRYCHAN(chan) ((chan) == SDPCM_EVENT_CHANNEL)
--
---/* Retry count for register access failures */
---static const uint retry_limit = 2;
---
-- /* Limit on rounding up frames */
-- static const uint max_roundup = 512;
--
-diff --git a/package/kernel/mac80211/patches/348-brcmfmac-Delete-unnecessary-variable-initialisation.patch b/package/kernel/mac80211/patches/348-brcmfmac-Delete-unnecessary-variable-initialisation.patch
-deleted file mode 100644
-index d399b264ea9d2ac0d1ba82d725707720b4c0693e..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/348-brcmfmac-Delete-unnecessary-variable-initialisation.patch
-+++ /dev/null
-@@ -1,26 +0,0 @@
--From: Markus Elfring <elfring@users.sourceforge.net>
--Date: Fri, 18 Mar 2016 13:23:24 +1100
--Subject: [PATCH] brcmfmac: Delete unnecessary variable initialisation
--
--In brcmf_sdio_download_firmware(), bcmerror is set by the call to
--brcmf_sdio_download_code_file(), before it's checked in the following
--line.
--
--Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
--Acked-by: Arend van Spriel <arend@broadcom.com>
--[Rewrote commit message]
--Signed-off-by: Julian Calaby <julian.calaby@gmail.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
--@@ -3258,7 +3258,7 @@ static int brcmf_sdio_download_firmware(
-- const struct firmware *fw,
-- void *nvram, u32 nvlen)
-- {
--- int bcmerror = -EFAULT;
--+ int bcmerror;
-- u32 rstvec;
--
-- sdio_claim_host(bus->sdiodev->func[1]);
-diff --git a/package/kernel/mac80211/patches/349-0001-brcmfmac-clear-eventmask-array-before-using-it.patch b/package/kernel/mac80211/patches/349-0001-brcmfmac-clear-eventmask-array-before-using-it.patch
-deleted file mode 100644
-index 0acb4faaf1acb27dd39d11bef81be070c556dcf0..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/349-0001-brcmfmac-clear-eventmask-array-before-using-it.patch
-+++ /dev/null
-@@ -1,27 +0,0 @@
--From: Hante Meuleman <hante.meuleman@broadcom.com>
--Date: Mon, 11 Apr 2016 11:35:21 +0200
--Subject: [PATCH] brcmfmac: clear eventmask array before using it
--
--When the event_msgs iovar is set an array is used to configure the
--enabled events. This arrays needs to nulled before configuring
--otherwise unhandled events will be enabled. This solves a problem
--where in case of wowl the host got woken by an incorrectly enabled
--event.
--
--Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
--Reviewed-by: Arend Van Spriel <arend@broadcom.com>
--Signed-off-by: Hante Meuleman <hante.meuleman@broadcom.com>
--Signed-off-by: Arend van Spriel <arend@broadcom.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c
--@@ -371,6 +371,7 @@ int brcmf_fweh_activate_events(struct br
-- int i, err;
-- s8 eventmask[BRCMF_EVENTING_MASK_LEN];
--
--+ memset(eventmask, 0, sizeof(eventmask));
-- for (i = 0; i < BRCMF_E_LAST; i++) {
-- if (ifp->drvr->fweh.evt_handler[i]) {
-- brcmf_dbg(EVENT, "enable event %s\n",
-diff --git a/package/kernel/mac80211/patches/349-0002-brcmfmac-fix-clearing-wowl-wake-indicators.patch b/package/kernel/mac80211/patches/349-0002-brcmfmac-fix-clearing-wowl-wake-indicators.patch
-deleted file mode 100644
-index 8d3067890c2fe87f88547d151d3da6d7facd8ea0..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/349-0002-brcmfmac-fix-clearing-wowl-wake-indicators.patch
-+++ /dev/null
-@@ -1,27 +0,0 @@
--From: Hante Meuleman <hante.meuleman@broadcom.com>
--Date: Mon, 11 Apr 2016 11:35:22 +0200
--Subject: [PATCH] brcmfmac: fix clearing wowl wake indicators
--
--Newer firmwares require the usage of the wowl wakeind struct as size
--for the iovar to clear the wake indicators. Older firmwares do not
--care, so change the used size.
--
--Reviewed-by: Arend Van Spriel <arend@broadcom.com>
--Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
--Signed-off-by: Hante Meuleman <hante.meuleman@broadcom.com>
--Signed-off-by: Arend van Spriel <arend@broadcom.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--@@ -3608,7 +3608,8 @@ static void brcmf_configure_wowl(struct
-- if (!test_bit(BRCMF_VIF_STATUS_CONNECTED, &ifp->vif->sme_state))
-- wowl_config |= BRCMF_WOWL_UNASSOC;
--
--- brcmf_fil_iovar_data_set(ifp, "wowl_wakeind", "clear", strlen("clear"));
--+ brcmf_fil_iovar_data_set(ifp, "wowl_wakeind", "clear",
--+ sizeof(struct brcmf_wowl_wakeind_le));
-- brcmf_fil_iovar_int_set(ifp, "wowl", wowl_config);
-- brcmf_fil_iovar_int_set(ifp, "wowl_activate", 1);
-- brcmf_bus_wowl_config(cfg->pub->bus_if, true);
-diff --git a/package/kernel/mac80211/patches/349-0003-brcmfmac-insert-default-boardrev-in-nvram-data-if-mi.patch b/package/kernel/mac80211/patches/349-0003-brcmfmac-insert-default-boardrev-in-nvram-data-if-mi.patch
-deleted file mode 100644
-index f293401ca82d37e367600acf2676b18f6fad92ba..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/349-0003-brcmfmac-insert-default-boardrev-in-nvram-data-if-mi.patch
-+++ /dev/null
-@@ -1,114 +0,0 @@
--From: Hante Meuleman <hante.meuleman@broadcom.com>
--Date: Mon, 11 Apr 2016 11:35:23 +0200
--Subject: [PATCH] brcmfmac: insert default boardrev in nvram data if
-- missing
--
--Some nvram files/stores come without the boardrev information,
--but firmware requires this to be set. When not found in nvram then
--add a default boardrev string to the nvram data.
--
--Reported-by: Rafal Milecki <zajec5@gmail.com>
--Reviewed-by: Arend Van Spriel <arend@broadcom.com>
--Reviewed-by: Franky (Zhenhui) Lin <franky.lin@broadcom.com>
--Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
--Signed-off-by: Hante Meuleman <hante.meuleman@broadcom.com>
--Signed-off-by: Arend van Spriel <arend@broadcom.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
--@@ -29,6 +29,7 @@
-- #define BRCMF_FW_MAX_NVRAM_SIZE 64000
-- #define BRCMF_FW_NVRAM_DEVPATH_LEN 19 /* devpath0=pcie/1/4/ */
-- #define BRCMF_FW_NVRAM_PCIEDEV_LEN 10 /* pcie/1/4/ + \0 */
--+#define BRCMF_FW_DEFAULT_BOARDREV "boardrev=0xff"
--
-- enum nvram_parser_state {
-- IDLE,
--@@ -51,6 +52,7 @@ enum nvram_parser_state {
-- * @entry: start position of key,value entry.
-- * @multi_dev_v1: detect pcie multi device v1 (compressed).
-- * @multi_dev_v2: detect pcie multi device v2.
--+ * @boardrev_found: nvram contains boardrev information.
-- */
-- struct nvram_parser {
-- enum nvram_parser_state state;
--@@ -63,6 +65,7 @@ struct nvram_parser {
-- u32 entry;
-- bool multi_dev_v1;
-- bool multi_dev_v2;
--+ bool boardrev_found;
-- };
--
-- /**
--@@ -125,6 +128,8 @@ static enum nvram_parser_state brcmf_nvr
-- nvp->multi_dev_v1 = true;
-- if (strncmp(&nvp->data[nvp->entry], "pcie/", 5) == 0)
-- nvp->multi_dev_v2 = true;
--+ if (strncmp(&nvp->data[nvp->entry], "boardrev", 8) == 0)
--+ nvp->boardrev_found = true;
-- } else if (!is_nvram_char(c) || c == ' ') {
-- brcmf_dbg(INFO, "warning: ln=%d:col=%d: '=' expected, skip invalid key entry\n",
-- nvp->line, nvp->column);
--@@ -284,6 +289,8 @@ static void brcmf_fw_strip_multi_v1(stru
-- while (i < nvp->nvram_len) {
-- if ((nvp->nvram[i] - '0' == id) && (nvp->nvram[i + 1] == ':')) {
-- i += 2;
--+ if (strncmp(&nvp->nvram[i], "boardrev", 8) == 0)
--+ nvp->boardrev_found = true;
-- while (nvp->nvram[i] != 0) {
-- nvram[j] = nvp->nvram[i];
-- i++;
--@@ -335,6 +342,8 @@ static void brcmf_fw_strip_multi_v2(stru
-- while (i < nvp->nvram_len - len) {
-- if (strncmp(&nvp->nvram[i], prefix, len) == 0) {
-- i += len;
--+ if (strncmp(&nvp->nvram[i], "boardrev", 8) == 0)
--+ nvp->boardrev_found = true;
-- while (nvp->nvram[i] != 0) {
-- nvram[j] = nvp->nvram[i];
-- i++;
--@@ -356,6 +365,18 @@ fail:
-- nvp->nvram_len = 0;
-- }
--
--+static void brcmf_fw_add_defaults(struct nvram_parser *nvp)
--+{
--+ if (nvp->boardrev_found)
--+ return;
--+
--+ memcpy(&nvp->nvram[nvp->nvram_len], &BRCMF_FW_DEFAULT_BOARDREV,
--+ strlen(BRCMF_FW_DEFAULT_BOARDREV));
--+ nvp->nvram_len += strlen(BRCMF_FW_DEFAULT_BOARDREV);
--+ nvp->nvram[nvp->nvram_len] = '\0';
--+ nvp->nvram_len++;
--+}
--+
-- /* brcmf_nvram_strip :Takes a buffer of "<var>=<value>\n" lines read from a fil
-- * and ending in a NUL. Removes carriage returns, empty lines, comment lines,
-- * and converts newlines to NULs. Shortens buffer as needed and pads with NULs.
--@@ -377,16 +398,21 @@ static void *brcmf_fw_nvram_strip(const
-- if (nvp.state == END)
-- break;
-- }
--- if (nvp.multi_dev_v1)
--+ if (nvp.multi_dev_v1) {
--+ nvp.boardrev_found = false;
-- brcmf_fw_strip_multi_v1(&nvp, domain_nr, bus_nr);
--- else if (nvp.multi_dev_v2)
--+ } else if (nvp.multi_dev_v2) {
--+ nvp.boardrev_found = false;
-- brcmf_fw_strip_multi_v2(&nvp, domain_nr, bus_nr);
--+ }
--
-- if (nvp.nvram_len == 0) {
-- kfree(nvp.nvram);
-- return NULL;
-- }
--
--+ brcmf_fw_add_defaults(&nvp);
--+
-- pad = nvp.nvram_len;
-- *new_length = roundup(nvp.nvram_len + 1, 4);
-- while (pad != *new_length) {
-diff --git a/package/kernel/mac80211/patches/349-0004-brcmfmac-fix-p2p-scan-abort-null-pointer-exception.patch b/package/kernel/mac80211/patches/349-0004-brcmfmac-fix-p2p-scan-abort-null-pointer-exception.patch
-deleted file mode 100644
-index ed0c83f9bbc9a2ce4741cfbe5a5cd7fde6938c7b..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/349-0004-brcmfmac-fix-p2p-scan-abort-null-pointer-exception.patch
-+++ /dev/null
-@@ -1,29 +0,0 @@
--From: Hante Meuleman <hante.meuleman@broadcom.com>
--Date: Mon, 11 Apr 2016 11:35:24 +0200
--Subject: [PATCH] brcmfmac: fix p2p scan abort null pointer exception
--
--When p2p connection setup is performed without having ever done an
--escan a null pointer exception can occur. This is because the ifp
--to abort scanning is taken from escan struct while it was never
--initialized. Fix this by using the primary ifp for scan abort. The
--abort should still be performed and all scan related commands are
--performed on primary ifp.
--
--Reviewed-by: Arend Van Spriel <arend@broadcom.com>
--Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
--Signed-off-by: Hante Meuleman <hante.meuleman@broadcom.com>
--Signed-off-by: Arend van Spriel <arend@broadcom.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
--@@ -1266,7 +1266,7 @@ static void
-- brcmf_p2p_stop_wait_next_action_frame(struct brcmf_cfg80211_info *cfg)
-- {
-- struct brcmf_p2p_info *p2p = &cfg->p2p;
--- struct brcmf_if *ifp = cfg->escan_info.ifp;
--+ struct brcmf_if *ifp = p2p->bss_idx[P2PAPI_BSSCFG_PRIMARY].vif->ifp;
--
-- if (test_bit(BRCMF_P2P_STATUS_SENDING_ACT_FRAME, &p2p->status) &&
-- (test_bit(BRCMF_P2P_STATUS_ACTION_TX_COMPLETED, &p2p->status) ||
-diff --git a/package/kernel/mac80211/patches/349-0005-brcmfmac-screening-firmware-event-packet.patch b/package/kernel/mac80211/patches/349-0005-brcmfmac-screening-firmware-event-packet.patch
-deleted file mode 100644
-index 4d26404f51951086da093df1073a2bfd09d14349..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/349-0005-brcmfmac-screening-firmware-event-packet.patch
-+++ /dev/null
-@@ -1,297 +0,0 @@
--From: Franky Lin <franky.lin@broadcom.com>
--Date: Mon, 11 Apr 2016 11:35:25 +0200
--Subject: [PATCH] brcmfmac: screening firmware event packet
--
--Firmware uses asynchronized events as a communication method to the
--host. The event packets are marked as ETH_P_LINK_CTL protocol type. For
--SDIO and PCIe bus, this kind of packets are delivered through virtual
--event channel not data channel. This patch adds a screening logic to
--make sure the event handler only processes the events coming from the
--correct channel.
--
--Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
--Signed-off-by: Franky Lin <franky.lin@broadcom.com>
--Signed-off-by: Arend van Spriel <arend@broadcom.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h
--@@ -216,7 +216,9 @@ bool brcmf_c_prec_enq(struct device *dev
-- int prec);
--
-- /* Receive frame for delivery to OS. Callee disposes of rxp. */
---void brcmf_rx_frame(struct device *dev, struct sk_buff *rxp);
--+void brcmf_rx_frame(struct device *dev, struct sk_buff *rxp, bool handle_evnt);
--+/* Receive async event packet from firmware. Callee disposes of rxp. */
--+void brcmf_rx_event(struct device *dev, struct sk_buff *rxp);
--
-- /* Indication from bus module regarding presence/insertion of dongle. */
-- int brcmf_attach(struct device *dev, struct brcmf_mp_device *settings);
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
--@@ -311,16 +311,17 @@ void brcmf_txflowblock(struct device *de
-- brcmf_fws_bus_blocked(drvr, state);
-- }
--
---void brcmf_netif_rx(struct brcmf_if *ifp, struct sk_buff *skb)
--+void brcmf_netif_rx(struct brcmf_if *ifp, struct sk_buff *skb,
--+ bool handle_event)
-- {
--- skb->dev = ifp->ndev;
--- skb->protocol = eth_type_trans(skb, skb->dev);
--+ skb->protocol = eth_type_trans(skb, ifp->ndev);
--
-- if (skb->pkt_type == PACKET_MULTICAST)
-- ifp->stats.multicast++;
--
-- /* Process special event packets */
--- brcmf_fweh_process_skb(ifp->drvr, skb);
--+ if (handle_event)
--+ brcmf_fweh_process_skb(ifp->drvr, skb);
--
-- if (!(ifp->ndev->flags & IFF_UP)) {
-- brcmu_pkt_buf_free_skb(skb);
--@@ -381,7 +382,7 @@ static void brcmf_rxreorder_process_info
-- /* validate flags and flow id */
-- if (flags == 0xFF) {
-- brcmf_err("invalid flags...so ignore this packet\n");
--- brcmf_netif_rx(ifp, pkt);
--+ brcmf_netif_rx(ifp, pkt, false);
-- return;
-- }
--
--@@ -393,7 +394,7 @@ static void brcmf_rxreorder_process_info
-- if (rfi == NULL) {
-- brcmf_dbg(INFO, "received flags to cleanup, but no flow (%d) yet\n",
-- flow_id);
--- brcmf_netif_rx(ifp, pkt);
--+ brcmf_netif_rx(ifp, pkt, false);
-- return;
-- }
--
--@@ -418,7 +419,7 @@ static void brcmf_rxreorder_process_info
-- rfi = kzalloc(buf_size, GFP_ATOMIC);
-- if (rfi == NULL) {
-- brcmf_err("failed to alloc buffer\n");
--- brcmf_netif_rx(ifp, pkt);
--+ brcmf_netif_rx(ifp, pkt, false);
-- return;
-- }
--
--@@ -532,11 +533,11 @@ static void brcmf_rxreorder_process_info
-- netif_rx:
-- skb_queue_walk_safe(&reorder_list, pkt, pnext) {
-- __skb_unlink(pkt, &reorder_list);
--- brcmf_netif_rx(ifp, pkt);
--+ brcmf_netif_rx(ifp, pkt, false);
-- }
-- }
--
---void brcmf_rx_frame(struct device *dev, struct sk_buff *skb)
--+void brcmf_rx_frame(struct device *dev, struct sk_buff *skb, bool handle_evnt)
-- {
-- struct brcmf_if *ifp;
-- struct brcmf_bus *bus_if = dev_get_drvdata(dev);
--@@ -560,7 +561,32 @@ void brcmf_rx_frame(struct device *dev,
-- if (rd->reorder)
-- brcmf_rxreorder_process_info(ifp, rd->reorder, skb);
-- else
--- brcmf_netif_rx(ifp, skb);
--+ brcmf_netif_rx(ifp, skb, handle_evnt);
--+}
--+
--+void brcmf_rx_event(struct device *dev, struct sk_buff *skb)
--+{
--+ struct brcmf_if *ifp;
--+ struct brcmf_bus *bus_if = dev_get_drvdata(dev);
--+ struct brcmf_pub *drvr = bus_if->drvr;
--+ int ret;
--+
--+ brcmf_dbg(EVENT, "Enter: %s: rxp=%p\n", dev_name(dev), skb);
--+
--+ /* process and remove protocol-specific header */
--+ ret = brcmf_proto_hdrpull(drvr, true, skb, &ifp);
--+
--+ if (ret || !ifp || !ifp->ndev) {
--+ if (ret != -ENODATA && ifp)
--+ ifp->stats.rx_errors++;
--+ brcmu_pkt_buf_free_skb(skb);
--+ return;
--+ }
--+
--+ skb->protocol = eth_type_trans(skb, ifp->ndev);
--+
--+ brcmf_fweh_process_skb(ifp->drvr, skb);
--+ brcmu_pkt_buf_free_skb(skb);
-- }
--
-- void brcmf_txfinalize(struct brcmf_if *ifp, struct sk_buff *txp, bool success)
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h
--@@ -225,7 +225,8 @@ int brcmf_get_next_free_bsscfgidx(struct
-- void brcmf_txflowblock_if(struct brcmf_if *ifp,
-- enum brcmf_netif_stop_reason reason, bool state);
-- void brcmf_txfinalize(struct brcmf_if *ifp, struct sk_buff *txp, bool success);
---void brcmf_netif_rx(struct brcmf_if *ifp, struct sk_buff *skb);
--+void brcmf_netif_rx(struct brcmf_if *ifp, struct sk_buff *skb,
--+ bool handle_event);
-- void brcmf_net_setcarrier(struct brcmf_if *ifp, bool on);
-- int __init brcmf_core_init(void);
-- void __exit brcmf_core_exit(void);
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c
--@@ -20,6 +20,7 @@
--
-- #include <linux/types.h>
-- #include <linux/netdevice.h>
--+#include <linux/etherdevice.h>
--
-- #include <brcmu_utils.h>
-- #include <brcmu_wifi.h>
--@@ -1075,28 +1076,13 @@ static void brcmf_msgbuf_rxbuf_event_pos
-- }
--
--
---static void
---brcmf_msgbuf_rx_skb(struct brcmf_msgbuf *msgbuf, struct sk_buff *skb,
--- u8 ifidx)
---{
--- struct brcmf_if *ifp;
---
--- ifp = brcmf_get_ifp(msgbuf->drvr, ifidx);
--- if (!ifp || !ifp->ndev) {
--- brcmf_err("Received pkt for invalid ifidx %d\n", ifidx);
--- brcmu_pkt_buf_free_skb(skb);
--- return;
--- }
--- brcmf_netif_rx(ifp, skb);
---}
---
---
-- static void brcmf_msgbuf_process_event(struct brcmf_msgbuf *msgbuf, void *buf)
-- {
-- struct msgbuf_rx_event *event;
-- u32 idx;
-- u16 buflen;
-- struct sk_buff *skb;
--+ struct brcmf_if *ifp;
--
-- event = (struct msgbuf_rx_event *)buf;
-- idx = le32_to_cpu(event->msg.request_id);
--@@ -1116,7 +1102,19 @@ static void brcmf_msgbuf_process_event(s
--
-- skb_trim(skb, buflen);
--
--- brcmf_msgbuf_rx_skb(msgbuf, skb, event->msg.ifidx);
--+ ifp = brcmf_get_ifp(msgbuf->drvr, event->msg.ifidx);
--+ if (!ifp || !ifp->ndev) {
--+ brcmf_err("Received pkt for invalid ifidx %d\n",
--+ event->msg.ifidx);
--+ goto exit;
--+ }
--+
--+ skb->protocol = eth_type_trans(skb, ifp->ndev);
--+
--+ brcmf_fweh_process_skb(ifp->drvr, skb);
--+
--+exit:
--+ brcmu_pkt_buf_free_skb(skb);
-- }
--
--
--@@ -1128,6 +1126,7 @@ brcmf_msgbuf_process_rx_complete(struct
-- u16 data_offset;
-- u16 buflen;
-- u32 idx;
--+ struct brcmf_if *ifp;
--
-- brcmf_msgbuf_update_rxbufpost_count(msgbuf, 1);
--
--@@ -1148,7 +1147,14 @@ brcmf_msgbuf_process_rx_complete(struct
--
-- skb_trim(skb, buflen);
--
--- brcmf_msgbuf_rx_skb(msgbuf, skb, rx_complete->msg.ifidx);
--+ ifp = brcmf_get_ifp(msgbuf->drvr, rx_complete->msg.ifidx);
--+ if (!ifp || !ifp->ndev) {
--+ brcmf_err("Received pkt for invalid ifidx %d\n",
--+ rx_complete->msg.ifidx);
--+ brcmu_pkt_buf_free_skb(skb);
--+ return;
--+ }
--+ brcmf_netif_rx(ifp, skb, false);
-- }
--
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
--@@ -1294,6 +1294,17 @@ static inline u8 brcmf_sdio_getdatoffset
-- return (u8)((hdrvalue & SDPCM_DOFFSET_MASK) >> SDPCM_DOFFSET_SHIFT);
-- }
--
--+static inline bool brcmf_sdio_fromevntchan(u8 *swheader)
--+{
--+ u32 hdrvalue;
--+ u8 ret;
--+
--+ hdrvalue = *(u32 *)swheader;
--+ ret = (u8)((hdrvalue & SDPCM_CHANNEL_MASK) >> SDPCM_CHANNEL_SHIFT);
--+
--+ return (ret == SDPCM_EVENT_CHANNEL);
--+}
--+
-- static int brcmf_sdio_hdparse(struct brcmf_sdio *bus, u8 *header,
-- struct brcmf_sdio_hdrinfo *rd,
-- enum brcmf_sdio_frmtype type)
--@@ -1641,7 +1652,11 @@ static u8 brcmf_sdio_rxglom(struct brcmf
-- pfirst->len, pfirst->next,
-- pfirst->prev);
-- skb_unlink(pfirst, &bus->glom);
--- brcmf_rx_frame(bus->sdiodev->dev, pfirst);
--+ if (brcmf_sdio_fromevntchan(pfirst->data))
--+ brcmf_rx_event(bus->sdiodev->dev, pfirst);
--+ else
--+ brcmf_rx_frame(bus->sdiodev->dev, pfirst,
--+ false);
-- bus->sdcnt.rxglompkts++;
-- }
--
--@@ -1967,18 +1982,19 @@ static uint brcmf_sdio_readframes(struct
-- __skb_trim(pkt, rd->len);
-- skb_pull(pkt, rd->dat_offset);
--
--+ if (pkt->len == 0)
--+ brcmu_pkt_buf_free_skb(pkt);
--+ else if (rd->channel == SDPCM_EVENT_CHANNEL)
--+ brcmf_rx_event(bus->sdiodev->dev, pkt);
--+ else
--+ brcmf_rx_frame(bus->sdiodev->dev, pkt,
--+ false);
--+
-- /* prepare the descriptor for the next read */
-- rd->len = rd->len_nxtfrm << 4;
-- rd->len_nxtfrm = 0;
-- /* treat all packet as event if we don't know */
-- rd->channel = SDPCM_EVENT_CHANNEL;
---
--- if (pkt->len == 0) {
--- brcmu_pkt_buf_free_skb(pkt);
--- continue;
--- }
---
--- brcmf_rx_frame(bus->sdiodev->dev, pkt);
-- }
--
-- rxcount = maxframes - rxleft;
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
--@@ -514,7 +514,7 @@ static void brcmf_usb_rx_complete(struct
--
-- if (devinfo->bus_pub.state == BRCMFMAC_USB_STATE_UP) {
-- skb_put(skb, urb->actual_length);
--- brcmf_rx_frame(devinfo->dev, skb);
--+ brcmf_rx_frame(devinfo->dev, skb, true);
-- brcmf_usb_rx_refill(devinfo, req);
-- } else {
-- brcmu_pkt_buf_free_skb(skb);
-diff --git a/package/kernel/mac80211/patches/349-0006-brcmfmac-cleanup-ampdu-rx-host-reorder-code.patch b/package/kernel/mac80211/patches/349-0006-brcmfmac-cleanup-ampdu-rx-host-reorder-code.patch
-deleted file mode 100644
-index 33b263df3aefc1b00e99860b4b9450a6ff23ad83..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/349-0006-brcmfmac-cleanup-ampdu-rx-host-reorder-code.patch
-+++ /dev/null
-@@ -1,585 +0,0 @@
--From: Arend van Spriel <arend@broadcom.com>
--Date: Mon, 11 Apr 2016 11:35:26 +0200
--Subject: [PATCH] brcmfmac: cleanup ampdu-rx host reorder code
--
--The code for ampdu-rx host reorder is related to the firmware signalling
--supported in BCDC protocol. This change moves the code to fwsignal module.
--
--Reviewed-by: Hante Meuleman <hante.meuleman@broadcom.com>
--Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
--Reviewed-by: Franky Lin <franky.lin@broadcom.com>
--Signed-off-by: Arend van Spriel <arend@broadcom.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c
--@@ -351,6 +351,12 @@ brcmf_proto_bcdc_add_tdls_peer(struct br
-- {
-- }
--
--+static void brcmf_proto_bcdc_rxreorder(struct brcmf_if *ifp,
--+ struct sk_buff *skb)
--+{
--+ brcmf_fws_rxreorder(ifp, skb);
--+}
--+
-- int brcmf_proto_bcdc_attach(struct brcmf_pub *drvr)
-- {
-- struct brcmf_bcdc *bcdc;
--@@ -372,6 +378,7 @@ int brcmf_proto_bcdc_attach(struct brcmf
-- drvr->proto->configure_addr_mode = brcmf_proto_bcdc_configure_addr_mode;
-- drvr->proto->delete_peer = brcmf_proto_bcdc_delete_peer;
-- drvr->proto->add_tdls_peer = brcmf_proto_bcdc_add_tdls_peer;
--+ drvr->proto->rxreorder = brcmf_proto_bcdc_rxreorder;
-- drvr->proto->pd = bcdc;
--
-- drvr->hdrlen += BCDC_HEADER_LEN + BRCMF_PROT_FW_SIGNAL_MAX_TXBYTES;
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
--@@ -40,19 +40,6 @@
--
-- #define MAX_WAIT_FOR_8021X_TX msecs_to_jiffies(950)
--
---/* AMPDU rx reordering definitions */
---#define BRCMF_RXREORDER_FLOWID_OFFSET 0
---#define BRCMF_RXREORDER_MAXIDX_OFFSET 2
---#define BRCMF_RXREORDER_FLAGS_OFFSET 4
---#define BRCMF_RXREORDER_CURIDX_OFFSET 6
---#define BRCMF_RXREORDER_EXPIDX_OFFSET 8
---
---#define BRCMF_RXREORDER_DEL_FLOW 0x01
---#define BRCMF_RXREORDER_FLUSH_ALL 0x02
---#define BRCMF_RXREORDER_CURIDX_VALID 0x04
---#define BRCMF_RXREORDER_EXPIDX_VALID 0x08
---#define BRCMF_RXREORDER_NEW_HOLE 0x10
---
-- #define BRCMF_BSSIDX_INVALID -1
--
-- char *brcmf_ifname(struct brcmf_if *ifp)
--@@ -342,207 +329,11 @@ void brcmf_netif_rx(struct brcmf_if *ifp
-- netif_rx_ni(skb);
-- }
--
---static void brcmf_rxreorder_get_skb_list(struct brcmf_ampdu_rx_reorder *rfi,
--- u8 start, u8 end,
--- struct sk_buff_head *skb_list)
---{
--- /* initialize return list */
--- __skb_queue_head_init(skb_list);
---
--- if (rfi->pend_pkts == 0) {
--- brcmf_dbg(INFO, "no packets in reorder queue\n");
--- return;
--- }
---
--- do {
--- if (rfi->pktslots[start]) {
--- __skb_queue_tail(skb_list, rfi->pktslots[start]);
--- rfi->pktslots[start] = NULL;
--- }
--- start++;
--- if (start > rfi->max_idx)
--- start = 0;
--- } while (start != end);
--- rfi->pend_pkts -= skb_queue_len(skb_list);
---}
---
---static void brcmf_rxreorder_process_info(struct brcmf_if *ifp, u8 *reorder_data,
--- struct sk_buff *pkt)
---{
--- u8 flow_id, max_idx, cur_idx, exp_idx, end_idx;
--- struct brcmf_ampdu_rx_reorder *rfi;
--- struct sk_buff_head reorder_list;
--- struct sk_buff *pnext;
--- u8 flags;
--- u32 buf_size;
---
--- flow_id = reorder_data[BRCMF_RXREORDER_FLOWID_OFFSET];
--- flags = reorder_data[BRCMF_RXREORDER_FLAGS_OFFSET];
---
--- /* validate flags and flow id */
--- if (flags == 0xFF) {
--- brcmf_err("invalid flags...so ignore this packet\n");
--- brcmf_netif_rx(ifp, pkt, false);
--- return;
--- }
---
--- rfi = ifp->drvr->reorder_flows[flow_id];
--- if (flags & BRCMF_RXREORDER_DEL_FLOW) {
--- brcmf_dbg(INFO, "flow-%d: delete\n",
--- flow_id);
---
--- if (rfi == NULL) {
--- brcmf_dbg(INFO, "received flags to cleanup, but no flow (%d) yet\n",
--- flow_id);
--- brcmf_netif_rx(ifp, pkt, false);
--- return;
--- }
---
--- brcmf_rxreorder_get_skb_list(rfi, rfi->exp_idx, rfi->exp_idx,
--- &reorder_list);
--- /* add the last packet */
--- __skb_queue_tail(&reorder_list, pkt);
--- kfree(rfi);
--- ifp->drvr->reorder_flows[flow_id] = NULL;
--- goto netif_rx;
--- }
--- /* from here on we need a flow reorder instance */
--- if (rfi == NULL) {
--- buf_size = sizeof(*rfi);
--- max_idx = reorder_data[BRCMF_RXREORDER_MAXIDX_OFFSET];
---
--- buf_size += (max_idx + 1) * sizeof(pkt);
---
--- /* allocate space for flow reorder info */
--- brcmf_dbg(INFO, "flow-%d: start, maxidx %d\n",
--- flow_id, max_idx);
--- rfi = kzalloc(buf_size, GFP_ATOMIC);
--- if (rfi == NULL) {
--- brcmf_err("failed to alloc buffer\n");
--- brcmf_netif_rx(ifp, pkt, false);
--- return;
--- }
---
--- ifp->drvr->reorder_flows[flow_id] = rfi;
--- rfi->pktslots = (struct sk_buff **)(rfi+1);
--- rfi->max_idx = max_idx;
--- }
--- if (flags & BRCMF_RXREORDER_NEW_HOLE) {
--- if (rfi->pend_pkts) {
--- brcmf_rxreorder_get_skb_list(rfi, rfi->exp_idx,
--- rfi->exp_idx,
--- &reorder_list);
--- WARN_ON(rfi->pend_pkts);
--- } else {
--- __skb_queue_head_init(&reorder_list);
--- }
--- rfi->cur_idx = reorder_data[BRCMF_RXREORDER_CURIDX_OFFSET];
--- rfi->exp_idx = reorder_data[BRCMF_RXREORDER_EXPIDX_OFFSET];
--- rfi->max_idx = reorder_data[BRCMF_RXREORDER_MAXIDX_OFFSET];
--- rfi->pktslots[rfi->cur_idx] = pkt;
--- rfi->pend_pkts++;
--- brcmf_dbg(DATA, "flow-%d: new hole %d (%d), pending %d\n",
--- flow_id, rfi->cur_idx, rfi->exp_idx, rfi->pend_pkts);
--- } else if (flags & BRCMF_RXREORDER_CURIDX_VALID) {
--- cur_idx = reorder_data[BRCMF_RXREORDER_CURIDX_OFFSET];
--- exp_idx = reorder_data[BRCMF_RXREORDER_EXPIDX_OFFSET];
---
--- if ((exp_idx == rfi->exp_idx) && (cur_idx != rfi->exp_idx)) {
--- /* still in the current hole */
--- /* enqueue the current on the buffer chain */
--- if (rfi->pktslots[cur_idx] != NULL) {
--- brcmf_dbg(INFO, "HOLE: ERROR buffer pending..free it\n");
--- brcmu_pkt_buf_free_skb(rfi->pktslots[cur_idx]);
--- rfi->pktslots[cur_idx] = NULL;
--- }
--- rfi->pktslots[cur_idx] = pkt;
--- rfi->pend_pkts++;
--- rfi->cur_idx = cur_idx;
--- brcmf_dbg(DATA, "flow-%d: store pkt %d (%d), pending %d\n",
--- flow_id, cur_idx, exp_idx, rfi->pend_pkts);
---
--- /* can return now as there is no reorder
--- * list to process.
--- */
--- return;
--- }
--- if (rfi->exp_idx == cur_idx) {
--- if (rfi->pktslots[cur_idx] != NULL) {
--- brcmf_dbg(INFO, "error buffer pending..free it\n");
--- brcmu_pkt_buf_free_skb(rfi->pktslots[cur_idx]);
--- rfi->pktslots[cur_idx] = NULL;
--- }
--- rfi->pktslots[cur_idx] = pkt;
--- rfi->pend_pkts++;
---
--- /* got the expected one. flush from current to expected
--- * and update expected
--- */
--- brcmf_dbg(DATA, "flow-%d: expected %d (%d), pending %d\n",
--- flow_id, cur_idx, exp_idx, rfi->pend_pkts);
---
--- rfi->cur_idx = cur_idx;
--- rfi->exp_idx = exp_idx;
---
--- brcmf_rxreorder_get_skb_list(rfi, cur_idx, exp_idx,
--- &reorder_list);
--- brcmf_dbg(DATA, "flow-%d: freeing buffers %d, pending %d\n",
--- flow_id, skb_queue_len(&reorder_list),
--- rfi->pend_pkts);
--- } else {
--- u8 end_idx;
---
--- brcmf_dbg(DATA, "flow-%d (0x%x): both moved, old %d/%d, new %d/%d\n",
--- flow_id, flags, rfi->cur_idx, rfi->exp_idx,
--- cur_idx, exp_idx);
--- if (flags & BRCMF_RXREORDER_FLUSH_ALL)
--- end_idx = rfi->exp_idx;
--- else
--- end_idx = exp_idx;
---
--- /* flush pkts first */
--- brcmf_rxreorder_get_skb_list(rfi, rfi->exp_idx, end_idx,
--- &reorder_list);
---
--- if (exp_idx == ((cur_idx + 1) % (rfi->max_idx + 1))) {
--- __skb_queue_tail(&reorder_list, pkt);
--- } else {
--- rfi->pktslots[cur_idx] = pkt;
--- rfi->pend_pkts++;
--- }
--- rfi->exp_idx = exp_idx;
--- rfi->cur_idx = cur_idx;
--- }
--- } else {
--- /* explicity window move updating the expected index */
--- exp_idx = reorder_data[BRCMF_RXREORDER_EXPIDX_OFFSET];
---
--- brcmf_dbg(DATA, "flow-%d (0x%x): change expected: %d -> %d\n",
--- flow_id, flags, rfi->exp_idx, exp_idx);
--- if (flags & BRCMF_RXREORDER_FLUSH_ALL)
--- end_idx = rfi->exp_idx;
--- else
--- end_idx = exp_idx;
---
--- brcmf_rxreorder_get_skb_list(rfi, rfi->exp_idx, end_idx,
--- &reorder_list);
--- __skb_queue_tail(&reorder_list, pkt);
--- /* set the new expected idx */
--- rfi->exp_idx = exp_idx;
--- }
---netif_rx:
--- skb_queue_walk_safe(&reorder_list, pkt, pnext) {
--- __skb_unlink(pkt, &reorder_list);
--- brcmf_netif_rx(ifp, pkt, false);
--- }
---}
---
-- void brcmf_rx_frame(struct device *dev, struct sk_buff *skb, bool handle_evnt)
-- {
-- struct brcmf_if *ifp;
-- struct brcmf_bus *bus_if = dev_get_drvdata(dev);
-- struct brcmf_pub *drvr = bus_if->drvr;
--- struct brcmf_skb_reorder_data *rd;
-- int ret;
--
-- brcmf_dbg(DATA, "Enter: %s: rxp=%p\n", dev_name(dev), skb);
--@@ -557,9 +348,8 @@ void brcmf_rx_frame(struct device *dev,
-- return;
-- }
--
--- rd = (struct brcmf_skb_reorder_data *)skb->cb;
--- if (rd->reorder)
--- brcmf_rxreorder_process_info(ifp, rd->reorder, skb);
--+ if (brcmf_proto_is_reorder_skb(skb))
--+ brcmf_proto_rxreorder(ifp, skb);
-- else
-- brcmf_netif_rx(ifp, skb, handle_evnt);
-- }
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h
--@@ -208,10 +208,6 @@ struct brcmf_if {
-- u8 ipv6addr_idx;
-- };
--
---struct brcmf_skb_reorder_data {
--- u8 *reorder;
---};
---
-- int brcmf_netdev_wait_pend8021x(struct brcmf_if *ifp);
--
-- /* Return pointer to interface name */
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c
--@@ -92,6 +92,19 @@ enum brcmf_fws_tlv_len {
-- };
-- #undef BRCMF_FWS_TLV_DEF
--
--+/* AMPDU rx reordering definitions */
--+#define BRCMF_RXREORDER_FLOWID_OFFSET 0
--+#define BRCMF_RXREORDER_MAXIDX_OFFSET 2
--+#define BRCMF_RXREORDER_FLAGS_OFFSET 4
--+#define BRCMF_RXREORDER_CURIDX_OFFSET 6
--+#define BRCMF_RXREORDER_EXPIDX_OFFSET 8
--+
--+#define BRCMF_RXREORDER_DEL_FLOW 0x01
--+#define BRCMF_RXREORDER_FLUSH_ALL 0x02
--+#define BRCMF_RXREORDER_CURIDX_VALID 0x04
--+#define BRCMF_RXREORDER_EXPIDX_VALID 0x08
--+#define BRCMF_RXREORDER_NEW_HOLE 0x10
--+
-- #ifdef DEBUG
-- /*
-- * brcmf_fws_tlv_names - array of tlv names.
--@@ -1614,6 +1627,202 @@ static int brcmf_fws_notify_bcmc_credit_
-- return 0;
-- }
--
--+static void brcmf_rxreorder_get_skb_list(struct brcmf_ampdu_rx_reorder *rfi,
--+ u8 start, u8 end,
--+ struct sk_buff_head *skb_list)
--+{
--+ /* initialize return list */
--+ __skb_queue_head_init(skb_list);
--+
--+ if (rfi->pend_pkts == 0) {
--+ brcmf_dbg(INFO, "no packets in reorder queue\n");
--+ return;
--+ }
--+
--+ do {
--+ if (rfi->pktslots[start]) {
--+ __skb_queue_tail(skb_list, rfi->pktslots[start]);
--+ rfi->pktslots[start] = NULL;
--+ }
--+ start++;
--+ if (start > rfi->max_idx)
--+ start = 0;
--+ } while (start != end);
--+ rfi->pend_pkts -= skb_queue_len(skb_list);
--+}
--+
--+void brcmf_fws_rxreorder(struct brcmf_if *ifp, struct sk_buff *pkt)
--+{
--+ u8 *reorder_data;
--+ u8 flow_id, max_idx, cur_idx, exp_idx, end_idx;
--+ struct brcmf_ampdu_rx_reorder *rfi;
--+ struct sk_buff_head reorder_list;
--+ struct sk_buff *pnext;
--+ u8 flags;
--+ u32 buf_size;
--+
--+ reorder_data = ((struct brcmf_skb_reorder_data *)pkt->cb)->reorder;
--+ flow_id = reorder_data[BRCMF_RXREORDER_FLOWID_OFFSET];
--+ flags = reorder_data[BRCMF_RXREORDER_FLAGS_OFFSET];
--+
--+ /* validate flags and flow id */
--+ if (flags == 0xFF) {
--+ brcmf_err("invalid flags...so ignore this packet\n");
--+ brcmf_netif_rx(ifp, pkt, false);
--+ return;
--+ }
--+
--+ rfi = ifp->drvr->reorder_flows[flow_id];
--+ if (flags & BRCMF_RXREORDER_DEL_FLOW) {
--+ brcmf_dbg(INFO, "flow-%d: delete\n",
--+ flow_id);
--+
--+ if (rfi == NULL) {
--+ brcmf_dbg(INFO, "received flags to cleanup, but no flow (%d) yet\n",
--+ flow_id);
--+ brcmf_netif_rx(ifp, pkt, false);
--+ return;
--+ }
--+
--+ brcmf_rxreorder_get_skb_list(rfi, rfi->exp_idx, rfi->exp_idx,
--+ &reorder_list);
--+ /* add the last packet */
--+ __skb_queue_tail(&reorder_list, pkt);
--+ kfree(rfi);
--+ ifp->drvr->reorder_flows[flow_id] = NULL;
--+ goto netif_rx;
--+ }
--+ /* from here on we need a flow reorder instance */
--+ if (rfi == NULL) {
--+ buf_size = sizeof(*rfi);
--+ max_idx = reorder_data[BRCMF_RXREORDER_MAXIDX_OFFSET];
--+
--+ buf_size += (max_idx + 1) * sizeof(pkt);
--+
--+ /* allocate space for flow reorder info */
--+ brcmf_dbg(INFO, "flow-%d: start, maxidx %d\n",
--+ flow_id, max_idx);
--+ rfi = kzalloc(buf_size, GFP_ATOMIC);
--+ if (rfi == NULL) {
--+ brcmf_err("failed to alloc buffer\n");
--+ brcmf_netif_rx(ifp, pkt, false);
--+ return;
--+ }
--+
--+ ifp->drvr->reorder_flows[flow_id] = rfi;
--+ rfi->pktslots = (struct sk_buff **)(rfi + 1);
--+ rfi->max_idx = max_idx;
--+ }
--+ if (flags & BRCMF_RXREORDER_NEW_HOLE) {
--+ if (rfi->pend_pkts) {
--+ brcmf_rxreorder_get_skb_list(rfi, rfi->exp_idx,
--+ rfi->exp_idx,
--+ &reorder_list);
--+ WARN_ON(rfi->pend_pkts);
--+ } else {
--+ __skb_queue_head_init(&reorder_list);
--+ }
--+ rfi->cur_idx = reorder_data[BRCMF_RXREORDER_CURIDX_OFFSET];
--+ rfi->exp_idx = reorder_data[BRCMF_RXREORDER_EXPIDX_OFFSET];
--+ rfi->max_idx = reorder_data[BRCMF_RXREORDER_MAXIDX_OFFSET];
--+ rfi->pktslots[rfi->cur_idx] = pkt;
--+ rfi->pend_pkts++;
--+ brcmf_dbg(DATA, "flow-%d: new hole %d (%d), pending %d\n",
--+ flow_id, rfi->cur_idx, rfi->exp_idx, rfi->pend_pkts);
--+ } else if (flags & BRCMF_RXREORDER_CURIDX_VALID) {
--+ cur_idx = reorder_data[BRCMF_RXREORDER_CURIDX_OFFSET];
--+ exp_idx = reorder_data[BRCMF_RXREORDER_EXPIDX_OFFSET];
--+
--+ if ((exp_idx == rfi->exp_idx) && (cur_idx != rfi->exp_idx)) {
--+ /* still in the current hole */
--+ /* enqueue the current on the buffer chain */
--+ if (rfi->pktslots[cur_idx] != NULL) {
--+ brcmf_dbg(INFO, "HOLE: ERROR buffer pending..free it\n");
--+ brcmu_pkt_buf_free_skb(rfi->pktslots[cur_idx]);
--+ rfi->pktslots[cur_idx] = NULL;
--+ }
--+ rfi->pktslots[cur_idx] = pkt;
--+ rfi->pend_pkts++;
--+ rfi->cur_idx = cur_idx;
--+ brcmf_dbg(DATA, "flow-%d: store pkt %d (%d), pending %d\n",
--+ flow_id, cur_idx, exp_idx, rfi->pend_pkts);
--+
--+ /* can return now as there is no reorder
--+ * list to process.
--+ */
--+ return;
--+ }
--+ if (rfi->exp_idx == cur_idx) {
--+ if (rfi->pktslots[cur_idx] != NULL) {
--+ brcmf_dbg(INFO, "error buffer pending..free it\n");
--+ brcmu_pkt_buf_free_skb(rfi->pktslots[cur_idx]);
--+ rfi->pktslots[cur_idx] = NULL;
--+ }
--+ rfi->pktslots[cur_idx] = pkt;
--+ rfi->pend_pkts++;
--+
--+ /* got the expected one. flush from current to expected
--+ * and update expected
--+ */
--+ brcmf_dbg(DATA, "flow-%d: expected %d (%d), pending %d\n",
--+ flow_id, cur_idx, exp_idx, rfi->pend_pkts);
--+
--+ rfi->cur_idx = cur_idx;
--+ rfi->exp_idx = exp_idx;
--+
--+ brcmf_rxreorder_get_skb_list(rfi, cur_idx, exp_idx,
--+ &reorder_list);
--+ brcmf_dbg(DATA, "flow-%d: freeing buffers %d, pending %d\n",
--+ flow_id, skb_queue_len(&reorder_list),
--+ rfi->pend_pkts);
--+ } else {
--+ u8 end_idx;
--+
--+ brcmf_dbg(DATA, "flow-%d (0x%x): both moved, old %d/%d, new %d/%d\n",
--+ flow_id, flags, rfi->cur_idx, rfi->exp_idx,
--+ cur_idx, exp_idx);
--+ if (flags & BRCMF_RXREORDER_FLUSH_ALL)
--+ end_idx = rfi->exp_idx;
--+ else
--+ end_idx = exp_idx;
--+
--+ /* flush pkts first */
--+ brcmf_rxreorder_get_skb_list(rfi, rfi->exp_idx, end_idx,
--+ &reorder_list);
--+
--+ if (exp_idx == ((cur_idx + 1) % (rfi->max_idx + 1))) {
--+ __skb_queue_tail(&reorder_list, pkt);
--+ } else {
--+ rfi->pktslots[cur_idx] = pkt;
--+ rfi->pend_pkts++;
--+ }
--+ rfi->exp_idx = exp_idx;
--+ rfi->cur_idx = cur_idx;
--+ }
--+ } else {
--+ /* explicity window move updating the expected index */
--+ exp_idx = reorder_data[BRCMF_RXREORDER_EXPIDX_OFFSET];
--+
--+ brcmf_dbg(DATA, "flow-%d (0x%x): change expected: %d -> %d\n",
--+ flow_id, flags, rfi->exp_idx, exp_idx);
--+ if (flags & BRCMF_RXREORDER_FLUSH_ALL)
--+ end_idx = rfi->exp_idx;
--+ else
--+ end_idx = exp_idx;
--+
--+ brcmf_rxreorder_get_skb_list(rfi, rfi->exp_idx, end_idx,
--+ &reorder_list);
--+ __skb_queue_tail(&reorder_list, pkt);
--+ /* set the new expected idx */
--+ rfi->exp_idx = exp_idx;
--+ }
--+netif_rx:
--+ skb_queue_walk_safe(&reorder_list, pkt, pnext) {
--+ __skb_unlink(pkt, &reorder_list);
--+ brcmf_netif_rx(ifp, pkt, false);
--+ }
--+}
--+
-- void brcmf_fws_hdrpull(struct brcmf_if *ifp, s16 siglen, struct sk_buff *skb)
-- {
-- struct brcmf_skb_reorder_data *rd;
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.h
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.h
--@@ -29,5 +29,6 @@ void brcmf_fws_add_interface(struct brcm
-- void brcmf_fws_del_interface(struct brcmf_if *ifp);
-- void brcmf_fws_bustxfail(struct brcmf_fws_info *fws, struct sk_buff *skb);
-- void brcmf_fws_bus_blocked(struct brcmf_pub *drvr, bool flow_blocked);
--+void brcmf_fws_rxreorder(struct brcmf_if *ifp, struct sk_buff *skb);
--
-- #endif /* FWSIGNAL_H_ */
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c
--@@ -527,6 +527,9 @@ static int brcmf_msgbuf_hdrpull(struct b
-- return -ENODEV;
-- }
--
--+static void brcmf_msgbuf_rxreorder(struct brcmf_if *ifp, struct sk_buff *skb)
--+{
--+}
--
-- static void
-- brcmf_msgbuf_remove_flowring(struct brcmf_msgbuf *msgbuf, u16 flowid)
--@@ -1466,6 +1469,7 @@ int brcmf_proto_msgbuf_attach(struct brc
-- drvr->proto->configure_addr_mode = brcmf_msgbuf_configure_addr_mode;
-- drvr->proto->delete_peer = brcmf_msgbuf_delete_peer;
-- drvr->proto->add_tdls_peer = brcmf_msgbuf_add_tdls_peer;
--+ drvr->proto->rxreorder = brcmf_msgbuf_rxreorder;
-- drvr->proto->pd = msgbuf;
--
-- init_waitqueue_head(&msgbuf->ioctl_resp_wait);
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/proto.h
--@@ -22,6 +22,9 @@ enum proto_addr_mode {
-- ADDR_DIRECT
-- };
--
--+struct brcmf_skb_reorder_data {
--+ u8 *reorder;
--+};
--
-- struct brcmf_proto {
-- int (*hdrpull)(struct brcmf_pub *drvr, bool do_fws,
--@@ -38,6 +41,7 @@ struct brcmf_proto {
-- u8 peer[ETH_ALEN]);
-- void (*add_tdls_peer)(struct brcmf_pub *drvr, int ifidx,
-- u8 peer[ETH_ALEN]);
--+ void (*rxreorder)(struct brcmf_if *ifp, struct sk_buff *skb);
-- void *pd;
-- };
--
--@@ -91,6 +95,18 @@ brcmf_proto_add_tdls_peer(struct brcmf_p
-- {
-- drvr->proto->add_tdls_peer(drvr, ifidx, peer);
-- }
--+static inline bool brcmf_proto_is_reorder_skb(struct sk_buff *skb)
--+{
--+ struct brcmf_skb_reorder_data *rd;
--+
--+ rd = (struct brcmf_skb_reorder_data *)skb->cb;
--+ return !!rd->reorder;
--+}
--
--+static inline void
--+brcmf_proto_rxreorder(struct brcmf_if *ifp, struct sk_buff *skb)
--+{
--+ ifp->drvr->proto->rxreorder(ifp, skb);
--+}
--
-- #endif /* BRCMFMAC_PROTO_H */
-diff --git a/package/kernel/mac80211/patches/349-0007-brcmfmac-revise-handling-events-in-receive-path.patch b/package/kernel/mac80211/patches/349-0007-brcmfmac-revise-handling-events-in-receive-path.patch
-deleted file mode 100644
-index a43feffe1792c44e207908c21e314bfcf0378cf1..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/349-0007-brcmfmac-revise-handling-events-in-receive-path.patch
-+++ /dev/null
-@@ -1,139 +0,0 @@
--From: Arend van Spriel <arend@broadcom.com>
--Date: Mon, 11 Apr 2016 11:35:27 +0200
--Subject: [PATCH] brcmfmac: revise handling events in receive path
--
--Move event handling out of brcmf_netif_rx() avoiding the need
--to pass a flag. This flag is only ever true for USB hosts as
--other interface use separate brcmf_rx_event() function.
--
--Reviewed-by: Hante Meuleman <hante.meuleman@broadcom.com>
--Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
--Reviewed-by: Franky Lin <franky.lin@broadcom.com>
--Signed-off-by: Arend van Spriel <arend@broadcom.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bus.h
--@@ -216,7 +216,7 @@ bool brcmf_c_prec_enq(struct device *dev
-- int prec);
--
-- /* Receive frame for delivery to OS. Callee disposes of rxp. */
---void brcmf_rx_frame(struct device *dev, struct sk_buff *rxp, bool handle_evnt);
--+void brcmf_rx_frame(struct device *dev, struct sk_buff *rxp, bool handle_event);
-- /* Receive async event packet from firmware. Callee disposes of rxp. */
-- void brcmf_rx_event(struct device *dev, struct sk_buff *rxp);
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
--@@ -298,18 +298,11 @@ void brcmf_txflowblock(struct device *de
-- brcmf_fws_bus_blocked(drvr, state);
-- }
--
---void brcmf_netif_rx(struct brcmf_if *ifp, struct sk_buff *skb,
--- bool handle_event)
--+void brcmf_netif_rx(struct brcmf_if *ifp, struct sk_buff *skb)
-- {
--- skb->protocol = eth_type_trans(skb, ifp->ndev);
---
-- if (skb->pkt_type == PACKET_MULTICAST)
-- ifp->stats.multicast++;
--
--- /* Process special event packets */
--- if (handle_event)
--- brcmf_fweh_process_skb(ifp->drvr, skb);
---
-- if (!(ifp->ndev->flags & IFF_UP)) {
-- brcmu_pkt_buf_free_skb(skb);
-- return;
--@@ -329,7 +322,7 @@ void brcmf_netif_rx(struct brcmf_if *ifp
-- netif_rx_ni(skb);
-- }
--
---void brcmf_rx_frame(struct device *dev, struct sk_buff *skb, bool handle_evnt)
--+void brcmf_rx_frame(struct device *dev, struct sk_buff *skb, bool handle_event)
-- {
-- struct brcmf_if *ifp;
-- struct brcmf_bus *bus_if = dev_get_drvdata(dev);
--@@ -348,10 +341,17 @@ void brcmf_rx_frame(struct device *dev,
-- return;
-- }
--
--- if (brcmf_proto_is_reorder_skb(skb))
--+ skb->protocol = eth_type_trans(skb, ifp->ndev);
--+
--+ if (brcmf_proto_is_reorder_skb(skb)) {
-- brcmf_proto_rxreorder(ifp, skb);
--- else
--- brcmf_netif_rx(ifp, skb, handle_evnt);
--+ } else {
--+ /* Process special event packets */
--+ if (handle_event)
--+ brcmf_fweh_process_skb(ifp->drvr, skb);
--+
--+ brcmf_netif_rx(ifp, skb);
--+ }
-- }
--
-- void brcmf_rx_event(struct device *dev, struct sk_buff *skb)
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h
--@@ -221,8 +221,7 @@ int brcmf_get_next_free_bsscfgidx(struct
-- void brcmf_txflowblock_if(struct brcmf_if *ifp,
-- enum brcmf_netif_stop_reason reason, bool state);
-- void brcmf_txfinalize(struct brcmf_if *ifp, struct sk_buff *txp, bool success);
---void brcmf_netif_rx(struct brcmf_if *ifp, struct sk_buff *skb,
--- bool handle_event);
--+void brcmf_netif_rx(struct brcmf_if *ifp, struct sk_buff *skb);
-- void brcmf_net_setcarrier(struct brcmf_if *ifp, bool on);
-- int __init brcmf_core_init(void);
-- void __exit brcmf_core_exit(void);
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c
--@@ -1668,7 +1668,7 @@ void brcmf_fws_rxreorder(struct brcmf_if
-- /* validate flags and flow id */
-- if (flags == 0xFF) {
-- brcmf_err("invalid flags...so ignore this packet\n");
--- brcmf_netif_rx(ifp, pkt, false);
--+ brcmf_netif_rx(ifp, pkt);
-- return;
-- }
--
--@@ -1680,7 +1680,7 @@ void brcmf_fws_rxreorder(struct brcmf_if
-- if (rfi == NULL) {
-- brcmf_dbg(INFO, "received flags to cleanup, but no flow (%d) yet\n",
-- flow_id);
--- brcmf_netif_rx(ifp, pkt, false);
--+ brcmf_netif_rx(ifp, pkt);
-- return;
-- }
--
--@@ -1705,7 +1705,7 @@ void brcmf_fws_rxreorder(struct brcmf_if
-- rfi = kzalloc(buf_size, GFP_ATOMIC);
-- if (rfi == NULL) {
-- brcmf_err("failed to alloc buffer\n");
--- brcmf_netif_rx(ifp, pkt, false);
--+ brcmf_netif_rx(ifp, pkt);
-- return;
-- }
--
--@@ -1819,7 +1819,7 @@ void brcmf_fws_rxreorder(struct brcmf_if
-- netif_rx:
-- skb_queue_walk_safe(&reorder_list, pkt, pnext) {
-- __skb_unlink(pkt, &reorder_list);
--- brcmf_netif_rx(ifp, pkt, false);
--+ brcmf_netif_rx(ifp, pkt);
-- }
-- }
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c
--@@ -1157,7 +1157,7 @@ brcmf_msgbuf_process_rx_complete(struct
-- brcmu_pkt_buf_free_skb(skb);
-- return;
-- }
--- brcmf_netif_rx(ifp, skb, false);
--+ brcmf_netif_rx(ifp, skb);
-- }
--
--
-diff --git a/package/kernel/mac80211/patches/349-0008-brcmfmac-create-common-function-for-handling-brcmf_p.patch b/package/kernel/mac80211/patches/349-0008-brcmfmac-create-common-function-for-handling-brcmf_p.patch
-deleted file mode 100644
-index 08ea235fddc7caf06eb4b196c51765cd4adbee2f..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/349-0008-brcmfmac-create-common-function-for-handling-brcmf_p.patch
-+++ /dev/null
-@@ -1,88 +0,0 @@
--From: Arend van Spriel <arend@broadcom.com>
--Date: Mon, 11 Apr 2016 11:35:28 +0200
--Subject: [PATCH] brcmfmac: create common function for handling
-- brcmf_proto_hdrpull()
--
--In receive path brcmf_proto_hdrpull() needs to be called and handled
--similar in brcmf_rx_frame() and brcmf_rx_event(). Move that duplicated
--code in separate function.
--
--Reviewed-by: Hante Meuleman <hante.meuleman@broadcom.com>
--Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
--Reviewed-by: Franky Lin <franky.lin@broadcom.com>
--Signed-off-by: Arend van Spriel <arend@broadcom.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
--@@ -322,26 +322,35 @@ void brcmf_netif_rx(struct brcmf_if *ifp
-- netif_rx_ni(skb);
-- }
--
---void brcmf_rx_frame(struct device *dev, struct sk_buff *skb, bool handle_event)
--+static int brcmf_rx_hdrpull(struct brcmf_pub *drvr, struct sk_buff *skb,
--+ struct brcmf_if **ifp)
-- {
--- struct brcmf_if *ifp;
--- struct brcmf_bus *bus_if = dev_get_drvdata(dev);
--- struct brcmf_pub *drvr = bus_if->drvr;
-- int ret;
--
--- brcmf_dbg(DATA, "Enter: %s: rxp=%p\n", dev_name(dev), skb);
---
-- /* process and remove protocol-specific header */
--- ret = brcmf_proto_hdrpull(drvr, true, skb, &ifp);
--+ ret = brcmf_proto_hdrpull(drvr, true, skb, ifp);
--
--- if (ret || !ifp || !ifp->ndev) {
--+ if (ret || !(*ifp) || !(*ifp)->ndev) {
-- if (ret != -ENODATA && ifp)
--- ifp->stats.rx_errors++;
--+ (*ifp)->stats.rx_errors++;
-- brcmu_pkt_buf_free_skb(skb);
--- return;
--+ return -ENODATA;
-- }
--
--- skb->protocol = eth_type_trans(skb, ifp->ndev);
--+ skb->protocol = eth_type_trans(skb, (*ifp)->ndev);
--+ return 0;
--+}
--+
--+void brcmf_rx_frame(struct device *dev, struct sk_buff *skb, bool handle_event)
--+{
--+ struct brcmf_if *ifp;
--+ struct brcmf_bus *bus_if = dev_get_drvdata(dev);
--+ struct brcmf_pub *drvr = bus_if->drvr;
--+
--+ brcmf_dbg(DATA, "Enter: %s: rxp=%p\n", dev_name(dev), skb);
--+
--+ if (brcmf_rx_hdrpull(drvr, skb, &ifp))
--+ return;
--
-- if (brcmf_proto_is_reorder_skb(skb)) {
-- brcmf_proto_rxreorder(ifp, skb);
--@@ -359,21 +368,11 @@ void brcmf_rx_event(struct device *dev,
-- struct brcmf_if *ifp;
-- struct brcmf_bus *bus_if = dev_get_drvdata(dev);
-- struct brcmf_pub *drvr = bus_if->drvr;
--- int ret;
--
-- brcmf_dbg(EVENT, "Enter: %s: rxp=%p\n", dev_name(dev), skb);
--
--- /* process and remove protocol-specific header */
--- ret = brcmf_proto_hdrpull(drvr, true, skb, &ifp);
---
--- if (ret || !ifp || !ifp->ndev) {
--- if (ret != -ENODATA && ifp)
--- ifp->stats.rx_errors++;
--- brcmu_pkt_buf_free_skb(skb);
--+ if (brcmf_rx_hdrpull(drvr, skb, &ifp))
-- return;
--- }
---
--- skb->protocol = eth_type_trans(skb, ifp->ndev);
--
-- brcmf_fweh_process_skb(ifp->drvr, skb);
-- brcmu_pkt_buf_free_skb(skb);
-diff --git a/package/kernel/mac80211/patches/351-0005-brcmfmac-rework-function-picking-free-BSS-index.patch b/package/kernel/mac80211/patches/351-0005-brcmfmac-rework-function-picking-free-BSS-index.patch
-deleted file mode 100644
-index c602f2272a4a322d9e5246c517eecfc3a00e1db2..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/351-0005-brcmfmac-rework-function-picking-free-BSS-index.patch
-+++ /dev/null
-@@ -1,119 +0,0 @@
--From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
--Date: Thu, 26 May 2016 01:44:27 +0200
--Subject: [PATCH] brcmfmac: rework function picking free BSS index
--MIME-Version: 1.0
--Content-Type: text/plain; charset=UTF-8
--Content-Transfer-Encoding: 8bit
--
--The old implementation was overcomplicated and slightly bugged in some
--corner cases.
--
--Consider following state of BSS-es (limited to 6 for simplification):
--drvr->iflist[0]: { bsscfgidx:0, ndev->name:wlan1, }
--drvr->iflist[1]: (null)
--drvr->iflist[2]: { bsscfgidx:2, ndev->name:wlan1-1, }
--drvr->iflist[3]: { bsscfgidx:3, ndev->name:wlan1-2, }
--drvr->iflist[4]: (null)
--drvr->iflist[5]: (null)
--In such case the next AP interface should bsscfgidx 4 (we don't use 1 as
--it's reserved for P2P).
--
--With old code the loop iterations were following:
--[ifidx = 0] [bsscfgidx = 2] [highest = 2]
--[ifidx = 1] [bsscfgidx = 2] [highest = 2] available = true
--[ifidx = 2] [bsscfgidx = 2] [highest = 2] bsscfgidx = highest + 1
--[ifidx = 3] [bsscfgidx = 3] [highest = 2] bsscfgidx = highest + 1
--[ifidx = 4] [bsscfgidx = 3] [highest = 2] available = true
--[ifidx = 5] [bsscfgidx = 3] [highest = 2] available = true
--There were 2 obvious problems:
--1) Having empty BSS at index 1 was resulting in available being always
-- set to true, even if we would run out of BSS-es.
--2) Calculated bsscfgidx was invalid (3 instead of 4) resulting in driver
-- not being able to create the 4th AP interface.
--
--New code is simpler, placed in file where it's really used, handles
--running out of free BSS-es and allows using 4 interfaces at the same
--time. It also looks for the first free BSS instead of one after the last
--in use. It works well with current driver (which doesn't allow deleting
--interfaces) and should be future proof (if we ever allow deleting).
--
--Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--@@ -527,6 +527,21 @@ brcmf_cfg80211_update_proto_addr_mode(st
-- ADDR_INDIRECT);
-- }
--
--+static int brcmf_get_first_free_bsscfgidx(struct brcmf_pub *drvr)
--+{
--+ int bsscfgidx;
--+
--+ for (bsscfgidx = 0; bsscfgidx < BRCMF_MAX_IFS; bsscfgidx++) {
--+ /* bsscfgidx 1 is reserved for legacy P2P */
--+ if (bsscfgidx == 1)
--+ continue;
--+ if (!drvr->iflist[bsscfgidx])
--+ return bsscfgidx;
--+ }
--+
--+ return -ENOMEM;
--+}
--+
-- static int brcmf_cfg80211_request_ap_if(struct brcmf_if *ifp)
-- {
-- struct brcmf_mbss_ssid_le mbss_ssid_le;
--@@ -534,7 +549,7 @@ static int brcmf_cfg80211_request_ap_if(
-- int err;
--
-- memset(&mbss_ssid_le, 0, sizeof(mbss_ssid_le));
--- bsscfgidx = brcmf_get_next_free_bsscfgidx(ifp->drvr);
--+ bsscfgidx = brcmf_get_first_free_bsscfgidx(ifp->drvr);
-- if (bsscfgidx < 0)
-- return bsscfgidx;
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
--@@ -753,30 +753,6 @@ void brcmf_remove_interface(struct brcmf
-- brcmf_del_if(ifp->drvr, ifp->bsscfgidx);
-- }
--
---int brcmf_get_next_free_bsscfgidx(struct brcmf_pub *drvr)
---{
--- int ifidx;
--- int bsscfgidx;
--- bool available;
--- int highest;
---
--- available = false;
--- bsscfgidx = 2;
--- highest = 2;
--- for (ifidx = 0; ifidx < BRCMF_MAX_IFS; ifidx++) {
--- if (drvr->iflist[ifidx]) {
--- if (drvr->iflist[ifidx]->bsscfgidx == bsscfgidx)
--- bsscfgidx = highest + 1;
--- else if (drvr->iflist[ifidx]->bsscfgidx > highest)
--- highest = drvr->iflist[ifidx]->bsscfgidx;
--- } else {
--- available = true;
--- }
--- }
---
--- return available ? bsscfgidx : -ENOMEM;
---}
---
-- #ifdef CONFIG_INET
-- #define ARPOL_MAX_ENTRIES 8
-- static int brcmf_inetaddr_changed(struct notifier_block *nb,
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h
--@@ -217,7 +217,6 @@ int brcmf_net_attach(struct brcmf_if *if
-- struct brcmf_if *brcmf_add_if(struct brcmf_pub *drvr, s32 bsscfgidx, s32 ifidx,
-- bool is_p2pdev, char *name, u8 *mac_addr);
-- void brcmf_remove_interface(struct brcmf_if *ifp);
---int brcmf_get_next_free_bsscfgidx(struct brcmf_pub *drvr);
-- void brcmf_txflowblock_if(struct brcmf_if *ifp,
-- enum brcmf_netif_stop_reason reason, bool state);
-- void brcmf_txfinalize(struct brcmf_if *ifp, struct sk_buff *txp, bool success);
-diff --git a/package/kernel/mac80211/patches/351-0007-brcmutil-add-field-storing-control-channel-to-the-st.patch b/package/kernel/mac80211/patches/351-0007-brcmutil-add-field-storing-control-channel-to-the-st.patch
-deleted file mode 100644
-index a79c9a2e93732d8c4c15af55387e378afd72001a..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/351-0007-brcmutil-add-field-storing-control-channel-to-the-st.patch
-+++ /dev/null
-@@ -1,244 +0,0 @@
--From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
--Date: Fri, 20 May 2016 13:38:57 +0200
--Subject: [PATCH] brcmutil: add field storing control channel to the struct
-- brcmu_chan
--MIME-Version: 1.0
--Content-Type: text/plain; charset=UTF-8
--Content-Transfer-Encoding: 8bit
--
--Our d11 code supports encoding/decoding channel info into/from chanspec
--format used by firmware. Current implementation is quite misleading
--because of the way "chnum" field is used.
--When encoding channel info, "chnum" has to be filled by a caller with
--*center* channel number. However when decoding chanspec the same field
--is filled with a *control* channel number.
--
--1) This can be confusing. It's expected for information to be the same
-- after encoding and decoding.
--2) It doesn't allow accessing all info when decoding. Some functions may
-- need to know both channel numbers, e.g. cfg80211 callback getting
-- current channel.
--Solve this by adding a separated field for control channel.
--
--Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
--Reviewed-by: Arend van Spriel <arend.vanspriel@broadcom.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--@@ -2689,7 +2689,7 @@ static s32 brcmf_inform_single_bss(struc
-- if (!bi->ctl_ch) {
-- ch.chspec = le16_to_cpu(bi->chanspec);
-- cfg->d11inf.decchspec(&ch);
--- bi->ctl_ch = ch.chnum;
--+ bi->ctl_ch = ch.control_ch_num;
-- }
-- channel = bi->ctl_ch;
--
--@@ -2807,7 +2807,7 @@ static s32 brcmf_inform_ibss(struct brcm
-- else
-- band = wiphy->bands[IEEE80211_BAND_5GHZ];
--
--- freq = ieee80211_channel_to_frequency(ch.chnum, band->band);
--+ freq = ieee80211_channel_to_frequency(ch.control_ch_num, band->band);
-- cfg->channel = freq;
-- notify_channel = ieee80211_get_channel(wiphy, freq);
--
--@@ -2817,7 +2817,7 @@ static s32 brcmf_inform_ibss(struct brcm
-- notify_ielen = le32_to_cpu(bi->ie_length);
-- notify_signal = (s16)le16_to_cpu(bi->RSSI) * 100;
--
--- brcmf_dbg(CONN, "channel: %d(%d)\n", ch.chnum, freq);
--+ brcmf_dbg(CONN, "channel: %d(%d)\n", ch.control_ch_num, freq);
-- brcmf_dbg(CONN, "capability: %X\n", notify_capability);
-- brcmf_dbg(CONN, "beacon interval: %d\n", notify_interval);
-- brcmf_dbg(CONN, "signal: %d\n", notify_signal);
--@@ -5235,7 +5235,7 @@ brcmf_bss_roaming_done(struct brcmf_cfg8
-- else
-- band = wiphy->bands[IEEE80211_BAND_5GHZ];
--
--- freq = ieee80211_channel_to_frequency(ch.chnum, band->band);
--+ freq = ieee80211_channel_to_frequency(ch.control_ch_num, band->band);
-- notify_channel = ieee80211_get_channel(wiphy, freq);
--
-- done:
--@@ -5757,14 +5757,15 @@ static int brcmf_construct_chaninfo(stru
-- channel = band->channels;
-- index = band->n_channels;
-- for (j = 0; j < band->n_channels; j++) {
--- if (channel[j].hw_value == ch.chnum) {
--+ if (channel[j].hw_value == ch.control_ch_num) {
-- index = j;
-- break;
-- }
-- }
-- channel[index].center_freq =
--- ieee80211_channel_to_frequency(ch.chnum, band->band);
--- channel[index].hw_value = ch.chnum;
--+ ieee80211_channel_to_frequency(ch.control_ch_num,
--+ band->band);
--+ channel[index].hw_value = ch.control_ch_num;
--
-- /* assuming the chanspecs order is HT20,
-- * HT40 upper, HT40 lower, and VHT80.
--@@ -5866,7 +5867,7 @@ static int brcmf_enable_bw40_2g(struct b
-- if (WARN_ON(ch.bw != BRCMU_CHAN_BW_40))
-- continue;
-- for (j = 0; j < band->n_channels; j++) {
--- if (band->channels[j].hw_value == ch.chnum)
--+ if (band->channels[j].hw_value == ch.control_ch_num)
-- break;
-- }
-- if (WARN_ON(j == band->n_channels))
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
--@@ -1246,7 +1246,7 @@ bool brcmf_p2p_scan_finding_common_chann
-- if (!bi->ctl_ch) {
-- ch.chspec = le16_to_cpu(bi->chanspec);
-- cfg->d11inf.decchspec(&ch);
--- bi->ctl_ch = ch.chnum;
--+ bi->ctl_ch = ch.control_ch_num;
-- }
-- afx_hdl->peer_chan = bi->ctl_ch;
-- brcmf_dbg(TRACE, "ACTION FRAME SCAN : Peer %pM found, channel : %d\n",
--@@ -1385,7 +1385,7 @@ int brcmf_p2p_notify_action_frame_rx(str
-- if (test_bit(BRCMF_P2P_STATUS_FINDING_COMMON_CHANNEL,
-- &p2p->status) &&
-- (ether_addr_equal(afx_hdl->tx_dst_addr, e->addr))) {
--- afx_hdl->peer_chan = ch.chnum;
--+ afx_hdl->peer_chan = ch.control_ch_num;
-- brcmf_dbg(INFO, "GON request: Peer found, channel=%d\n",
-- afx_hdl->peer_chan);
-- complete(&afx_hdl->act_frm_scan);
--@@ -1428,7 +1428,7 @@ int brcmf_p2p_notify_action_frame_rx(str
-- memcpy(&mgmt_frame->u, frame, mgmt_frame_len);
-- mgmt_frame_len += offsetof(struct ieee80211_mgmt, u);
--
--- freq = ieee80211_channel_to_frequency(ch.chnum,
--+ freq = ieee80211_channel_to_frequency(ch.control_ch_num,
-- ch.band == BRCMU_CHAN_BAND_2G ?
-- IEEE80211_BAND_2GHZ :
-- IEEE80211_BAND_5GHZ);
--@@ -1873,7 +1873,7 @@ s32 brcmf_p2p_notify_rx_mgmt_p2p_probere
--
-- if (test_bit(BRCMF_P2P_STATUS_FINDING_COMMON_CHANNEL, &p2p->status) &&
-- (ether_addr_equal(afx_hdl->tx_dst_addr, e->addr))) {
--- afx_hdl->peer_chan = ch.chnum;
--+ afx_hdl->peer_chan = ch.control_ch_num;
-- brcmf_dbg(INFO, "PROBE REQUEST: Peer found, channel=%d\n",
-- afx_hdl->peer_chan);
-- complete(&afx_hdl->act_frm_scan);
--@@ -1898,7 +1898,7 @@ s32 brcmf_p2p_notify_rx_mgmt_p2p_probere
--
-- mgmt_frame = (u8 *)(rxframe + 1);
-- mgmt_frame_len = e->datalen - sizeof(*rxframe);
--- freq = ieee80211_channel_to_frequency(ch.chnum,
--+ freq = ieee80211_channel_to_frequency(ch.control_ch_num,
-- ch.band == BRCMU_CHAN_BAND_2G ?
-- IEEE80211_BAND_2GHZ :
-- IEEE80211_BAND_5GHZ);
----- a/drivers/net/wireless/broadcom/brcm80211/brcmutil/d11.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmutil/d11.c
--@@ -107,6 +107,7 @@ static void brcmu_d11n_decchspec(struct
-- u16 val;
--
-- ch->chnum = (u8)(ch->chspec & BRCMU_CHSPEC_CH_MASK);
--+ ch->control_ch_num = ch->chnum;
--
-- switch (ch->chspec & BRCMU_CHSPEC_D11N_BW_MASK) {
-- case BRCMU_CHSPEC_D11N_BW_20:
--@@ -118,10 +119,10 @@ static void brcmu_d11n_decchspec(struct
-- val = ch->chspec & BRCMU_CHSPEC_D11N_SB_MASK;
-- if (val == BRCMU_CHSPEC_D11N_SB_L) {
-- ch->sb = BRCMU_CHAN_SB_L;
--- ch->chnum -= CH_10MHZ_APART;
--+ ch->control_ch_num -= CH_10MHZ_APART;
-- } else {
-- ch->sb = BRCMU_CHAN_SB_U;
--- ch->chnum += CH_10MHZ_APART;
--+ ch->control_ch_num += CH_10MHZ_APART;
-- }
-- break;
-- default:
--@@ -147,6 +148,7 @@ static void brcmu_d11ac_decchspec(struct
-- u16 val;
--
-- ch->chnum = (u8)(ch->chspec & BRCMU_CHSPEC_CH_MASK);
--+ ch->control_ch_num = ch->chnum;
--
-- switch (ch->chspec & BRCMU_CHSPEC_D11AC_BW_MASK) {
-- case BRCMU_CHSPEC_D11AC_BW_20:
--@@ -158,10 +160,10 @@ static void brcmu_d11ac_decchspec(struct
-- val = ch->chspec & BRCMU_CHSPEC_D11AC_SB_MASK;
-- if (val == BRCMU_CHSPEC_D11AC_SB_L) {
-- ch->sb = BRCMU_CHAN_SB_L;
--- ch->chnum -= CH_10MHZ_APART;
--+ ch->control_ch_num -= CH_10MHZ_APART;
-- } else if (val == BRCMU_CHSPEC_D11AC_SB_U) {
-- ch->sb = BRCMU_CHAN_SB_U;
--- ch->chnum += CH_10MHZ_APART;
--+ ch->control_ch_num += CH_10MHZ_APART;
-- } else {
-- WARN_ON_ONCE(1);
-- }
--@@ -172,16 +174,16 @@ static void brcmu_d11ac_decchspec(struct
-- BRCMU_CHSPEC_D11AC_SB_SHIFT);
-- switch (ch->sb) {
-- case BRCMU_CHAN_SB_LL:
--- ch->chnum -= CH_30MHZ_APART;
--+ ch->control_ch_num -= CH_30MHZ_APART;
-- break;
-- case BRCMU_CHAN_SB_LU:
--- ch->chnum -= CH_10MHZ_APART;
--+ ch->control_ch_num -= CH_10MHZ_APART;
-- break;
-- case BRCMU_CHAN_SB_UL:
--- ch->chnum += CH_10MHZ_APART;
--+ ch->control_ch_num += CH_10MHZ_APART;
-- break;
-- case BRCMU_CHAN_SB_UU:
--- ch->chnum += CH_30MHZ_APART;
--+ ch->control_ch_num += CH_30MHZ_APART;
-- break;
-- default:
-- WARN_ON_ONCE(1);
----- a/drivers/net/wireless/broadcom/brcm80211/include/brcmu_d11.h
--+++ b/drivers/net/wireless/broadcom/brcm80211/include/brcmu_d11.h
--@@ -125,14 +125,36 @@ enum brcmu_chan_sb {
-- BRCMU_CHAN_SB_UU = BRCMU_CHAN_SB_LUU,
-- };
--
--+/**
--+ * struct brcmu_chan - stores channel formats
--+ *
--+ * This structure can be used with functions translating chanspec into generic
--+ * channel info and the other way.
--+ *
--+ * @chspec: firmware specific format
--+ * @chnum: center channel number
--+ * @control_ch_num: control channel number
--+ * @band: frequency band
--+ * @bw: channel width
--+ * @sb: control sideband (location of control channel against the center one)
--+ */
-- struct brcmu_chan {
-- u16 chspec;
-- u8 chnum;
--+ u8 control_ch_num;
-- u8 band;
-- enum brcmu_chan_bw bw;
-- enum brcmu_chan_sb sb;
-- };
--
--+/**
--+ * struct brcmu_d11inf - provides functions translating channel format
--+ *
--+ * @io_type: determines version of channel format used by firmware
--+ * @encchspec: encodes channel info into a chanspec, requires center channel
--+ * number, ignores control one
--+ * @decchspec: decodes chanspec into generic info
--+ */
-- struct brcmu_d11inf {
-- u8 io_type;
--
-diff --git a/package/kernel/mac80211/patches/351-0008-brcmfmac-support-get_channel-cfg80211-callback.patch b/package/kernel/mac80211/patches/351-0008-brcmfmac-support-get_channel-cfg80211-callback.patch
-deleted file mode 100644
-index 2c536d178d6746aca311d6ce16421a609061a3ad..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/351-0008-brcmfmac-support-get_channel-cfg80211-callback.patch
-+++ /dev/null
-@@ -1,94 +0,0 @@
--From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
--Date: Fri, 20 May 2016 13:38:58 +0200
--Subject: [PATCH] brcmfmac: support get_channel cfg80211 callback
--MIME-Version: 1.0
--Content-Type: text/plain; charset=UTF-8
--Content-Transfer-Encoding: 8bit
--
--This is important for brcmfmac as some of released firmwares (e.g.
--brcmfmac4366b-pcie.bin) may pick different channel than requested. This
--has been tested with BCM4366B1 in D-Link DIR-885L.
--
--Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--@@ -4847,6 +4847,68 @@ exit:
-- return err;
-- }
--
--+static int brcmf_cfg80211_get_channel(struct wiphy *wiphy,
--+ struct wireless_dev *wdev,
--+ struct cfg80211_chan_def *chandef)
--+{
--+ struct brcmf_cfg80211_info *cfg = wiphy_to_cfg(wiphy);
--+ struct net_device *ndev = wdev->netdev;
--+ struct brcmf_if *ifp;
--+ struct brcmu_chan ch;
--+ enum nl80211_band band = 0;
--+ enum nl80211_chan_width width = 0;
--+ u32 chanspec;
--+ int freq, err;
--+
--+ if (!ndev)
--+ return -ENODEV;
--+ ifp = netdev_priv(ndev);
--+
--+ err = brcmf_fil_iovar_int_get(ifp, "chanspec", &chanspec);
--+ if (err) {
--+ brcmf_err("chanspec failed (%d)\n", err);
--+ return err;
--+ }
--+
--+ ch.chspec = chanspec;
--+ cfg->d11inf.decchspec(&ch);
--+
--+ switch (ch.band) {
--+ case BRCMU_CHAN_BAND_2G:
--+ band = NL80211_BAND_2GHZ;
--+ break;
--+ case BRCMU_CHAN_BAND_5G:
--+ band = NL80211_BAND_5GHZ;
--+ break;
--+ }
--+
--+ switch (ch.bw) {
--+ case BRCMU_CHAN_BW_80:
--+ width = NL80211_CHAN_WIDTH_80;
--+ break;
--+ case BRCMU_CHAN_BW_40:
--+ width = NL80211_CHAN_WIDTH_40;
--+ break;
--+ case BRCMU_CHAN_BW_20:
--+ width = NL80211_CHAN_WIDTH_20;
--+ break;
--+ case BRCMU_CHAN_BW_80P80:
--+ width = NL80211_CHAN_WIDTH_80P80;
--+ break;
--+ case BRCMU_CHAN_BW_160:
--+ width = NL80211_CHAN_WIDTH_160;
--+ break;
--+ }
--+
--+ freq = ieee80211_channel_to_frequency(ch.control_ch_num, band);
--+ chandef->chan = ieee80211_get_channel(wiphy, freq);
--+ chandef->width = width;
--+ chandef->center_freq1 = ieee80211_channel_to_frequency(ch.chnum, band);
--+ chandef->center_freq2 = 0;
--+
--+ return 0;
--+}
--+
-- static int brcmf_cfg80211_crit_proto_start(struct wiphy *wiphy,
-- struct wireless_dev *wdev,
-- enum nl80211_crit_proto_id proto,
--@@ -5009,6 +5071,7 @@ static struct cfg80211_ops brcmf_cfg8021
-- .mgmt_tx = brcmf_cfg80211_mgmt_tx,
-- .remain_on_channel = brcmf_p2p_remain_on_channel,
-- .cancel_remain_on_channel = brcmf_cfg80211_cancel_remain_on_channel,
--+ .get_channel = brcmf_cfg80211_get_channel,
-- .start_p2p_device = brcmf_p2p_start_device,
-- .stop_p2p_device = brcmf_p2p_stop_device,
-- .crit_proto_start = brcmf_cfg80211_crit_proto_start,
-diff --git a/package/kernel/mac80211/patches/351-0009-brcmfmac-print-errors-if-creating-interface-fails.patch b/package/kernel/mac80211/patches/351-0009-brcmfmac-print-errors-if-creating-interface-fails.patch
-deleted file mode 100644
-index 1b119b2c8599e26de399c7d0174b5ef0be02067d..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/351-0009-brcmfmac-print-errors-if-creating-interface-fails.patch
-+++ /dev/null
-@@ -1,59 +0,0 @@
--From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
--Date: Fri, 27 May 2016 10:54:28 +0200
--Subject: [PATCH] brcmfmac: print errors if creating interface fails
--
--This is helpful for debugging. Without this all I was getting from "iw"
--command on failed creating of P2P interface was:
--> command failed: Too many open files in system (-23)
--
--Signed-off-by: Rafal Milecki <zajec5@gmail.com>
--[arend@broadcom.com: reduce error prints upon iface creation]
--Signed-off-by: Arend van Spriel <arend@broadcom.com>
--Reviewed-by: Julian Calaby <julian.calaby@gmail.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--@@ -670,20 +670,24 @@ static struct wireless_dev *brcmf_cfg802
-- return ERR_PTR(-EOPNOTSUPP);
-- case NL80211_IFTYPE_AP:
-- wdev = brcmf_ap_add_vif(wiphy, name, flags, params);
--- if (!IS_ERR(wdev))
--- brcmf_cfg80211_update_proto_addr_mode(wdev);
--- return wdev;
--+ break;
-- case NL80211_IFTYPE_P2P_CLIENT:
-- case NL80211_IFTYPE_P2P_GO:
-- case NL80211_IFTYPE_P2P_DEVICE:
-- wdev = brcmf_p2p_add_vif(wiphy, name, name_assign_type, type, flags, params);
--- if (!IS_ERR(wdev))
--- brcmf_cfg80211_update_proto_addr_mode(wdev);
--- return wdev;
--+ break;
-- case NL80211_IFTYPE_UNSPECIFIED:
-- default:
-- return ERR_PTR(-EINVAL);
-- }
--+
--+ if (IS_ERR(wdev))
--+ brcmf_err("add iface %s type %d failed: err=%d\n",
--+ name, type, (int)PTR_ERR(wdev));
--+ else
--+ brcmf_cfg80211_update_proto_addr_mode(wdev);
--+
--+ return wdev;
-- }
--
-- static void brcmf_scan_config_mpc(struct brcmf_if *ifp, int mpc)
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
--@@ -2030,8 +2030,6 @@ static int brcmf_p2p_request_p2p_if(stru
--
-- err = brcmf_fil_iovar_data_set(ifp, "p2p_ifadd", &if_request,
-- sizeof(if_request));
--- if (err)
--- return err;
--
-- return err;
-- }
-diff --git a/package/kernel/mac80211/patches/351-0010-brcmfmac-fix-setting-AP-channel-with-new-firmwares.patch b/package/kernel/mac80211/patches/351-0010-brcmfmac-fix-setting-AP-channel-with-new-firmwares.patch
-deleted file mode 100644
-index a2e18a5fe994ed40619f5f12e936765ffeec2314..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/351-0010-brcmfmac-fix-setting-AP-channel-with-new-firmwares.patch
-+++ /dev/null
-@@ -1,114 +0,0 @@
--From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
--Date: Fri, 27 May 2016 21:07:19 +0200
--Subject: [PATCH] brcmfmac: fix setting AP channel with new firmwares
--MIME-Version: 1.0
--Content-Type: text/plain; charset=UTF-8
--Content-Transfer-Encoding: 8bit
--
--Firmware for new chipsets is based on a new major version of code
--internally maintained at Broadcom. E.g. brcmfmac4366b-pcie.bin (used for
--BCM4366B1) is based on 10.10.69.3309 while brcmfmac43602-pcie.ap.bin was
--based on 7.35.177.56.
--
--Currently setting AP 5 GHz channel doesn't work reliably with BCM4366B1.
--When setting e.g. 36 control channel with VHT80 (center channel 42)
--firmware may randomly pick one of:
--1) 52 control channel with 58 as center one
--2) 100 control channel with 106 as center one
--3) 116 control channel with 122 as center one
--4) 149 control channel with 155 as center one
--
--It seems new firmwares require setting AP mode (BRCMF_C_SET_AP) before
--specifying a channel. Changing an order of firmware calls fixes the
--problem. This requirement resulted in two separated "chanspec" calls,
--one in AP code path and one in P2P path.
--
--This fix was verified with BCM4366B1 and tested for regressions on
--BCM43602.
--
--Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--@@ -4382,7 +4382,7 @@ brcmf_cfg80211_start_ap(struct wiphy *wi
-- struct brcmf_join_params join_params;
-- enum nl80211_iftype dev_role;
-- struct brcmf_fil_bss_enable_le bss_enable;
--- u16 chanspec;
--+ u16 chanspec = chandef_to_chanspec(&cfg->d11inf, &settings->chandef);
-- bool mbss;
-- int is_11d;
--
--@@ -4458,16 +4458,8 @@ brcmf_cfg80211_start_ap(struct wiphy *wi
--
-- brcmf_config_ap_mgmt_ie(ifp->vif, &settings->beacon);
--
--+ /* Parameters shared by all radio interfaces */
-- if (!mbss) {
--- chanspec = chandef_to_chanspec(&cfg->d11inf,
--- &settings->chandef);
--- err = brcmf_fil_iovar_int_set(ifp, "chanspec", chanspec);
--- if (err < 0) {
--- brcmf_err("Set Channel failed: chspec=%d, %d\n",
--- chanspec, err);
--- goto exit;
--- }
---
-- if (is_11d != ifp->vif->is_11d) {
-- err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_REGULATORY,
-- is_11d);
--@@ -4515,6 +4507,8 @@ brcmf_cfg80211_start_ap(struct wiphy *wi
-- err = -EINVAL;
-- goto exit;
-- }
--+
--+ /* Interface specific setup */
-- if (dev_role == NL80211_IFTYPE_AP) {
-- if ((brcmf_feat_is_enabled(ifp, BRCMF_FEAT_MBSS)) && (!mbss))
-- brcmf_fil_iovar_int_set(ifp, "mbss", 1);
--@@ -4524,6 +4518,17 @@ brcmf_cfg80211_start_ap(struct wiphy *wi
-- brcmf_err("setting AP mode failed %d\n", err);
-- goto exit;
-- }
--+ if (!mbss) {
--+ /* Firmware 10.x requires setting channel after enabling
--+ * AP and before bringing interface up.
--+ */
--+ err = brcmf_fil_iovar_int_set(ifp, "chanspec", chanspec);
--+ if (err < 0) {
--+ brcmf_err("Set Channel failed: chspec=%d, %d\n",
--+ chanspec, err);
--+ goto exit;
--+ }
--+ }
-- err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_UP, 1);
-- if (err < 0) {
-- brcmf_err("BRCMF_C_UP error (%d)\n", err);
--@@ -4545,7 +4550,13 @@ brcmf_cfg80211_start_ap(struct wiphy *wi
-- goto exit;
-- }
-- brcmf_dbg(TRACE, "AP mode configuration complete\n");
--- } else {
--+ } else if (dev_role == NL80211_IFTYPE_P2P_GO) {
--+ err = brcmf_fil_iovar_int_set(ifp, "chanspec", chanspec);
--+ if (err < 0) {
--+ brcmf_err("Set Channel failed: chspec=%d, %d\n",
--+ chanspec, err);
--+ goto exit;
--+ }
-- err = brcmf_fil_bsscfg_data_set(ifp, "ssid", &ssid_le,
-- sizeof(ssid_le));
-- if (err < 0) {
--@@ -4562,7 +4573,10 @@ brcmf_cfg80211_start_ap(struct wiphy *wi
-- }
--
-- brcmf_dbg(TRACE, "GO mode configuration complete\n");
--+ } else {
--+ WARN_ON(1);
-- }
--+
-- set_bit(BRCMF_VIF_STATUS_AP_CREATED, &ifp->vif->sme_state);
-- brcmf_net_setcarrier(ifp, true);
--
-diff --git a/package/kernel/mac80211/patches/351-0011-brcmfmac-don-t-remove-interface-on-link-down-firmwar.patch b/package/kernel/mac80211/patches/351-0011-brcmfmac-don-t-remove-interface-on-link-down-firmwar.patch
-deleted file mode 100644
-index 167e4347d5ff00cf87cf352058723bd58e1468ce..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/351-0011-brcmfmac-don-t-remove-interface-on-link-down-firmwar.patch
-+++ /dev/null
-@@ -1,60 +0,0 @@
--From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
--Date: Mon, 30 May 2016 06:40:54 +0200
--Subject: [PATCH] brcmfmac: don't remove interface on link down firmware event
--MIME-Version: 1.0
--Content-Type: text/plain; charset=UTF-8
--Content-Transfer-Encoding: 8bit
--
--There are two firmware events we handle similarly in brcmfmac:
--BRCMF_E_LINK and BRCMF_E_IF. The difference from firmware point of view
--is that the first one means BSS remains present in the firmware. Trying
--to (re)create it (e.g. when adding new virtual interface) will result in
--an error.
--
--Current code treats both events in a similar way. It removes Linux
--interface for each of them. It works OK with e.g. BCM43602. Its firmware
--generates both events for each interface. It means we get BRCMF_E_LINK
--and remove interface. That is soon followed by BRCMF_E_IF which means
--BSS was also removed in a firmware. The only downside of this is a
--harmless error like:
--[ 208.643180] brcmfmac: brcmf_fweh_call_event_handler: no interface object
--
--Unfortunately BCM4366 firmware doesn't automatically remove BSS and so
--it doesn't generate BRCMF_E_IF. In such case we incorrectly remove Linux
--interface on BRCMF_E_LINK as BSS is still present in the firmware. It
--results in an error when trying to re-create virtual interface, e.g.:
--> iw phy phy1 interface add wlan1-1 type __ap
--[ 3602.929199] brcmfmac: brcmf_ap_add_vif: timeout occurred
--command failed: I/O error (-5)
--
--With this patch we don't remove Linux interface while firmware keeps
--BSS. Thanks to this we keep a consistent states of host driver and
--device firmware.
--
--Further improvement should be to mark BSS as disabled and remove
--interface on BRCMF_E_LINK. Then we should add support for reusing
--BSS-es.
--
--Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--@@ -5372,7 +5372,6 @@ brcmf_notify_connect_status_ap(struct br
-- struct net_device *ndev,
-- const struct brcmf_event_msg *e, void *data)
-- {
--- struct brcmf_if *ifp = netdev_priv(ndev);
-- static int generation;
-- u32 event = e->event_code;
-- u32 reason = e->reason;
--@@ -5383,8 +5382,6 @@ brcmf_notify_connect_status_ap(struct br
-- ndev != cfg_to_ndev(cfg)) {
-- brcmf_dbg(CONN, "AP mode link down\n");
-- complete(&cfg->vif_disabled);
--- if (ifp->vif->mbss)
--- brcmf_remove_interface(ifp);
-- return 0;
-- }
--
-diff --git a/package/kernel/mac80211/patches/351-0017-brcmfmac-drop-unused-pm_block-vif-attribute.patch b/package/kernel/mac80211/patches/351-0017-brcmfmac-drop-unused-pm_block-vif-attribute.patch
-deleted file mode 100644
-index 28ef3a65fd6b28749308521bceb6d150fc42688d..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/351-0017-brcmfmac-drop-unused-pm_block-vif-attribute.patch
-+++ /dev/null
-@@ -1,103 +0,0 @@
--From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
--Date: Mon, 6 Jun 2016 23:03:55 +0200
--Subject: [PATCH] brcmfmac: drop unused pm_block vif attribute
--MIME-Version: 1.0
--Content-Type: text/plain; charset=UTF-8
--Content-Transfer-Encoding: 8bit
--
--This attribute was added 3 years ago by
--commit 3eacf866559c ("brcmfmac: introduce brcmf_cfg80211_vif structure")
--but it remains unused since then. It seems we can safely drop it.
--
--Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--@@ -587,7 +587,7 @@ struct wireless_dev *brcmf_ap_add_vif(st
--
-- brcmf_dbg(INFO, "Adding vif \"%s\"\n", name);
--
--- vif = brcmf_alloc_vif(cfg, NL80211_IFTYPE_AP, false);
--+ vif = brcmf_alloc_vif(cfg, NL80211_IFTYPE_AP);
-- if (IS_ERR(vif))
-- return (struct wireless_dev *)vif;
--
--@@ -5098,8 +5098,7 @@ static struct cfg80211_ops brcmf_cfg8021
-- };
--
-- struct brcmf_cfg80211_vif *brcmf_alloc_vif(struct brcmf_cfg80211_info *cfg,
--- enum nl80211_iftype type,
--- bool pm_block)
--+ enum nl80211_iftype type)
-- {
-- struct brcmf_cfg80211_vif *vif_walk;
-- struct brcmf_cfg80211_vif *vif;
--@@ -5114,8 +5113,6 @@ struct brcmf_cfg80211_vif *brcmf_alloc_v
-- vif->wdev.wiphy = cfg->wiphy;
-- vif->wdev.iftype = type;
--
--- vif->pm_block = pm_block;
---
-- brcmf_init_prof(&vif->profile);
--
-- if (type == NL80211_IFTYPE_AP) {
--@@ -6754,7 +6751,7 @@ struct brcmf_cfg80211_info *brcmf_cfg802
-- init_vif_event(&cfg->vif_event);
-- INIT_LIST_HEAD(&cfg->vif_list);
--
--- vif = brcmf_alloc_vif(cfg, NL80211_IFTYPE_STATION, false);
--+ vif = brcmf_alloc_vif(cfg, NL80211_IFTYPE_STATION);
-- if (IS_ERR(vif))
-- goto wiphy_out;
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h
--@@ -167,7 +167,6 @@ struct vif_saved_ie {
-- * @wdev: wireless device.
-- * @profile: profile information.
-- * @sme_state: SME state using enum brcmf_vif_status bits.
--- * @pm_block: power-management blocked.
-- * @list: linked list.
-- * @mgmt_rx_reg: registered rx mgmt frame types.
-- * @mbss: Multiple BSS type, set if not first AP (not relevant for P2P).
--@@ -177,7 +176,6 @@ struct brcmf_cfg80211_vif {
-- struct wireless_dev wdev;
-- struct brcmf_cfg80211_profile profile;
-- unsigned long sme_state;
--- bool pm_block;
-- struct vif_saved_ie saved_ie;
-- struct list_head list;
-- u16 mgmt_rx_reg;
--@@ -388,8 +386,7 @@ s32 brcmf_cfg80211_down(struct net_devic
-- enum nl80211_iftype brcmf_cfg80211_get_iftype(struct brcmf_if *ifp);
--
-- struct brcmf_cfg80211_vif *brcmf_alloc_vif(struct brcmf_cfg80211_info *cfg,
--- enum nl80211_iftype type,
--- bool pm_block);
--+ enum nl80211_iftype type);
-- void brcmf_free_vif(struct brcmf_cfg80211_vif *vif);
--
-- s32 brcmf_vif_set_mgmt_ie(struct brcmf_cfg80211_vif *vif, s32 pktflag,
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
--@@ -2074,8 +2074,7 @@ static struct wireless_dev *brcmf_p2p_cr
-- if (p2p->bss_idx[P2PAPI_BSSCFG_DEVICE].vif)
-- return ERR_PTR(-ENOSPC);
--
--- p2p_vif = brcmf_alloc_vif(p2p->cfg, NL80211_IFTYPE_P2P_DEVICE,
--- false);
--+ p2p_vif = brcmf_alloc_vif(p2p->cfg, NL80211_IFTYPE_P2P_DEVICE);
-- if (IS_ERR(p2p_vif)) {
-- brcmf_err("could not create discovery vif\n");
-- return (struct wireless_dev *)p2p_vif;
--@@ -2175,7 +2174,7 @@ struct wireless_dev *brcmf_p2p_add_vif(s
-- return ERR_PTR(-EOPNOTSUPP);
-- }
--
--- vif = brcmf_alloc_vif(cfg, type, false);
--+ vif = brcmf_alloc_vif(cfg, type);
-- if (IS_ERR(vif))
-- return (struct wireless_dev *)vif;
-- brcmf_cfg80211_arm_vif_event(cfg, vif);
-diff --git a/package/kernel/mac80211/patches/351-0018-brcmfmac-include-required-headers-in-cfg80211.h.patch b/package/kernel/mac80211/patches/351-0018-brcmfmac-include-required-headers-in-cfg80211.h.patch
-deleted file mode 100644
-index 09547d8d3b5b021d920963a6280fe80a0a561a59..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/351-0018-brcmfmac-include-required-headers-in-cfg80211.h.patch
-+++ /dev/null
-@@ -1,37 +0,0 @@
--From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
--Date: Tue, 7 Jun 2016 08:20:21 +0200
--Subject: [PATCH] brcmfmac: include required headers in cfg80211.h
--MIME-Version: 1.0
--Content-Type: text/plain; charset=UTF-8
--Content-Transfer-Encoding: 8bit
--
--Without this including cfg80211.h in a wrong order could result in:
--
--drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h:122:24: error: array type has incomplete element type
-- struct brcmf_wsec_key key[BRCMF_MAX_DEFAULT_KEYS];
-- ^
--drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h:291:24: error: field ‘p2p’ has incomplete type
-- struct brcmf_p2p_info p2p;
-- ^
--drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h:297:27: error: field ‘pmk_list’ has incomplete type
-- struct brcmf_pmk_list_le pmk_list;
-- ^
--drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h:317:28: error: field ‘assoclist’ has incomplete type
-- struct brcmf_assoclist_le assoclist;
--
--Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h
--@@ -20,6 +20,9 @@
-- /* for brcmu_d11inf */
-- #include <brcmu_d11.h>
--
--+#include "fwil_types.h"
--+#include "p2p.h"
--+
-- #define WL_NUM_SCAN_MAX 10
-- #define WL_TLV_INFO_MAX 1024
-- #define WL_BSS_INFO_MAX 2048
-diff --git a/package/kernel/mac80211/patches/351-0019-brcmfmac-slightly-simplify-building-interface-combin.patch b/package/kernel/mac80211/patches/351-0019-brcmfmac-slightly-simplify-building-interface-combin.patch
-deleted file mode 100644
-index 461e3dba5397f7b48f00ec984d4edfd108dbbbb6..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/351-0019-brcmfmac-slightly-simplify-building-interface-combin.patch
-+++ /dev/null
-@@ -1,108 +0,0 @@
--From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
--Date: Tue, 7 Jun 2016 21:10:18 +0200
--Subject: [PATCH] brcmfmac: slightly simplify building interface combinations
--MIME-Version: 1.0
--Content-Type: text/plain; charset=UTF-8
--Content-Transfer-Encoding: 8bit
--
--This change reorders some operations in brcmf_setup_ifmodes in hope to
--make it simpler:
--1) It allocates arrays right before filling them. This way it's easier
-- to follow requested array length as it's immediately followed by
-- code filling it. It's easier to check e.g. why we need 4 entries for
-- P2P. Other than that it deduplicates some checks (e.g. for P2P).
--2) It reorders code to first prepare limits and then define a new combo.
-- Previously this was mixed (e.g. we were setting num of channels
-- before preparing limits).
--3) It modifies mbss code to use i variable just like other combos do.
--
--Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
--Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--@@ -6208,29 +6208,15 @@ static int brcmf_setup_ifmodes(struct wi
-- if (!combo)
-- goto err;
--
--- c0_limits = kcalloc(p2p ? 3 : 2, sizeof(*c0_limits), GFP_KERNEL);
--- if (!c0_limits)
--- goto err;
---
--- if (p2p) {
--- p2p_limits = kcalloc(4, sizeof(*p2p_limits), GFP_KERNEL);
--- if (!p2p_limits)
--- goto err;
--- }
---
--- if (mbss) {
--- mbss_limits = kcalloc(1, sizeof(*mbss_limits), GFP_KERNEL);
--- if (!mbss_limits)
--- goto err;
--- }
---
-- wiphy->interface_modes = BIT(NL80211_IFTYPE_STATION) |
-- BIT(NL80211_IFTYPE_ADHOC) |
-- BIT(NL80211_IFTYPE_AP);
--
-- c = 0;
-- i = 0;
--- combo[c].num_different_channels = 1;
--+ c0_limits = kcalloc(p2p ? 3 : 2, sizeof(*c0_limits), GFP_KERNEL);
--+ if (!c0_limits)
--+ goto err;
-- c0_limits[i].max = 1;
-- c0_limits[i++].types = BIT(NL80211_IFTYPE_STATION);
-- if (p2p) {
--@@ -6248,6 +6234,7 @@ static int brcmf_setup_ifmodes(struct wi
-- c0_limits[i].max = 1;
-- c0_limits[i++].types = BIT(NL80211_IFTYPE_AP);
-- }
--+ combo[c].num_different_channels = 1;
-- combo[c].max_interfaces = i;
-- combo[c].n_limits = i;
-- combo[c].limits = c0_limits;
--@@ -6255,7 +6242,9 @@ static int brcmf_setup_ifmodes(struct wi
-- if (p2p) {
-- c++;
-- i = 0;
--- combo[c].num_different_channels = 1;
--+ p2p_limits = kcalloc(4, sizeof(*p2p_limits), GFP_KERNEL);
--+ if (!p2p_limits)
--+ goto err;
-- p2p_limits[i].max = 1;
-- p2p_limits[i++].types = BIT(NL80211_IFTYPE_STATION);
-- p2p_limits[i].max = 1;
--@@ -6264,6 +6253,7 @@ static int brcmf_setup_ifmodes(struct wi
-- p2p_limits[i++].types = BIT(NL80211_IFTYPE_P2P_CLIENT);
-- p2p_limits[i].max = 1;
-- p2p_limits[i++].types = BIT(NL80211_IFTYPE_P2P_DEVICE);
--+ combo[c].num_different_channels = 1;
-- combo[c].max_interfaces = i;
-- combo[c].n_limits = i;
-- combo[c].limits = p2p_limits;
--@@ -6271,14 +6261,19 @@ static int brcmf_setup_ifmodes(struct wi
--
-- if (mbss) {
-- c++;
--+ i = 0;
--+ mbss_limits = kcalloc(1, sizeof(*mbss_limits), GFP_KERNEL);
--+ if (!mbss_limits)
--+ goto err;
--+ mbss_limits[i].max = 4;
--+ mbss_limits[i++].types = BIT(NL80211_IFTYPE_AP);
-- combo[c].beacon_int_infra_match = true;
-- combo[c].num_different_channels = 1;
--- mbss_limits[0].max = 4;
--- mbss_limits[0].types = BIT(NL80211_IFTYPE_AP);
-- combo[c].max_interfaces = 4;
--- combo[c].n_limits = 1;
--+ combo[c].n_limits = i;
-- combo[c].limits = mbss_limits;
-- }
--+
-- wiphy->n_iface_combinations = n_combos;
-- wiphy->iface_combinations = combo;
-- return 0;
-diff --git a/package/kernel/mac80211/patches/351-0020-brcmfmac-fix-lockup-when-removing-P2P-interface-afte.patch b/package/kernel/mac80211/patches/351-0020-brcmfmac-fix-lockup-when-removing-P2P-interface-afte.patch
-deleted file mode 100644
-index e991f32327d5fdb7a796ab0f8f3059487b6ebbe1..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/351-0020-brcmfmac-fix-lockup-when-removing-P2P-interface-afte.patch
-+++ /dev/null
-@@ -1,160 +0,0 @@
--From b50ddfa8530e9b5f52e873fdd6ff04f327a88799 Mon Sep 17 00:00:00 2001
--From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
--Date: Fri, 17 Jun 2016 12:29:21 +0200
--Subject: [PATCH] brcmfmac: fix lockup when removing P2P interface after event
-- timeout
--MIME-Version: 1.0
--Content-Type: text/plain; charset=UTF-8
--Content-Transfer-Encoding: 8bit
--
--Removing P2P interface is handled by sending a proper request to the
--firmware. On success firmware triggers an event and driver's handler
--removes a matching interface.
--
--However on event timeout we remove interface directly from the cfg80211
--callback. Current code doesn't handle this case correctly as it always
--assumes rtnl to be unlocked.
--
--Fix it by adding an extra rtnl_locked parameter to functions and calling
--unregister_netdevice when needed.
--
--Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
-- .../wireless/broadcom/brcm80211/brcmfmac/core.c | 29 +++++++++++++---------
-- .../wireless/broadcom/brcm80211/brcmfmac/core.h | 2 +-
-- .../wireless/broadcom/brcm80211/brcmfmac/fweh.c | 2 +-
-- .../net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 4 +--
-- 4 files changed, 21 insertions(+), 16 deletions(-)
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
--@@ -548,12 +548,16 @@ fail:
-- return -EBADE;
-- }
--
---static void brcmf_net_detach(struct net_device *ndev)
--+static void brcmf_net_detach(struct net_device *ndev, bool rtnl_locked)
-- {
--- if (ndev->reg_state == NETREG_REGISTERED)
--- unregister_netdev(ndev);
--- else
--+ if (ndev->reg_state == NETREG_REGISTERED) {
--+ if (rtnl_locked)
--+ unregister_netdevice(ndev);
--+ else
--+ unregister_netdev(ndev);
--+ } else {
-- brcmf_cfg80211_free_netdev(ndev);
--+ }
-- }
--
-- void brcmf_net_setcarrier(struct brcmf_if *ifp, bool on)
--@@ -651,7 +655,7 @@ struct brcmf_if *brcmf_add_if(struct brc
-- brcmf_err("ERROR: netdev:%s already exists\n",
-- ifp->ndev->name);
-- netif_stop_queue(ifp->ndev);
--- brcmf_net_detach(ifp->ndev);
--+ brcmf_net_detach(ifp->ndev, false);
-- drvr->iflist[bsscfgidx] = NULL;
-- } else {
-- brcmf_dbg(INFO, "netdev:%s ignore IF event\n",
--@@ -699,7 +703,8 @@ struct brcmf_if *brcmf_add_if(struct brc
-- return ifp;
-- }
--
---static void brcmf_del_if(struct brcmf_pub *drvr, s32 bsscfgidx)
--+static void brcmf_del_if(struct brcmf_pub *drvr, s32 bsscfgidx,
--+ bool rtnl_locked)
-- {
-- struct brcmf_if *ifp;
--
--@@ -729,7 +734,7 @@ static void brcmf_del_if(struct brcmf_pu
-- cancel_work_sync(&ifp->multicast_work);
-- cancel_work_sync(&ifp->ndoffload_work);
-- }
--- brcmf_net_detach(ifp->ndev);
--+ brcmf_net_detach(ifp->ndev, rtnl_locked);
-- } else {
-- /* Only p2p device interfaces which get dynamically created
-- * end up here. In this case the p2p module should be informed
--@@ -743,14 +748,14 @@ static void brcmf_del_if(struct brcmf_pu
-- }
-- }
--
---void brcmf_remove_interface(struct brcmf_if *ifp)
--+void brcmf_remove_interface(struct brcmf_if *ifp, bool rtnl_locked)
-- {
-- if (!ifp || WARN_ON(ifp->drvr->iflist[ifp->bsscfgidx] != ifp))
-- return;
-- brcmf_dbg(TRACE, "Enter, bsscfgidx=%d, ifidx=%d\n", ifp->bsscfgidx,
-- ifp->ifidx);
-- brcmf_fws_del_interface(ifp);
--- brcmf_del_if(ifp->drvr, ifp->bsscfgidx);
--+ brcmf_del_if(ifp->drvr, ifp->bsscfgidx, rtnl_locked);
-- }
--
-- #ifdef CONFIG_INET
--@@ -1057,9 +1062,9 @@ fail:
-- brcmf_fws_deinit(drvr);
-- }
-- if (ifp)
--- brcmf_net_detach(ifp->ndev);
--+ brcmf_net_detach(ifp->ndev, false);
-- if (p2p_ifp)
--- brcmf_net_detach(p2p_ifp->ndev);
--+ brcmf_net_detach(p2p_ifp->ndev, false);
-- drvr->iflist[0] = NULL;
-- drvr->iflist[1] = NULL;
-- if (drvr->settings->ignore_probe_fail)
--@@ -1128,7 +1133,7 @@ void brcmf_detach(struct device *dev)
--
-- /* make sure primary interface removed last */
-- for (i = BRCMF_MAX_IFS-1; i > -1; i--)
--- brcmf_remove_interface(drvr->iflist[i]);
--+ brcmf_remove_interface(drvr->iflist[i], false);
--
-- brcmf_cfg80211_detach(drvr->config);
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h
--@@ -216,7 +216,7 @@ struct brcmf_if *brcmf_get_ifp(struct br
-- int brcmf_net_attach(struct brcmf_if *ifp, bool rtnl_locked);
-- struct brcmf_if *brcmf_add_if(struct brcmf_pub *drvr, s32 bsscfgidx, s32 ifidx,
-- bool is_p2pdev, char *name, u8 *mac_addr);
---void brcmf_remove_interface(struct brcmf_if *ifp);
--+void brcmf_remove_interface(struct brcmf_if *ifp, bool rtnl_locked);
-- void brcmf_txflowblock_if(struct brcmf_if *ifp,
-- enum brcmf_netif_stop_reason reason, bool state);
-- void brcmf_txfinalize(struct brcmf_if *ifp, struct sk_buff *txp, bool success);
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c
--@@ -183,7 +183,7 @@ static void brcmf_fweh_handle_if_event(s
-- err = brcmf_fweh_call_event_handler(ifp, emsg->event_code, emsg, data);
--
-- if (ifp && ifevent->action == BRCMF_E_IF_DEL)
--- brcmf_remove_interface(ifp);
--+ brcmf_remove_interface(ifp, false);
-- }
--
-- /**
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
--@@ -2289,7 +2289,7 @@ int brcmf_p2p_del_vif(struct wiphy *wiph
-- err = 0;
-- }
-- if (err)
--- brcmf_remove_interface(vif->ifp);
--+ brcmf_remove_interface(vif->ifp, true);
--
-- brcmf_cfg80211_arm_vif_event(cfg, NULL);
-- if (vif->wdev.iftype != NL80211_IFTYPE_P2P_DEVICE)
--@@ -2395,7 +2395,7 @@ void brcmf_p2p_detach(struct brcmf_p2p_i
-- if (vif != NULL) {
-- brcmf_p2p_cancel_remain_on_channel(vif->ifp);
-- brcmf_p2p_deinit_discovery(p2p);
--- brcmf_remove_interface(vif->ifp);
--+ brcmf_remove_interface(vif->ifp, false);
-- }
-- /* just set it all to zero */
-- memset(p2p, 0, sizeof(*p2p));
-diff --git a/package/kernel/mac80211/patches/351-0021-brcmfmac-use-const-char-for-interface-name-in-brcmf_.patch b/package/kernel/mac80211/patches/351-0021-brcmfmac-use-const-char-for-interface-name-in-brcmf_.patch
-deleted file mode 100644
-index ed65f4dc885d936cd7776009b5b04a2376e16dc5..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/351-0021-brcmfmac-use-const-char-for-interface-name-in-brcmf_.patch
-+++ /dev/null
-@@ -1,39 +0,0 @@
--From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
--Date: Fri, 17 Jun 2016 12:48:44 +0200
--Subject: [PATCH] brcmfmac: use const char * for interface name in brcmf_add_if
--MIME-Version: 1.0
--Content-Type: text/plain; charset=UTF-8
--Content-Transfer-Encoding: 8bit
--
--This function can work just fine with const pointer, it only calls
--alloc_netdev which take const as well. Moreover it makes this function
--more flexible as some cfg80211 callback may provide const char * as
--well, e.g. add_virtual_intf. This will be needed for more advanced
--interface management.
--
--Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
--@@ -638,7 +638,7 @@ fail:
-- }
--
-- struct brcmf_if *brcmf_add_if(struct brcmf_pub *drvr, s32 bsscfgidx, s32 ifidx,
--- bool is_p2pdev, char *name, u8 *mac_addr)
--+ bool is_p2pdev, const char *name, u8 *mac_addr)
-- {
-- struct brcmf_if *ifp;
-- struct net_device *ndev;
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h
--@@ -215,7 +215,7 @@ char *brcmf_ifname(struct brcmf_if *ifp)
-- struct brcmf_if *brcmf_get_ifp(struct brcmf_pub *drvr, int ifidx);
-- int brcmf_net_attach(struct brcmf_if *ifp, bool rtnl_locked);
-- struct brcmf_if *brcmf_add_if(struct brcmf_pub *drvr, s32 bsscfgidx, s32 ifidx,
--- bool is_p2pdev, char *name, u8 *mac_addr);
--+ bool is_p2pdev, const char *name, u8 *mac_addr);
-- void brcmf_remove_interface(struct brcmf_if *ifp, bool rtnl_locked);
-- void brcmf_txflowblock_if(struct brcmf_if *ifp,
-- enum brcmf_netif_stop_reason reason, bool state);
-diff --git a/package/kernel/mac80211/patches/351-0022-brcmfmac-include-also-core.h-header-in-cfg80211.h.patch b/package/kernel/mac80211/patches/351-0022-brcmfmac-include-also-core.h-header-in-cfg80211.h.patch
-deleted file mode 100644
-index ef35fab7d74b31ab2305ce881a4d45cba73337cc..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/351-0022-brcmfmac-include-also-core.h-header-in-cfg80211.h.patch
-+++ /dev/null
-@@ -1,33 +0,0 @@
--From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
--Date: Sat, 18 Jun 2016 18:49:38 +0200
--Subject: [PATCH] brcmfmac: include also core.h header in cfg80211.h
--MIME-Version: 1.0
--Content-Type: text/plain; charset=UTF-8
--Content-Transfer-Encoding: 8bit
--
--This header provides two inline functions using struct brcmf_if so we
--need core.h to avoid:
--
--drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h: In function ‘ndev_to_prof’:
--drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h:368:13: error: dereferencing pointer to incomplete type
-- return &ifp->vif->profile;
-- ^
--drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h: In function ‘ndev_to_vif’:
--drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h:374:12: error: dereferencing pointer to incomplete type
-- return ifp->vif;
-- ^
--
--Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h
--@@ -20,6 +20,7 @@
-- /* for brcmu_d11inf */
-- #include <brcmu_d11.h>
--
--+#include "core.h"
-- #include "fwil_types.h"
-- #include "p2p.h"
--
-diff --git a/package/kernel/mac80211/patches/351-0023-brcmfmac-add-missing-break-when-deleting-P2P_DEVICE.patch b/package/kernel/mac80211/patches/351-0023-brcmfmac-add-missing-break-when-deleting-P2P_DEVICE.patch
-deleted file mode 100644
-index ab9a63443738dd8979cf415cd06b62ddb1a8d2cf..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/351-0023-brcmfmac-add-missing-break-when-deleting-P2P_DEVICE.patch
-+++ /dev/null
-@@ -1,27 +0,0 @@
--From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
--Date: Sun, 19 Jun 2016 01:55:57 +0200
--Subject: [PATCH] brcmfmac: add missing break when deleting P2P_DEVICE
--MIME-Version: 1.0
--Content-Type: text/plain; charset=UTF-8
--Content-Transfer-Encoding: 8bit
--
--We obviously don't want to fall through in that switch. With this change
--1) We wait for event (triggered by p2p_disc) as expected
--2) We remove interface manually on timeout
--3) We return 0 on success instead of -ENOTSUPP
--
--Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
--@@ -2263,6 +2263,8 @@ int brcmf_p2p_del_vif(struct wiphy *wiph
-- return 0;
-- brcmf_p2p_cancel_remain_on_channel(vif->ifp);
-- brcmf_p2p_deinit_discovery(p2p);
--+ break;
--+
-- default:
-- return -ENOTSUPP;
-- }
-diff --git a/package/kernel/mac80211/patches/351-0024-brcmfmac-delete-interface-directly-in-code-that-sent.patch b/package/kernel/mac80211/patches/351-0024-brcmfmac-delete-interface-directly-in-code-that-sent.patch
-deleted file mode 100644
-index 6dd0c03e3dfe5c5ed3c310931040a14596de79f1..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/351-0024-brcmfmac-delete-interface-directly-in-code-that-sent.patch
-+++ /dev/null
-@@ -1,75 +0,0 @@
--From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
--Date: Wed, 29 Jun 2016 21:54:26 +0200
--Subject: [PATCH] brcmfmac: delete interface directly in code that sent fw
-- request
--MIME-Version: 1.0
--Content-Type: text/plain; charset=UTF-8
--Content-Transfer-Encoding: 8bit
--
--So far when receiving event about in-firmware-interface removal our
--event worker was notifying listener and afterwards it was removing Linux
--interface.
--
--First of all it was resulting in slightly unexpected order. The listener
--(del_virtual_intf callback) was (usually) returning with success before
--we even called unregister_netdev(ice).
--
--Please note this couldn't be simply fixed by changing order of calls in
--brcmf_fweh_handle_if_event as unregistering interface earlier could free
--struct brcmf_if.
--
--Another problem of current implementation are possible lockups. Focus on
--the time slot between calling event handler and removing Linux
--interface. During that time original caller may leave (unlocking rtnl
--semaphore) *and* another call to the same code may be done (locking it
--again). If that happens our event handler will stuck at removing Linux
--interface, it won't handle another event and will block process holding
--rtnl lock.
--
--This can be simply solved by unregistering interface in a proper
--callback, right after receiving confirmation event from firmware. This
--only required modifying worker to don't unregister on its own if there
--is someone waiting for the event.
--
--Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c
--@@ -18,6 +18,7 @@
-- #include "brcmu_wifi.h"
-- #include "brcmu_utils.h"
--
--+#include "cfg80211.h"
-- #include "core.h"
-- #include "debug.h"
-- #include "tracepoint.h"
--@@ -182,8 +183,13 @@ static void brcmf_fweh_handle_if_event(s
--
-- err = brcmf_fweh_call_event_handler(ifp, emsg->event_code, emsg, data);
--
--- if (ifp && ifevent->action == BRCMF_E_IF_DEL)
--- brcmf_remove_interface(ifp, false);
--+ if (ifp && ifevent->action == BRCMF_E_IF_DEL) {
--+ bool armed = brcmf_cfg80211_vif_event_armed(drvr->config);
--+
--+ /* Default handling in case no-one waits for this event */
--+ if (!armed)
--+ brcmf_remove_interface(ifp, false);
--+ }
-- }
--
-- /**
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
--@@ -2290,8 +2290,7 @@ int brcmf_p2p_del_vif(struct wiphy *wiph
-- else
-- err = 0;
-- }
--- if (err)
--- brcmf_remove_interface(vif->ifp, true);
--+ brcmf_remove_interface(vif->ifp, true);
--
-- brcmf_cfg80211_arm_vif_event(cfg, NULL);
-- if (vif->wdev.iftype != NL80211_IFTYPE_P2P_DEVICE)
-diff --git a/package/kernel/mac80211/patches/351-0025-brcmfmac-support-removing-AP-interfaces-with-interfa.patch b/package/kernel/mac80211/patches/351-0025-brcmfmac-support-removing-AP-interfaces-with-interfa.patch
-deleted file mode 100644
-index 1929f0b8126ed8659d642019648c4b86cc85ecb6..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/351-0025-brcmfmac-support-removing-AP-interfaces-with-interfa.patch
-+++ /dev/null
-@@ -1,84 +0,0 @@
--From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
--Date: Wed, 29 Jun 2016 21:54:27 +0200
--Subject: [PATCH] brcmfmac: support removing AP interfaces with
-- "interface_remove"
--MIME-Version: 1.0
--Content-Type: text/plain; charset=UTF-8
--Content-Transfer-Encoding: 8bit
--
--New firmwares (e.g. 10.10.69.36 for BCM4366) support "interface_remove"
--for removing interfaces. Try to use this method on cfg80211 request. In
--case of older firmwares (e.g. 7.35.177.56 for BCM43602 as I tested) this
--will just result in firmware rejecting command and this won't change any
--behavior.
--
--Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--@@ -771,12 +771,48 @@ s32 brcmf_notify_escan_complete(struct b
-- return err;
-- }
--
--+static int brcmf_cfg80211_del_ap_iface(struct wiphy *wiphy,
--+ struct wireless_dev *wdev)
--+{
--+ struct brcmf_cfg80211_info *cfg = wiphy_priv(wiphy);
--+ struct net_device *ndev = wdev->netdev;
--+ struct brcmf_if *ifp = netdev_priv(ndev);
--+ int ret;
--+ int err;
--+
--+ brcmf_cfg80211_arm_vif_event(cfg, ifp->vif);
--+
--+ err = brcmf_fil_bsscfg_data_set(ifp, "interface_remove", NULL, 0);
--+ if (err) {
--+ brcmf_err("interface_remove failed %d\n", err);
--+ goto err_unarm;
--+ }
--+
--+ /* wait for firmware event */
--+ ret = brcmf_cfg80211_wait_vif_event(cfg, BRCMF_E_IF_DEL,
--+ BRCMF_VIF_EVENT_TIMEOUT);
--+ if (!ret) {
--+ brcmf_err("timeout occurred\n");
--+ err = -EIO;
--+ goto err_unarm;
--+ }
--+
--+ brcmf_remove_interface(ifp, true);
--+
--+err_unarm:
--+ brcmf_cfg80211_arm_vif_event(cfg, NULL);
--+ return err;
--+}
--+
-- static
-- int brcmf_cfg80211_del_iface(struct wiphy *wiphy, struct wireless_dev *wdev)
-- {
-- struct brcmf_cfg80211_info *cfg = wiphy_priv(wiphy);
-- struct net_device *ndev = wdev->netdev;
--
--+ if (ndev && ndev == cfg_to_ndev(cfg))
--+ return -ENOTSUPP;
--+
-- /* vif event pending in firmware */
-- if (brcmf_cfg80211_vif_event_armed(cfg))
-- return -EBUSY;
--@@ -793,12 +829,13 @@ int brcmf_cfg80211_del_iface(struct wiph
-- switch (wdev->iftype) {
-- case NL80211_IFTYPE_ADHOC:
-- case NL80211_IFTYPE_STATION:
--- case NL80211_IFTYPE_AP:
-- case NL80211_IFTYPE_AP_VLAN:
-- case NL80211_IFTYPE_WDS:
-- case NL80211_IFTYPE_MONITOR:
-- case NL80211_IFTYPE_MESH_POINT:
-- return -EOPNOTSUPP;
--+ case NL80211_IFTYPE_AP:
--+ return brcmf_cfg80211_del_ap_iface(wiphy, wdev);
-- case NL80211_IFTYPE_P2P_CLIENT:
-- case NL80211_IFTYPE_P2P_GO:
-- case NL80211_IFTYPE_P2P_DEVICE:
-diff --git a/package/kernel/mac80211/patches/351-0026-brcmfmac-respect-hidden_ssid-for-AP-interfaces.patch b/package/kernel/mac80211/patches/351-0026-brcmfmac-respect-hidden_ssid-for-AP-interfaces.patch
-deleted file mode 100644
-index ae458e7a02608101799f072b4211a01d6d487f96..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/351-0026-brcmfmac-respect-hidden_ssid-for-AP-interfaces.patch
-+++ /dev/null
-@@ -1,43 +0,0 @@
--From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
--Date: Wed, 6 Jul 2016 12:22:54 +0200
--Subject: [PATCH] brcmfmac: respect hidden_ssid for AP interfaces
--MIME-Version: 1.0
--Content-Type: text/plain; charset=UTF-8
--Content-Transfer-Encoding: 8bit
--
--This was succesfully tested with 4366B1. A small workaround is needed
--for the main interface otherwise it would stuck at the hidden state.
--
--Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--@@ -4586,6 +4586,15 @@ brcmf_cfg80211_start_ap(struct wiphy *wi
-- brcmf_err("SET SSID error (%d)\n", err);
-- goto exit;
-- }
--+
--+ if (settings->hidden_ssid) {
--+ err = brcmf_fil_iovar_int_set(ifp, "closednet", 1);
--+ if (err) {
--+ brcmf_err("closednet error (%d)\n", err);
--+ goto exit;
--+ }
--+ }
--+
-- brcmf_dbg(TRACE, "AP mode configuration complete\n");
-- } else if (dev_role == NL80211_IFTYPE_P2P_GO) {
-- err = brcmf_fil_iovar_int_set(ifp, "chanspec", chanspec);
--@@ -4644,6 +4653,10 @@ static int brcmf_cfg80211_stop_ap(struct
-- return err;
-- }
--
--+ /* First BSS doesn't get a full reset */
--+ if (ifp->bsscfgidx == 0)
--+ brcmf_fil_iovar_int_set(ifp, "closednet", 0);
--+
-- memset(&join_params, 0, sizeof(join_params));
-- err = brcmf_fil_cmd_data_set(ifp, BRCMF_C_SET_SSID,
-- &join_params, sizeof(join_params));
-diff --git a/package/kernel/mac80211/patches/351-0027-brcmfmac-restore-stopping-netdev-queue-when-bus-clog.patch b/package/kernel/mac80211/patches/351-0027-brcmfmac-restore-stopping-netdev-queue-when-bus-clog.patch
-deleted file mode 100644
-index fcafa797ef02fa53c05fb5a1dde8f550f02bf9d8..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/351-0027-brcmfmac-restore-stopping-netdev-queue-when-bus-clog.patch
-+++ /dev/null
-@@ -1,53 +0,0 @@
--From: Arend Van Spriel <arend.vanspriel@broadcom.com>
--Date: Fri, 15 Jul 2016 12:16:12 +0200
--Subject: [PATCH] brcmfmac: restore stopping netdev queue when bus clogs up
--MIME-Version: 1.0
--Content-Type: text/plain; charset=UTF-8
--Content-Transfer-Encoding: 8bit
--
--When the host-interface bus has hard time handling transmit packets
--it informs higher layer about this and it would stop the netdev
--queue when needed. However, since commit 9cd18359d31e ("brcmfmac:
--Make FWS queueing configurable.") this was broken. With this patch
--the behaviour is restored.
--
--Cc: stable@vger.kernel.org # v4.5, v4.6, v4.7
--Fixes: 9cd18359d31e ("brcmfmac: Make FWS queueing configurable.")
--Tested-by: Per Förlin <per.forlin@gmail.com>
--Reviewed-by: Hante Meuleman <hante.meuleman@broadcom.com>
--Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
--Reviewed-by: Franky Lin <franky.lin@broadcom.com>
--Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c
--@@ -2469,10 +2469,22 @@ void brcmf_fws_bustxfail(struct brcmf_fw
-- void brcmf_fws_bus_blocked(struct brcmf_pub *drvr, bool flow_blocked)
-- {
-- struct brcmf_fws_info *fws = drvr->fws;
--+ struct brcmf_if *ifp;
--+ int i;
--
--- fws->bus_flow_blocked = flow_blocked;
--- if (!flow_blocked)
--- brcmf_fws_schedule_deq(fws);
--- else
--- fws->stats.bus_flow_block++;
--+ if (fws->avoid_queueing) {
--+ for (i = 0; i < BRCMF_MAX_IFS; i++) {
--+ ifp = drvr->iflist[i];
--+ if (!ifp || !ifp->ndev)
--+ continue;
--+ brcmf_txflowblock_if(ifp, BRCMF_NETIF_STOP_REASON_FLOW,
--+ flow_blocked);
--+ }
--+ } else {
--+ fws->bus_flow_blocked = flow_blocked;
--+ if (!flow_blocked)
--+ brcmf_fws_schedule_deq(fws);
--+ else
--+ fws->stats.bus_flow_block++;
--+ }
-- }
-diff --git a/package/kernel/mac80211/patches/351-0028-brcmfmac-defer-DPC-processing-during-probe.patch b/package/kernel/mac80211/patches/351-0028-brcmfmac-defer-DPC-processing-during-probe.patch
-deleted file mode 100644
-index a24c07f9731916f4bd3ff9bd3cb787d5982a1345..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/351-0028-brcmfmac-defer-DPC-processing-during-probe.patch
-+++ /dev/null
-@@ -1,42 +0,0 @@
--From fd3ed33f51c2a586412d35b4f64803f019ab589f Mon Sep 17 00:00:00 2001
--From: Arend Van Spriel <arend.vanspriel@broadcom.com>
--Date: Fri, 15 Jul 2016 12:39:13 +0200
--Subject: [PATCH] brcmfmac: defer DPC processing during probe
--
--The sdio dpc starts processing when in SDIOD_STATE_DATA. This state was
--entered right after firmware download. This patch moves that transition
--just before enabling sdio interrupt handling thus avoiding watchdog
--expiry which would put the bus to sleep while probing.
--
--Reviewed-by: Hante Meuleman <hante.meuleman@broadcom.com>
--Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
--Reviewed-by: Franky Lin <franky.lin@broadcom.com>
--Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
-- drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 7 +++----
-- 1 file changed, 3 insertions(+), 4 deletions(-)
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
--@@ -3304,10 +3304,6 @@ static int brcmf_sdio_download_firmware(
-- goto err;
-- }
--
--- /* Allow full data communication using DPC from now on. */
--- brcmf_sdiod_change_state(bus->sdiodev, BRCMF_SDIOD_DATA);
--- bcmerror = 0;
---
-- err:
-- brcmf_sdio_clkctl(bus, CLK_SDONLY, false);
-- sdio_release_host(bus->sdiodev->func[1]);
--@@ -4045,6 +4041,9 @@ static void brcmf_sdio_firmware_callback
-- }
--
-- if (err == 0) {
--+ /* Allow full data communication using DPC from now on. */
--+ brcmf_sdiod_change_state(bus->sdiodev, BRCMF_SDIOD_DATA);
--+
-- err = brcmf_sdiod_intr_register(sdiodev);
-- if (err != 0)
-- brcmf_err("intr register failed:%d\n", err);
-diff --git a/package/kernel/mac80211/patches/351-0029-brcmfmac-Fix-glob_skb-leak-in-brcmf_sdiod_recv_chain.patch b/package/kernel/mac80211/patches/351-0029-brcmfmac-Fix-glob_skb-leak-in-brcmf_sdiod_recv_chain.patch
-deleted file mode 100644
-index ba9a349f0fd1874c5b038e4cc4d7f4cf2097ae47..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/351-0029-brcmfmac-Fix-glob_skb-leak-in-brcmf_sdiod_recv_chain.patch
-+++ /dev/null
-@@ -1,32 +0,0 @@
--From 3bdae810721b33061d2e541bd78a70f86ca42af3 Mon Sep 17 00:00:00 2001
--From: Florian Fainelli <f.fainelli@gmail.com>
--Date: Mon, 18 Jul 2016 16:24:34 -0700
--Subject: [PATCH] brcmfmac: Fix glob_skb leak in brcmf_sdiod_recv_chain
--
--In case brcmf_sdiod_recv_chain() cannot complete a succeful call to
--brcmf_sdiod_buffrw, we would be leaking glom_skb and not free it as we
--should, fix this.
--
--Reported-by: coverity (CID 1164856)
--Fixes: a413e39a38573 ("brcmfmac: fix brcmf_sdcard_recv_chain() for host without sg support")
--Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
--Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
-- drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 4 +++-
-- 1 file changed, 3 insertions(+), 1 deletion(-)
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
--@@ -722,8 +722,10 @@ int brcmf_sdiod_recv_chain(struct brcmf_
-- return -ENOMEM;
-- err = brcmf_sdiod_buffrw(sdiodev, SDIO_FUNC_2, false, addr,
-- glom_skb);
--- if (err)
--+ if (err) {
--+ brcmu_pkt_buf_free_skb(glom_skb);
-- goto done;
--+ }
--
-- skb_queue_walk(pktq, skb) {
-- memcpy(skb->data, glom_skb->data, skb->len);
-diff --git a/package/kernel/mac80211/patches/351-0030-net-wireless-broadcom-brcm80211-brcmfmac-usb-don-t-p.patch b/package/kernel/mac80211/patches/351-0030-net-wireless-broadcom-brcm80211-brcmfmac-usb-don-t-p.patch
-deleted file mode 100644
-index 540b7f08bf7c6b9c78f5b2ccfdae2a96dbaa4e6f..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/351-0030-net-wireless-broadcom-brcm80211-brcmfmac-usb-don-t-p.patch
-+++ /dev/null
-@@ -1,34 +0,0 @@
--From 938f89e50a41c2d56710805fb019ad7618cef84b Mon Sep 17 00:00:00 2001
--From: Wolfram Sang <wsa-dev@sang-engineering.com>
--Date: Thu, 11 Aug 2016 23:05:31 +0200
--Subject: [PATCH] net: wireless: broadcom: brcm80211: brcmfmac: usb: don't
-- print error when allocating urb fails
--
--kmalloc will print enough information in case of failure.
--
--Signed-off-by: Wolfram Sang <wsa-dev@sang-engineering.com>
--Signed-off-by: David S. Miller <davem@davemloft.net>
-----
-- drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 8 ++------
-- 1 file changed, 2 insertions(+), 6 deletions(-)
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
--@@ -1099,15 +1099,11 @@ struct brcmf_usbdev *brcmf_usb_attach(st
-- devinfo->tx_freecount = ntxq;
--
-- devinfo->ctl_urb = usb_alloc_urb(0, GFP_ATOMIC);
--- if (!devinfo->ctl_urb) {
--- brcmf_err("usb_alloc_urb (ctl) failed\n");
--+ if (!devinfo->ctl_urb)
-- goto error;
--- }
-- devinfo->bulk_urb = usb_alloc_urb(0, GFP_ATOMIC);
--- if (!devinfo->bulk_urb) {
--- brcmf_err("usb_alloc_urb (bulk) failed\n");
--+ if (!devinfo->bulk_urb)
-- goto error;
--- }
--
-- return &devinfo->bus_pub;
--
-diff --git a/package/kernel/mac80211/patches/351-0031-brcmfmac-Check-rtnl_lock-is-locked-when-removing-int.patch b/package/kernel/mac80211/patches/351-0031-brcmfmac-Check-rtnl_lock-is-locked-when-removing-int.patch
-deleted file mode 100644
-index b98b68a88a23b85b69092979ac92ebf1e2b1a5d2..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/351-0031-brcmfmac-Check-rtnl_lock-is-locked-when-removing-int.patch
-+++ /dev/null
-@@ -1,111 +0,0 @@
--From 15dacf880e49ce3ecee05eb1a0c6b8e363dbacdc Mon Sep 17 00:00:00 2001
--From: "mhiramat@kernel.org" <mhiramat@kernel.org>
--Date: Mon, 15 Aug 2016 18:40:57 +0900
--Subject: [PATCH] brcmfmac: Check rtnl_lock is locked when removing interface
--MIME-Version: 1.0
--Content-Type: text/plain; charset=UTF-8
--Content-Transfer-Encoding: 8bit
--
--Check rtnl_lock is locked in brcmf_p2p_ifp_removed() by passing
--rtnl_locked flag. Actually the caller brcmf_del_if() checks whether
--the rtnl_lock is locked, but doesn't pass it to brcmf_p2p_ifp_removed().
--
--Without this fix, wpa_supplicant goes softlockup with rtnl_lock
--holding (this means all other process using netlink are locked up too)
--
--e.g.
--[ 4495.876627] INFO: task wpa_supplicant:7307 blocked for more than 10 seconds.
--[ 4495.876632] Tainted: G W 4.8.0-rc1+ #8
--[ 4495.876635] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message.
--[ 4495.876638] wpa_supplicant D ffff974c647b39a0 0 7307 1 0x00000000
--[ 4495.876644] ffff974c647b39a0 0000000000000000 ffff974c00000000 ffff974c7dc59c58
--[ 4495.876651] ffff974c6b7417c0 ffff974c645017c0 ffff974c647b4000 ffffffff86f16c08
--[ 4495.876657] ffff974c645017c0 0000000000000246 00000000ffffffff ffff974c647b39b8
--[ 4495.876664] Call Trace:
--[ 4495.876671] [<ffffffff868aeccc>] schedule+0x3c/0x90
--[ 4495.876676] [<ffffffff868af065>] schedule_preempt_disabled+0x15/0x20
--[ 4495.876682] [<ffffffff868b0996>] mutex_lock_nested+0x176/0x3b0
--[ 4495.876686] [<ffffffff867a2067>] ? rtnl_lock+0x17/0x20
--[ 4495.876690] [<ffffffff867a2067>] rtnl_lock+0x17/0x20
--[ 4495.876720] [<ffffffffc0ae9a5d>] brcmf_p2p_ifp_removed+0x4d/0x70 [brcmfmac]
--[ 4495.876741] [<ffffffffc0aebde6>] brcmf_remove_interface+0x196/0x1b0 [brcmfmac]
--[ 4495.876760] [<ffffffffc0ae9901>] brcmf_p2p_del_vif+0x111/0x220 [brcmfmac]
--[ 4495.876777] [<ffffffffc0adefab>] brcmf_cfg80211_del_iface+0x21b/0x270 [brcmfmac]
--[ 4495.876820] [<ffffffffc097b39e>] nl80211_del_interface+0xfe/0x3a0 [cfg80211]
--[ 4495.876825] [<ffffffff867ca335>] genl_family_rcv_msg+0x1b5/0x370
--[ 4495.876832] [<ffffffff860e5d8d>] ? trace_hardirqs_on+0xd/0x10
--[ 4495.876836] [<ffffffff867ca56d>] genl_rcv_msg+0x7d/0xb0
--[ 4495.876839] [<ffffffff867ca4f0>] ? genl_family_rcv_msg+0x370/0x370
--[ 4495.876846] [<ffffffff867c9a47>] netlink_rcv_skb+0x97/0xb0
--[ 4495.876849] [<ffffffff867ca168>] genl_rcv+0x28/0x40
--[ 4495.876854] [<ffffffff867c93c3>] netlink_unicast+0x1d3/0x2f0
--[ 4495.876860] [<ffffffff867c933b>] ? netlink_unicast+0x14b/0x2f0
--[ 4495.876866] [<ffffffff867c97cb>] netlink_sendmsg+0x2eb/0x3a0
--[ 4495.876870] [<ffffffff8676dad8>] sock_sendmsg+0x38/0x50
--[ 4495.876874] [<ffffffff8676e4df>] ___sys_sendmsg+0x27f/0x290
--[ 4495.876882] [<ffffffff8628b935>] ? mntput_no_expire+0x5/0x3f0
--[ 4495.876888] [<ffffffff8628b9be>] ? mntput_no_expire+0x8e/0x3f0
--[ 4495.876894] [<ffffffff8628b935>] ? mntput_no_expire+0x5/0x3f0
--[ 4495.876899] [<ffffffff8628bd44>] ? mntput+0x24/0x40
--[ 4495.876904] [<ffffffff86267830>] ? __fput+0x190/0x200
--[ 4495.876909] [<ffffffff8676f125>] __sys_sendmsg+0x45/0x80
--[ 4495.876914] [<ffffffff8676f172>] SyS_sendmsg+0x12/0x20
--[ 4495.876918] [<ffffffff868b5680>] entry_SYSCALL_64_fastpath+0x23/0xc1
--[ 4495.876924] [<ffffffff860e2b8f>] ? trace_hardirqs_off_caller+0x1f/0xc0
--
--Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
--Acked-by: Rafał Miłecki <rafal@milecki.pl>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
-- drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c | 2 +-
-- drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 8 +++++---
-- drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.h | 2 +-
-- 3 files changed, 7 insertions(+), 5 deletions(-)
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
--@@ -743,7 +743,7 @@ static void brcmf_del_if(struct brcmf_pu
-- * serious troublesome side effects. The p2p module will clean
-- * up the ifp if needed.
-- */
--- brcmf_p2p_ifp_removed(ifp);
--+ brcmf_p2p_ifp_removed(ifp, rtnl_locked);
-- kfree(ifp);
-- }
-- }
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c
--@@ -2299,7 +2299,7 @@ int brcmf_p2p_del_vif(struct wiphy *wiph
-- return err;
-- }
--
---void brcmf_p2p_ifp_removed(struct brcmf_if *ifp)
--+void brcmf_p2p_ifp_removed(struct brcmf_if *ifp, bool rtnl_locked)
-- {
-- struct brcmf_cfg80211_info *cfg;
-- struct brcmf_cfg80211_vif *vif;
--@@ -2308,9 +2308,11 @@ void brcmf_p2p_ifp_removed(struct brcmf_
-- vif = ifp->vif;
-- cfg = wdev_to_cfg(&vif->wdev);
-- cfg->p2p.bss_idx[P2PAPI_BSSCFG_DEVICE].vif = NULL;
--- rtnl_lock();
--+ if (!rtnl_locked)
--+ rtnl_lock();
-- cfg80211_unregister_wdev(&vif->wdev);
--- rtnl_unlock();
--+ if (!rtnl_locked)
--+ rtnl_unlock();
-- brcmf_free_vif(vif);
-- }
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.h
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.h
--@@ -155,7 +155,7 @@ struct wireless_dev *brcmf_p2p_add_vif(s
-- int brcmf_p2p_del_vif(struct wiphy *wiphy, struct wireless_dev *wdev);
-- int brcmf_p2p_ifchange(struct brcmf_cfg80211_info *cfg,
-- enum brcmf_fil_p2p_if_types if_type);
---void brcmf_p2p_ifp_removed(struct brcmf_if *ifp);
--+void brcmf_p2p_ifp_removed(struct brcmf_if *ifp, bool rtnl_locked);
-- int brcmf_p2p_start_device(struct wiphy *wiphy, struct wireless_dev *wdev);
-- void brcmf_p2p_stop_device(struct wiphy *wiphy, struct wireless_dev *wdev);
-- int brcmf_p2p_scan_prep(struct wiphy *wiphy,
-diff --git a/package/kernel/mac80211/patches/351-0032-brcmfmac-Change-vif_event_lock-to-spinlock.patch b/package/kernel/mac80211/patches/351-0032-brcmfmac-Change-vif_event_lock-to-spinlock.patch
-deleted file mode 100644
-index 30ca25897d06fb2b26866255721377f5dbccfed0..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/351-0032-brcmfmac-Change-vif_event_lock-to-spinlock.patch
-+++ /dev/null
-@@ -1,175 +0,0 @@
--From b64abcb7dae6060c67ab0e548da3ef923c49641d Mon Sep 17 00:00:00 2001
--From: "mhiramat@kernel.org" <mhiramat@kernel.org>
--Date: Mon, 15 Aug 2016 18:41:12 +0900
--Subject: [PATCH] brcmfmac: Change vif_event_lock to spinlock
--
--Change vif_event_lock to spinlock from mutex, since this lock is
--used in wait_event_timeout() via vif_event_equals(). This caused
--a warning report as below.
--
--As far as I can see, this lock protects regions where updating
--structure members, not function calls. Also, since those
--regions are not called from interrupt handlers (of course, it
--was a mutex), spin_lock is used instead of spin_lock_irqsave.
--
--[ 186.678550] ------------[ cut here ]------------
--[ 186.678556] WARNING: CPU: 2 PID: 7140 at /home/mhiramat/ksrc/linux/kernel/sched/core.c:7545 __might_sleep+0x7c/0x80
--[ 186.678560] do not call blocking ops when !TASK_RUNNING; state=2 set at [<ffffffff980d9090>] prepare_to_wait_event+0x60/0x100
--[ 186.678560] Modules linked in: brcmfmac xt_CHECKSUM rfcomm ipt_MASQUERADE nf_nat_masquerade_ipv4 xt_addrtype br_netfilter xt_tcpudp ip6t_rpfilter ip6t_REJECT nf_reject_ipv6 ipt_REJECT nf_reject_ipv4 xt_conntrack ip_set nfnetlink ebtable_nat ebtable_broute bridge stp llc ebtable_filter ebtables ip6table_raw ip6table_security ip6table_nat nf_conntrack_ipv6 nf_defrag_ipv6 nf_nat_ipv6 ip6table_mangle ip6table_filter ip6_tables iptable_raw iptable_security iptable_nat nf_conntrack_ipv4 nf_defrag_ipv4 nf_nat_ipv4 nf_nat nf_conntrack iptable_mangle iptable_filter ip_tables x_tables bnep nls_iso8859_1 i2c_designware_platform i2c_designware_core snd_hda_codec_hdmi snd_hda_codec_realtek dcdbas snd_hda_codec_generic snd_hda_intel snd_hda_codec intel_rapl snd_hda_core x86_pkg_temp_thermal intel_powerclamp coretemp
--[ 186.678594] snd_pcm crct10dif_pclmul crc32_pclmul aesni_intel aes_x86_64 joydev glue_helper snd_hwdep lrw gf128mul uvcvideo ablk_helper snd_seq_midi cryptd snd_seq_midi_event snd_rawmidi videobuf2_vmalloc videobuf2_memops snd_seq input_leds videobuf2_v4l2 cfg80211 videobuf2_core snd_timer videodev serio_raw btusb snd_seq_device media btrtl rtsx_pci_ms snd mei_me memstick hid_multitouch mei soundcore brcmutil idma64 virt_dma intel_lpss_pci processor_thermal_device intel_soc_dts_iosf hci_uart btbcm btqca btintel bluetooth int3403_thermal dell_smo8800 intel_lpss_acpi intel_lpss int3402_thermal int340x_thermal_zone intel_hid mac_hid int3400_thermal shpchp sparse_keymap acpi_pad acpi_thermal_rel acpi_als kfifo_buf industrialio kvm_intel kvm irqbypass parport_pc ppdev lp parport autofs4 btrfs xor raid6_pq
--[ 186.678631] usbhid nouveau ttm i915 rtsx_pci_sdmmc mxm_wmi i2c_algo_bit drm_kms_helper syscopyarea sysfillrect sysimgblt fb_sys_fops psmouse drm ahci rtsx_pci nvme nvme_core libahci i2c_hid hid pinctrl_sunrisepoint video wmi pinctrl_intel fjes [last unloaded: brcmfmac]
--[ 186.678646] CPU: 2 PID: 7140 Comm: wpa_supplicant Not tainted 4.8.0-rc1+ #8
--[ 186.678647] Hardware name: Dell Inc. XPS 15 9550/0N7TVV, BIOS 01.02.00 04/07/2016
--[ 186.678648] 0000000000000000 ffff9d8c64b5b900 ffffffff98442f23 ffff9d8c64b5b950
--[ 186.678651] 0000000000000000 ffff9d8c64b5b940 ffffffff9808b22b 00001d790000000d
--[ 186.678653] ffffffff98c75e78 000000000000026c 0000000000000000 ffff9d8c2706d058
--[ 186.678655] Call Trace:
--[ 186.678659] [<ffffffff98442f23>] dump_stack+0x85/0xc2
--[ 186.678666] [<ffffffff9808b22b>] __warn+0xcb/0xf0
--[ 186.678668] [<ffffffff9808b29f>] warn_slowpath_fmt+0x4f/0x60
--[ 186.678671] [<ffffffff980d9090>] ? prepare_to_wait_event+0x60/0x100
--[ 186.678672] [<ffffffff980d9090>] ? prepare_to_wait_event+0x60/0x100
--[ 186.678674] [<ffffffff980b922c>] __might_sleep+0x7c/0x80
--[ 186.678680] [<ffffffff988b0853>] mutex_lock_nested+0x33/0x3b0
--[ 186.678682] [<ffffffff980e5d8d>] ? trace_hardirqs_on+0xd/0x10
--[ 186.678689] [<ffffffffc0c57d2d>] brcmf_cfg80211_wait_vif_event+0xcd/0x130 [brcmfmac]
--[ 186.678691] [<ffffffff980d9190>] ? wake_atomic_t_function+0x60/0x60
--[ 186.678697] [<ffffffffc0c628e9>] brcmf_p2p_del_vif+0xf9/0x220 [brcmfmac]
--[ 186.678702] [<ffffffffc0c57fab>] brcmf_cfg80211_del_iface+0x21b/0x270 [brcmfmac]
--[ 186.678716] [<ffffffffc0b0539e>] nl80211_del_interface+0xfe/0x3a0 [cfg80211]
--[ 186.678718] [<ffffffff987ca335>] genl_family_rcv_msg+0x1b5/0x370
--[ 186.678720] [<ffffffff980e5d8d>] ? trace_hardirqs_on+0xd/0x10
--[ 186.678721] [<ffffffff987ca56d>] genl_rcv_msg+0x7d/0xb0
--[ 186.678722] [<ffffffff987ca4f0>] ? genl_family_rcv_msg+0x370/0x370
--[ 186.678724] [<ffffffff987c9a47>] netlink_rcv_skb+0x97/0xb0
--[ 186.678726] [<ffffffff987ca168>] genl_rcv+0x28/0x40
--[ 186.678727] [<ffffffff987c93c3>] netlink_unicast+0x1d3/0x2f0
--[ 186.678729] [<ffffffff987c933b>] ? netlink_unicast+0x14b/0x2f0
--[ 186.678731] [<ffffffff987c97cb>] netlink_sendmsg+0x2eb/0x3a0
--[ 186.678733] [<ffffffff9876dad8>] sock_sendmsg+0x38/0x50
--[ 186.678734] [<ffffffff9876e4df>] ___sys_sendmsg+0x27f/0x290
--[ 186.678737] [<ffffffff9828b935>] ? mntput_no_expire+0x5/0x3f0
--[ 186.678739] [<ffffffff9828b9be>] ? mntput_no_expire+0x8e/0x3f0
--[ 186.678741] [<ffffffff9828b935>] ? mntput_no_expire+0x5/0x3f0
--[ 186.678743] [<ffffffff9828bd44>] ? mntput+0x24/0x40
--[ 186.678744] [<ffffffff98267830>] ? __fput+0x190/0x200
--[ 186.678746] [<ffffffff9876f125>] __sys_sendmsg+0x45/0x80
--[ 186.678748] [<ffffffff9876f172>] SyS_sendmsg+0x12/0x20
--[ 186.678749] [<ffffffff988b5680>] entry_SYSCALL_64_fastpath+0x23/0xc1
--[ 186.678751] [<ffffffff980e2b8f>] ? trace_hardirqs_off_caller+0x1f/0xc0
--[ 186.678752] ---[ end trace e224d66c5d8408b5 ]---
--
--Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
--Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
-- .../broadcom/brcm80211/brcmfmac/cfg80211.c | 26 +++++++++++-----------
-- .../broadcom/brcm80211/brcmfmac/cfg80211.h | 2 +-
-- 2 files changed, 14 insertions(+), 14 deletions(-)
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--@@ -5555,7 +5555,7 @@ static s32 brcmf_notify_vif_event(struct
-- ifevent->action, ifevent->flags, ifevent->ifidx,
-- ifevent->bsscfgidx);
--
--- mutex_lock(&event->vif_event_lock);
--+ spin_lock(&event->vif_event_lock);
-- event->action = ifevent->action;
-- vif = event->vif;
--
--@@ -5563,7 +5563,7 @@ static s32 brcmf_notify_vif_event(struct
-- case BRCMF_E_IF_ADD:
-- /* waiting process may have timed out */
-- if (!cfg->vif_event.vif) {
--- mutex_unlock(&event->vif_event_lock);
--+ spin_unlock(&event->vif_event_lock);
-- return -EBADF;
-- }
--
--@@ -5574,24 +5574,24 @@ static s32 brcmf_notify_vif_event(struct
-- ifp->ndev->ieee80211_ptr = &vif->wdev;
-- SET_NETDEV_DEV(ifp->ndev, wiphy_dev(cfg->wiphy));
-- }
--- mutex_unlock(&event->vif_event_lock);
--+ spin_unlock(&event->vif_event_lock);
-- wake_up(&event->vif_wq);
-- return 0;
--
-- case BRCMF_E_IF_DEL:
--- mutex_unlock(&event->vif_event_lock);
--+ spin_unlock(&event->vif_event_lock);
-- /* event may not be upon user request */
-- if (brcmf_cfg80211_vif_event_armed(cfg))
-- wake_up(&event->vif_wq);
-- return 0;
--
-- case BRCMF_E_IF_CHANGE:
--- mutex_unlock(&event->vif_event_lock);
--+ spin_unlock(&event->vif_event_lock);
-- wake_up(&event->vif_wq);
-- return 0;
--
-- default:
--- mutex_unlock(&event->vif_event_lock);
--+ spin_unlock(&event->vif_event_lock);
-- break;
-- }
-- return -EINVAL;
--@@ -5712,7 +5712,7 @@ static void wl_deinit_priv(struct brcmf_
-- static void init_vif_event(struct brcmf_cfg80211_vif_event *event)
-- {
-- init_waitqueue_head(&event->vif_wq);
--- mutex_init(&event->vif_event_lock);
--+ spin_lock_init(&event->vif_event_lock);
-- }
--
-- static s32 brcmf_dongle_roam(struct brcmf_if *ifp)
--@@ -6607,9 +6607,9 @@ static inline bool vif_event_equals(stru
-- {
-- u8 evt_action;
--
--- mutex_lock(&event->vif_event_lock);
--+ spin_lock(&event->vif_event_lock);
-- evt_action = event->action;
--- mutex_unlock(&event->vif_event_lock);
--+ spin_unlock(&event->vif_event_lock);
-- return evt_action == action;
-- }
--
--@@ -6618,10 +6618,10 @@ void brcmf_cfg80211_arm_vif_event(struct
-- {
-- struct brcmf_cfg80211_vif_event *event = &cfg->vif_event;
--
--- mutex_lock(&event->vif_event_lock);
--+ spin_lock(&event->vif_event_lock);
-- event->vif = vif;
-- event->action = 0;
--- mutex_unlock(&event->vif_event_lock);
--+ spin_unlock(&event->vif_event_lock);
-- }
--
-- bool brcmf_cfg80211_vif_event_armed(struct brcmf_cfg80211_info *cfg)
--@@ -6629,9 +6629,9 @@ bool brcmf_cfg80211_vif_event_armed(stru
-- struct brcmf_cfg80211_vif_event *event = &cfg->vif_event;
-- bool armed;
--
--- mutex_lock(&event->vif_event_lock);
--+ spin_lock(&event->vif_event_lock);
-- armed = event->vif != NULL;
--- mutex_unlock(&event->vif_event_lock);
--+ spin_unlock(&event->vif_event_lock);
--
-- return armed;
-- }
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.h
--@@ -227,7 +227,7 @@ struct escan_info {
-- */
-- struct brcmf_cfg80211_vif_event {
-- wait_queue_head_t vif_wq;
--- struct mutex vif_event_lock;
--+ spinlock_t vif_event_lock;
-- u8 action;
-- struct brcmf_cfg80211_vif *vif;
-- };
-diff --git a/package/kernel/mac80211/patches/351-0033-brcmfmac-add-missing-header-dependencies.patch b/package/kernel/mac80211/patches/351-0033-brcmfmac-add-missing-header-dependencies.patch
-deleted file mode 100644
-index 1a7947b39a5eca626d2c79fecb627c52868f713b..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/351-0033-brcmfmac-add-missing-header-dependencies.patch
-+++ /dev/null
-@@ -1,29 +0,0 @@
--From 8af92af3f2d55db143417a5d401696f4b642009a Mon Sep 17 00:00:00 2001
--From: Baoyou Xie <baoyou.xie@linaro.org>
--Date: Mon, 29 Aug 2016 20:39:35 +0800
--Subject: [PATCH] brcmfmac: add missing header dependencies
--
--We get 1 warning when building kernel with W=1:
--
--drivers/net/wireless/broadcom/brcm80211/brcmfmac/tracepoint.c:23:6: warning: no previous prototype for '__brcmf_err' [-Wmissing-prototypes]
--
--In fact, this function is declared in brcmfmac/debug.h, so this patch
--adds missing header dependencies.
--
--Signed-off-by: Baoyou Xie <baoyou.xie@linaro.org>
--Acked-by: Arnd Bergmann <arnd@arndb.de>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
-- drivers/net/wireless/broadcom/brcm80211/brcmfmac/tracepoint.c | 1 +
-- 1 file changed, 1 insertion(+)
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/tracepoint.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/tracepoint.c
--@@ -19,6 +19,7 @@
-- #ifndef __CHECKER__
-- #define CREATE_TRACE_POINTS
-- #include "tracepoint.h"
--+#include "debug.h"
--
-- void __brcmf_err(const char *func, const char *fmt, ...)
-- {
-diff --git a/package/kernel/mac80211/patches/351-0034-brcmfmac-Add-USB-ID-for-Cisco-Linksys-AE1200.patch b/package/kernel/mac80211/patches/351-0034-brcmfmac-Add-USB-ID-for-Cisco-Linksys-AE1200.patch
-deleted file mode 100644
-index 24cd92a8bebfdffbb0e0d19b53a7c1cae4738ec1..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/351-0034-brcmfmac-Add-USB-ID-for-Cisco-Linksys-AE1200.patch
-+++ /dev/null
-@@ -1,51 +0,0 @@
--From bccf3ffc8c6d8e0251a15541bb4d12b423c4f729 Mon Sep 17 00:00:00 2001
--From: Ismael Luceno <ismael@iodev.co.uk>
--Date: Mon, 22 Aug 2016 19:40:07 -0300
--Subject: [PATCH] brcmfmac: Add USB ID for Cisco Linksys AE1200
--
--The AE1200 comes with different revisions of the BCM43235 chipset,
--but all have the same USB ID. Only revision 3 can be supported.
--
--Signed-off-by: Ismael Luceno <ismael@iodev.co.uk>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
-- drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 4 ++++
-- drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h | 2 ++
-- 2 files changed, 6 insertions(+)
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/usb.c
--@@ -1456,11 +1456,15 @@ static int brcmf_usb_reset_resume(struct
-- #define BRCMF_USB_DEVICE(dev_id) \
-- { USB_DEVICE(BRCM_USB_VENDOR_ID_BROADCOM, dev_id) }
--
--+#define LINKSYS_USB_DEVICE(dev_id) \
--+ { USB_DEVICE(BRCM_USB_VENDOR_ID_LINKSYS, dev_id) }
--+
-- static struct usb_device_id brcmf_usb_devid_table[] = {
-- BRCMF_USB_DEVICE(BRCM_USB_43143_DEVICE_ID),
-- BRCMF_USB_DEVICE(BRCM_USB_43236_DEVICE_ID),
-- BRCMF_USB_DEVICE(BRCM_USB_43242_DEVICE_ID),
-- BRCMF_USB_DEVICE(BRCM_USB_43569_DEVICE_ID),
--+ LINKSYS_USB_DEVICE(BRCM_USB_43235_LINKSYS_DEVICE_ID),
-- { USB_DEVICE(BRCM_USB_VENDOR_ID_LG, BRCM_USB_43242_LG_DEVICE_ID) },
-- /* special entry for device with firmware loaded and running */
-- BRCMF_USB_DEVICE(BRCM_USB_BCMFW_DEVICE_ID),
----- a/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h
--+++ b/drivers/net/wireless/broadcom/brcm80211/include/brcm_hw_ids.h
--@@ -22,6 +22,7 @@
--
-- #define BRCM_USB_VENDOR_ID_BROADCOM 0x0a5c
-- #define BRCM_USB_VENDOR_ID_LG 0x043e
--+#define BRCM_USB_VENDOR_ID_LINKSYS 0x13b1
-- #define BRCM_PCIE_VENDOR_ID_BROADCOM PCI_VENDOR_ID_BROADCOM
--
-- /* Chipcommon Core Chip IDs */
--@@ -56,6 +57,7 @@
--
-- /* USB Device IDs */
-- #define BRCM_USB_43143_DEVICE_ID 0xbd1e
--+#define BRCM_USB_43235_LINKSYS_DEVICE_ID 0x0039
-- #define BRCM_USB_43236_DEVICE_ID 0xbd17
-- #define BRCM_USB_43242_DEVICE_ID 0xbd1f
-- #define BRCM_USB_43242_LG_DEVICE_ID 0x3101
-diff --git a/package/kernel/mac80211/patches/351-0035-brcmfmac-fix-pmksa-bssid-usage.patch b/package/kernel/mac80211/patches/351-0035-brcmfmac-fix-pmksa-bssid-usage.patch
-deleted file mode 100644
-index b58a266a2542d44cb626ad4eef93dc56130d5900..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/351-0035-brcmfmac-fix-pmksa-bssid-usage.patch
-+++ /dev/null
-@@ -1,51 +0,0 @@
--From 7703773ef1d85b40433902a8da20167331597e4a Mon Sep 17 00:00:00 2001
--From: Nicolas Iooss <nicolas.iooss_linux@m4x.org>
--Date: Tue, 23 Aug 2016 11:37:17 +0200
--Subject: [PATCH] brcmfmac: fix pmksa->bssid usage
--
--The struct cfg80211_pmksa defines its bssid field as:
--
-- const u8 *bssid;
--
--contrary to struct brcmf_pmksa, which uses:
--
-- u8 bssid[ETH_ALEN];
--
--Therefore in brcmf_cfg80211_del_pmksa(), &pmksa->bssid takes the address
--of this field (of type u8**), not the one of its content (which would be
--u8*). Remove the & operator to make brcmf_dbg("%pM") and memcmp()
--behave as expected.
--
--This bug have been found using a custom static checker (which checks the
--usage of %p... attributes at build time). It has been introduced in
--commit 6c404f34f2bd ("brcmfmac: Cleanup pmksa cache handling code"),
--which replaced pmksa->bssid by &pmksa->bssid while refactoring the code,
--without modifying struct cfg80211_pmksa definition.
--
--Replace &pmk[i].bssid with pmk[i].bssid too to make the code clearer,
--this change does not affect the semantic.
--
--Fixes: 6c404f34f2bd ("brcmfmac: Cleanup pmksa cache handling code")
--Cc: stable@vger.kernel.org
--Signed-off-by: Nicolas Iooss <nicolas.iooss_linux@m4x.org>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
-- drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 4 ++--
-- 1 file changed, 2 insertions(+), 2 deletions(-)
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--@@ -3804,11 +3804,11 @@ brcmf_cfg80211_del_pmksa(struct wiphy *w
-- if (!check_vif_up(ifp->vif))
-- return -EIO;
--
--- brcmf_dbg(CONN, "del_pmksa - PMK bssid = %pM\n", &pmksa->bssid);
--+ brcmf_dbg(CONN, "del_pmksa - PMK bssid = %pM\n", pmksa->bssid);
--
-- npmk = le32_to_cpu(cfg->pmk_list.npmk);
-- for (i = 0; i < npmk; i++)
--- if (!memcmp(&pmksa->bssid, &pmk[i].bssid, ETH_ALEN))
--+ if (!memcmp(pmksa->bssid, pmk[i].bssid, ETH_ALEN))
-- break;
--
-- if ((npmk > 0) && (i < npmk)) {
-diff --git a/package/kernel/mac80211/patches/351-0036-brcmfmac-avoid-potential-stack-overflow-in-brcmf_cfg.patch b/package/kernel/mac80211/patches/351-0036-brcmfmac-avoid-potential-stack-overflow-in-brcmf_cfg.patch
-deleted file mode 100644
-index 760b6daf25ef57d3b777373b9695a909ec42b1d2..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/351-0036-brcmfmac-avoid-potential-stack-overflow-in-brcmf_cfg.patch
-+++ /dev/null
-@@ -1,34 +0,0 @@
--From ded89912156b1a47d940a0c954c43afbabd0c42c Mon Sep 17 00:00:00 2001
--From: Arend Van Spriel <arend.vanspriel@broadcom.com>
--Date: Mon, 5 Sep 2016 10:45:47 +0100
--Subject: [PATCH] brcmfmac: avoid potential stack overflow in
-- brcmf_cfg80211_start_ap()
--
--User-space can choose to omit NL80211_ATTR_SSID and only provide raw
--IE TLV data. When doing so it can provide SSID IE with length exceeding
--the allowed size. The driver further processes this IE copying it
--into a local variable without checking the length. Hence stack can be
--corrupted and used as exploit.
--
--Cc: stable@vger.kernel.org # v4.7
--Reported-by: Daxing Guo <freener.gdx@gmail.com>
--Reviewed-by: Hante Meuleman <hante.meuleman@broadcom.com>
--Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
--Reviewed-by: Franky Lin <franky.lin@broadcom.com>
--Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
-- drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 2 +-
-- 1 file changed, 1 insertion(+), 1 deletion(-)
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--@@ -4447,7 +4447,7 @@ brcmf_cfg80211_start_ap(struct wiphy *wi
-- (u8 *)&settings->beacon.head[ie_offset],
-- settings->beacon.head_len - ie_offset,
-- WLAN_EID_SSID);
--- if (!ssid_ie)
--+ if (!ssid_ie || ssid_ie->len > IEEE80211_MAX_SSID_LEN)
-- return -EINVAL;
--
-- memcpy(ssid_le.SSID, ssid_ie->data, ssid_ie->len);
-diff --git a/package/kernel/mac80211/patches/351-0037-brcmfmac-add-support-for-bcm4339-chip-with-modalias-.patch b/package/kernel/mac80211/patches/351-0037-brcmfmac-add-support-for-bcm4339-chip-with-modalias-.patch
-deleted file mode 100644
-index 1285b3096075e85a4c7c99592c73000244f75216..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/351-0037-brcmfmac-add-support-for-bcm4339-chip-with-modalias-.patch
-+++ /dev/null
-@@ -1,55 +0,0 @@
--From 634faf3686900ccdee87b77e2c56df8b2159912b Mon Sep 17 00:00:00 2001
--From: Arend Van Spriel <arend.vanspriel@broadcom.com>
--Date: Mon, 5 Sep 2016 11:42:12 +0100
--Subject: [PATCH] brcmfmac: add support for bcm4339 chip with modalias
-- sdio:c00v02D0d4339
--
--The driver already supports the bcm4339 chipset but only for the variant
--that shares the same modalias as the bcm4335, ie. sdio:c00v02D0d4335.
--It turns out that there are also bcm4339 devices out there that have a
--more distiguishable modalias sdio:c00v02D0d4339.
--
--Reported-by: Steve deRosier <derosier@gmail.com>
--Reviewed-by: Hante Meuleman <hante.meuleman@broadcom.com>
--Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
--Reviewed-by: Franky Lin <franky.lin@broadcom.com>
--Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
-- drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 1 +
-- drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 3 ++-
-- include/linux/mmc/sdio_ids.h | 1 +
-- 3 files changed, 4 insertions(+), 1 deletion(-)
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
--@@ -1097,6 +1097,7 @@ static const struct sdio_device_id brcmf
-- BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43341),
-- BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43362),
-- BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4335_4339),
--+ BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4339),
-- BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_43430),
-- BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4345),
-- BRCMF_SDIO_DEVICE(SDIO_DEVICE_ID_BROADCOM_4354),
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
--@@ -3756,7 +3756,8 @@ static u32 brcmf_sdio_buscore_read32(voi
-- u32 val, rev;
--
-- val = brcmf_sdiod_regrl(sdiodev, addr, NULL);
--- if (sdiodev->func[0]->device == SDIO_DEVICE_ID_BROADCOM_4335_4339 &&
--+ if ((sdiodev->func[0]->device == SDIO_DEVICE_ID_BROADCOM_4335_4339 ||
--+ sdiodev->func[0]->device == SDIO_DEVICE_ID_BROADCOM_4339) &&
-- addr == CORE_CC_REG(SI_ENUM_BASE, chipid)) {
-- rev = (val & CID_REV_MASK) >> CID_REV_SHIFT;
-- if (rev >= 2) {
----- a/include/linux/mmc/sdio_ids.h
--+++ b/include/linux/mmc/sdio_ids.h
--@@ -32,6 +32,7 @@
-- #define SDIO_DEVICE_ID_BROADCOM_43340 0xa94c
-- #define SDIO_DEVICE_ID_BROADCOM_43341 0xa94d
-- #define SDIO_DEVICE_ID_BROADCOM_4335_4339 0x4335
--+#define SDIO_DEVICE_ID_BROADCOM_4339 0x4339
-- #define SDIO_DEVICE_ID_BROADCOM_43362 0xa962
-- #define SDIO_DEVICE_ID_BROADCOM_43430 0xa9a6
-- #define SDIO_DEVICE_ID_BROADCOM_4345 0x4345
-diff --git a/package/kernel/mac80211/patches/351-0038-brcmfmac-sdio-shorten-retry-loop-in-brcmf_sdio_kso_c.patch b/package/kernel/mac80211/patches/351-0038-brcmfmac-sdio-shorten-retry-loop-in-brcmf_sdio_kso_c.patch
-deleted file mode 100644
-index 1d5667ee6ed705db4dab6175207a9b0284167181..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/351-0038-brcmfmac-sdio-shorten-retry-loop-in-brcmf_sdio_kso_c.patch
-+++ /dev/null
-@@ -1,56 +0,0 @@
--From 5251b6be8bb5c5675bdf12347c7b83937a5c91e5 Mon Sep 17 00:00:00 2001
--From: Arend Van Spriel <arend.vanspriel@broadcom.com>
--Date: Mon, 5 Sep 2016 11:42:13 +0100
--Subject: [PATCH] brcmfmac: sdio: shorten retry loop in
-- brcmf_sdio_kso_control()
--
--In brcmf_sdio_kso_control() there is a retry loop as hardware may take
--time to settle. However, when the call to brcmf_sdiod_regrb() returns
--an error it is due to SDIO access failure and it makes no sense to wait
--for hardware to settle. This patch aborts the loop after a number of
--subsequent access errors.
--
--Reviewed-by: Hante Meuleman <hante.meuleman@broadcom.com>
--Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
--Reviewed-by: Franky Lin <franky.lin@broadcom.com>
--Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
-- drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c | 11 +++++++++--
-- 1 file changed, 9 insertions(+), 2 deletions(-)
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
--@@ -313,6 +313,7 @@ struct rte_console {
--
-- #define KSO_WAIT_US 50
-- #define MAX_KSO_ATTEMPTS (PMU_MAX_TRANSITION_DLY/KSO_WAIT_US)
--+#define BRCMF_SDIO_MAX_ACCESS_ERRORS 5
--
-- /*
-- * Conversion of 802.1D priority to precedence level
--@@ -675,6 +676,7 @@ brcmf_sdio_kso_control(struct brcmf_sdio
-- {
-- u8 wr_val = 0, rd_val, cmp_val, bmask;
-- int err = 0;
--+ int err_cnt = 0;
-- int try_cnt = 0;
--
-- brcmf_dbg(TRACE, "Enter: on=%d\n", on);
--@@ -710,9 +712,14 @@ brcmf_sdio_kso_control(struct brcmf_sdio
-- */
-- rd_val = brcmf_sdiod_regrb(bus->sdiodev, SBSDIO_FUNC1_SLEEPCSR,
-- &err);
--- if (((rd_val & bmask) == cmp_val) && !err)
--+ if (!err) {
--+ if ((rd_val & bmask) == cmp_val)
--+ break;
--+ err_cnt = 0;
--+ }
--+ /* bail out upon subsequent access errors */
--+ if (err && (err_cnt++ > BRCMF_SDIO_MAX_ACCESS_ERRORS))
-- break;
---
-- udelay(KSO_WAIT_US);
-- brcmf_sdiod_regwb(bus->sdiodev, SBSDIO_FUNC1_SLEEPCSR,
-- wr_val, &err);
-diff --git a/package/kernel/mac80211/patches/351-0039-brcmfmac-ignore-11d-configuration-errors.patch b/package/kernel/mac80211/patches/351-0039-brcmfmac-ignore-11d-configuration-errors.patch
-deleted file mode 100644
-index 1620e0022bbe0093c658948ca0b1c70677f61984..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/351-0039-brcmfmac-ignore-11d-configuration-errors.patch
-+++ /dev/null
-@@ -1,84 +0,0 @@
--From b3589dfe02123a0d0ea82076a9f8ef84a46852c0 Mon Sep 17 00:00:00 2001
--From: Hante Meuleman <hante.meuleman@broadcom.com>
--Date: Mon, 19 Sep 2016 12:09:51 +0100
--Subject: [PATCH] brcmfmac: ignore 11d configuration errors
--
--802.11d is not always supported by firmware anymore. Currently the
--AP configuration of 11d will cause an abort if the ioctl set is
--failing. This behavior is not correct and the error should be
--ignored.
--
--Reviewed-by: Arend Van Spriel <arend.vanspriel@broadcom.com>
--Reviewed-by: Franky Lin <franky.lin@broadcom.com>
--Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
--Signed-off-by: Hante Meuleman <hante.meuleman@broadcom.com>
--Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
-- .../broadcom/brcm80211/brcmfmac/cfg80211.c | 27 ++++++++++++----------
-- 1 file changed, 15 insertions(+), 12 deletions(-)
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--@@ -4422,6 +4422,7 @@ brcmf_cfg80211_start_ap(struct wiphy *wi
-- u16 chanspec = chandef_to_chanspec(&cfg->d11inf, &settings->chandef);
-- bool mbss;
-- int is_11d;
--+ bool supports_11d;
--
-- brcmf_dbg(TRACE, "ctrlchn=%d, center=%d, bw=%d, beacon_interval=%d, dtim_period=%d,\n",
-- settings->chandef.chan->hw_value,
--@@ -4434,11 +4435,16 @@ brcmf_cfg80211_start_ap(struct wiphy *wi
-- mbss = ifp->vif->mbss;
--
-- /* store current 11d setting */
--- brcmf_fil_cmd_int_get(ifp, BRCMF_C_GET_REGULATORY, &ifp->vif->is_11d);
--- country_ie = brcmf_parse_tlvs((u8 *)settings->beacon.tail,
--- settings->beacon.tail_len,
--- WLAN_EID_COUNTRY);
--- is_11d = country_ie ? 1 : 0;
--+ if (brcmf_fil_cmd_int_get(ifp, BRCMF_C_GET_REGULATORY,
--+ &ifp->vif->is_11d)) {
--+ supports_11d = false;
--+ } else {
--+ country_ie = brcmf_parse_tlvs((u8 *)settings->beacon.tail,
--+ settings->beacon.tail_len,
--+ WLAN_EID_COUNTRY);
--+ is_11d = country_ie ? 1 : 0;
--+ supports_11d = true;
--+ }
--
-- memset(&ssid_le, 0, sizeof(ssid_le));
-- if (settings->ssid == NULL || settings->ssid_len == 0) {
--@@ -4497,7 +4503,7 @@ brcmf_cfg80211_start_ap(struct wiphy *wi
--
-- /* Parameters shared by all radio interfaces */
-- if (!mbss) {
--- if (is_11d != ifp->vif->is_11d) {
--+ if ((supports_11d) && (is_11d != ifp->vif->is_11d)) {
-- err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_REGULATORY,
-- is_11d);
-- if (err < 0) {
--@@ -4539,7 +4545,7 @@ brcmf_cfg80211_start_ap(struct wiphy *wi
-- brcmf_err("SET INFRA error %d\n", err);
-- goto exit;
-- }
--- } else if (WARN_ON(is_11d != ifp->vif->is_11d)) {
--+ } else if (WARN_ON(supports_11d && (is_11d != ifp->vif->is_11d))) {
-- /* Multiple-BSS should use same 11d configuration */
-- err = -EINVAL;
-- goto exit;
--@@ -4673,11 +4679,8 @@ static int brcmf_cfg80211_stop_ap(struct
-- brcmf_err("setting INFRA mode failed %d\n", err);
-- if (brcmf_feat_is_enabled(ifp, BRCMF_FEAT_MBSS))
-- brcmf_fil_iovar_int_set(ifp, "mbss", 0);
--- err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_REGULATORY,
--- ifp->vif->is_11d);
--- if (err < 0)
--- brcmf_err("restoring REGULATORY setting failed %d\n",
--- err);
--+ brcmf_fil_cmd_int_set(ifp, BRCMF_C_SET_REGULATORY,
--+ ifp->vif->is_11d);
-- /* Bring device back up so it can be used again */
-- err = brcmf_fil_cmd_int_set(ifp, BRCMF_C_UP, 1);
-- if (err < 0)
-diff --git a/package/kernel/mac80211/patches/351-0040-brcmfmac-rework-pointer-trickery-in-brcmf_proto_bcdc.patch b/package/kernel/mac80211/patches/351-0040-brcmfmac-rework-pointer-trickery-in-brcmf_proto_bcdc.patch
-deleted file mode 100644
-index 9461164523fcc05daa4873274eb7378777612338..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/351-0040-brcmfmac-rework-pointer-trickery-in-brcmf_proto_bcdc.patch
-+++ /dev/null
-@@ -1,32 +0,0 @@
--From 704d1c6b56f4ee2ad6a5f012a72a278d17c1a223 Mon Sep 17 00:00:00 2001
--From: Arend Van Spriel <arend.vanspriel@broadcom.com>
--Date: Mon, 19 Sep 2016 12:09:52 +0100
--Subject: [PATCH] brcmfmac: rework pointer trickery in
-- brcmf_proto_bcdc_query_dcmd()
--
--The variable info is assigned to point to bcdc->msg[1], which is the
--same as pointing to bcdc->buf. As that is what we want to access
--make it clear by fixing the assignment. This also avoid out-of-bounds
--errors from static analyzers are bcdc->msg[1] is not in the structure
--definition.
--
--Reviewed-by: Hante Meuleman <hante.meuleman@broadcom.com>
--Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
--Reviewed-by: Franky Lin <franky.lin@broadcom.com>
--Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
-- drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c | 2 +-
-- 1 file changed, 1 insertion(+), 1 deletion(-)
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcdc.c
--@@ -194,7 +194,7 @@ retry:
-- }
--
-- /* Check info buffer */
--- info = (void *)&msg[1];
--+ info = (void *)&bcdc->buf[0];
--
-- /* Copy info buffer */
-- if (buf) {
-diff --git a/package/kernel/mac80211/patches/351-0041-brcmfmac-fix-memory-leak-in-brcmf_flowring_add_tdls_.patch b/package/kernel/mac80211/patches/351-0041-brcmfmac-fix-memory-leak-in-brcmf_flowring_add_tdls_.patch
-deleted file mode 100644
-index 2ececdf1972d3e2769f4730bb846866d247d681f..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/351-0041-brcmfmac-fix-memory-leak-in-brcmf_flowring_add_tdls_.patch
-+++ /dev/null
-@@ -1,39 +0,0 @@
--From bc981641360183990de59da17f9f560f9150b801 Mon Sep 17 00:00:00 2001
--From: Arend Van Spriel <arend.vanspriel@broadcom.com>
--Date: Mon, 19 Sep 2016 12:09:53 +0100
--Subject: [PATCH] brcmfmac: fix memory leak in brcmf_flowring_add_tdls_peer()
--
--In the error paths in brcmf_flowring_add_tdls_peer() the allocated
--resource should be freed.
--
--Reviewed-by: Hante Meuleman <hante.meuleman@broadcom.com>
--Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
--Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
-- drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.c | 8 ++++++--
-- 1 file changed, 6 insertions(+), 2 deletions(-)
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.c
--@@ -495,14 +495,18 @@ void brcmf_flowring_add_tdls_peer(struct
-- } else {
-- search = flow->tdls_entry;
-- if (memcmp(search->mac, peer, ETH_ALEN) == 0)
--- return;
--+ goto free_entry;
-- while (search->next) {
-- search = search->next;
-- if (memcmp(search->mac, peer, ETH_ALEN) == 0)
--- return;
--+ goto free_entry;
-- }
-- search->next = tdls_entry;
-- }
--
-- flow->tdls_active = true;
--+ return;
--+
--+free_entry:
--+ kfree(tdls_entry);
-- }
-diff --git a/package/kernel/mac80211/patches/351-0042-brcmfmac-initialize-variable-in-brcmf_sdiod_regrl.patch b/package/kernel/mac80211/patches/351-0042-brcmfmac-initialize-variable-in-brcmf_sdiod_regrl.patch
-deleted file mode 100644
-index 529cc8df02771a6680f59382278f3d273f512457..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/351-0042-brcmfmac-initialize-variable-in-brcmf_sdiod_regrl.patch
-+++ /dev/null
-@@ -1,28 +0,0 @@
--From 26305d3d7298d1ddf8fd4ce95a382aa90534f0a3 Mon Sep 17 00:00:00 2001
--From: Arend Van Spriel <arend.vanspriel@broadcom.com>
--Date: Mon, 19 Sep 2016 12:09:54 +0100
--Subject: [PATCH] brcmfmac: initialize variable in brcmf_sdiod_regrl()
--
--In case of an error the variable returned is uninitialized. The caller
--will probably check the error code before using it, but better assure
--it is set to zero.
--
--Reviewed-by: Hante Meuleman <hante.meuleman@broadcom.com>
--Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
--Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
-- drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 2 +-
-- 1 file changed, 1 insertion(+), 1 deletion(-)
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c
--@@ -416,7 +416,7 @@ u8 brcmf_sdiod_regrb(struct brcmf_sdio_d
--
-- u32 brcmf_sdiod_regrl(struct brcmf_sdio_dev *sdiodev, u32 addr, int *ret)
-- {
--- u32 data;
--+ u32 data = 0;
-- int retval;
--
-- brcmf_dbg(SDIO, "addr:0x%08x\n", addr);
-diff --git a/package/kernel/mac80211/patches/351-0043-brcmfmac-remove-worker-from-.ndo_set_mac_address-cal.patch b/package/kernel/mac80211/patches/351-0043-brcmfmac-remove-worker-from-.ndo_set_mac_address-cal.patch
-deleted file mode 100644
-index 67af30e4fd0684d57453e43b2751ac7e853066b5..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/351-0043-brcmfmac-remove-worker-from-.ndo_set_mac_address-cal.patch
-+++ /dev/null
-@@ -1,107 +0,0 @@
--From 8fa5fdec09cd379c9ecb8972f344f8f308e0ccf3 Mon Sep 17 00:00:00 2001
--From: Arend Van Spriel <arend.vanspriel@broadcom.com>
--Date: Mon, 19 Sep 2016 12:09:55 +0100
--Subject: [PATCH] brcmfmac: remove worker from .ndo_set_mac_address() callback
--
--As it turns out there is no need to use a worker for the callback
--because it is not called from atomic context.
--
--Reported-by: Dan Williams <dcbw@redhat.com>
--Reviewed-by: Hante Meuleman <hante.meuleman@broadcom.com>
--Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
--Reviewed-by: Franky Lin <franky.lin@broadcom.com>
--Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
-- .../wireless/broadcom/brcm80211/brcmfmac/core.c | 39 ++++++++--------------
-- .../wireless/broadcom/brcm80211/brcmfmac/core.h | 2 --
-- 2 files changed, 13 insertions(+), 28 deletions(-)
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
--@@ -136,27 +136,6 @@ static void _brcmf_set_multicast_list(st
-- err);
-- }
--
---static void
---_brcmf_set_mac_address(struct work_struct *work)
---{
--- struct brcmf_if *ifp;
--- s32 err;
---
--- ifp = container_of(work, struct brcmf_if, setmacaddr_work);
---
--- brcmf_dbg(TRACE, "Enter, bsscfgidx=%d\n", ifp->bsscfgidx);
---
--- err = brcmf_fil_iovar_data_set(ifp, "cur_etheraddr", ifp->mac_addr,
--- ETH_ALEN);
--- if (err < 0) {
--- brcmf_err("Setting cur_etheraddr failed, %d\n", err);
--- } else {
--- brcmf_dbg(TRACE, "MAC address updated to %pM\n",
--- ifp->mac_addr);
--- memcpy(ifp->ndev->dev_addr, ifp->mac_addr, ETH_ALEN);
--- }
---}
---
-- #if IS_ENABLED(CONFIG_IPV6)
-- static void _brcmf_update_ndtable(struct work_struct *work)
-- {
--@@ -190,10 +169,20 @@ static int brcmf_netdev_set_mac_address(
-- {
-- struct brcmf_if *ifp = netdev_priv(ndev);
-- struct sockaddr *sa = (struct sockaddr *)addr;
--+ int err;
--
--- memcpy(&ifp->mac_addr, sa->sa_data, ETH_ALEN);
--- schedule_work(&ifp->setmacaddr_work);
--- return 0;
--+ brcmf_dbg(TRACE, "Enter, bsscfgidx=%d\n", ifp->bsscfgidx);
--+
--+ err = brcmf_fil_iovar_data_set(ifp, "cur_etheraddr", sa->sa_data,
--+ ETH_ALEN);
--+ if (err < 0) {
--+ brcmf_err("Setting cur_etheraddr failed, %d\n", err);
--+ } else {
--+ brcmf_dbg(TRACE, "updated to %pM\n", sa->sa_data);
--+ memcpy(ifp->mac_addr, sa->sa_data, ETH_ALEN);
--+ memcpy(ifp->ndev->dev_addr, ifp->mac_addr, ETH_ALEN);
--+ }
--+ return err;
-- }
--
-- static void brcmf_netdev_set_multicast_list(struct net_device *ndev)
--@@ -525,7 +514,6 @@ int brcmf_net_attach(struct brcmf_if *if
-- /* set the mac address */
-- memcpy(ndev->dev_addr, ifp->mac_addr, ETH_ALEN);
--
--- INIT_WORK(&ifp->setmacaddr_work, _brcmf_set_mac_address);
-- INIT_WORK(&ifp->multicast_work, _brcmf_set_multicast_list);
-- INIT_WORK(&ifp->ndoffload_work, _brcmf_update_ndtable);
--
--@@ -730,7 +718,6 @@ static void brcmf_del_if(struct brcmf_pu
-- }
--
-- if (ifp->ndev->netdev_ops == &brcmf_netdev_ops_pri) {
--- cancel_work_sync(&ifp->setmacaddr_work);
-- cancel_work_sync(&ifp->multicast_work);
-- cancel_work_sync(&ifp->ndoffload_work);
-- }
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h
--@@ -176,7 +176,6 @@ enum brcmf_netif_stop_reason {
-- * @vif: points to cfg80211 specific interface information.
-- * @ndev: associated network device.
-- * @stats: interface specific network statistics.
--- * @setmacaddr_work: worker object for setting mac address.
-- * @multicast_work: worker object for multicast provisioning.
-- * @ndoffload_work: worker object for neighbor discovery offload configuration.
-- * @fws_desc: interface specific firmware-signalling descriptor.
--@@ -193,7 +192,6 @@ struct brcmf_if {
-- struct brcmf_cfg80211_vif *vif;
-- struct net_device *ndev;
-- struct net_device_stats stats;
--- struct work_struct setmacaddr_work;
-- struct work_struct multicast_work;
-- struct work_struct ndoffload_work;
-- struct brcmf_fws_mac_descriptor *fws_desc;
-diff --git a/package/kernel/mac80211/patches/351-0044-brcmfmac-remove-unnecessary-null-pointer-check.patch b/package/kernel/mac80211/patches/351-0044-brcmfmac-remove-unnecessary-null-pointer-check.patch
-deleted file mode 100644
-index 5a0847932964cbbfec126aacc82cada1624d63f7..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/351-0044-brcmfmac-remove-unnecessary-null-pointer-check.patch
-+++ /dev/null
-@@ -1,31 +0,0 @@
--From 835680b82f029818c813324aed3073cdcf63241f Mon Sep 17 00:00:00 2001
--From: Hante Meuleman <hante.meuleman@broadcom.com>
--Date: Mon, 19 Sep 2016 12:09:56 +0100
--Subject: [PATCH] brcmfmac: remove unnecessary null pointer check
--
--in the function brcmf_bus_start() in the exception handling a
--check is made to dermine whether ifp is null, though this is not
--possible. Removing the unnessary check.
--
--Reviewed-by: Arend Van Spriel <arend.vanspriel@broadcom.com>
--Reviewed-by: Franky Lin <franky.lin@broadcom.com>
--Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
--Signed-off-by: Hante Meuleman <hante.meuleman@broadcom.com>
--Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
-- drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c | 3 +--
-- 1 file changed, 1 insertion(+), 2 deletions(-)
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
--@@ -1048,8 +1048,7 @@ fail:
-- brcmf_fws_del_interface(ifp);
-- brcmf_fws_deinit(drvr);
-- }
--- if (ifp)
--- brcmf_net_detach(ifp->ndev, false);
--+ brcmf_net_detach(ifp->ndev, false);
-- if (p2p_ifp)
-- brcmf_net_detach(p2p_ifp->ndev, false);
-- drvr->iflist[0] = NULL;
-diff --git a/package/kernel/mac80211/patches/351-0045-brcmfmac-fix-clearing-entry-IPv6-address.patch b/package/kernel/mac80211/patches/351-0045-brcmfmac-fix-clearing-entry-IPv6-address.patch
-deleted file mode 100644
-index 0b3a23edc0839974750b3af21298b3fa20d7fc1b..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/351-0045-brcmfmac-fix-clearing-entry-IPv6-address.patch
-+++ /dev/null
-@@ -1,37 +0,0 @@
--From 2b7425f3629b38c438f890c20c5faeca64b144ff Mon Sep 17 00:00:00 2001
--From: Hante Meuleman <hante.meuleman@broadcom.com>
--Date: Mon, 19 Sep 2016 12:09:57 +0100
--Subject: [PATCH] brcmfmac: fix clearing entry IPv6 address
--
--When IPv6 address is to be cleared there is a possible out of
--bound access. But also the clearing of the last entry and the
--adjustment of total number of stored IPv6 addresses is not
--updated. This patch fixes that bug. Bug was found using coverity.
--
--Reviewed-by: Arend Van Spriel <arend.vanspriel@broadcom.com>
--Reviewed-by: Franky Lin <franky.lin@broadcom.com>
--Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
--Signed-off-by: Hante Meuleman <hante.meuleman@broadcom.com>
--Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
-- drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c | 7 +++++--
-- 1 file changed, 5 insertions(+), 2 deletions(-)
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
--@@ -873,9 +873,12 @@ static int brcmf_inet6addr_changed(struc
-- }
-- break;
-- case NETDEV_DOWN:
--- if (i < NDOL_MAX_ENTRIES)
--- for (; i < ifp->ipv6addr_idx; i++)
--+ if (i < NDOL_MAX_ENTRIES) {
--+ for (; i < ifp->ipv6addr_idx - 1; i++)
-- table[i] = table[i + 1];
--+ memset(&table[i], 0, sizeof(table[i]));
--+ ifp->ipv6addr_idx--;
--+ }
-- break;
-- default:
-- break;
-diff --git a/package/kernel/mac80211/patches/351-0046-brcmfmac-fix-out-of-bound-access-on-clearing-wowl-wa.patch b/package/kernel/mac80211/patches/351-0046-brcmfmac-fix-out-of-bound-access-on-clearing-wowl-wa.patch
-deleted file mode 100644
-index a47cb3266fe936dc8d1b30fae76cb54c8811e3e4..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/351-0046-brcmfmac-fix-out-of-bound-access-on-clearing-wowl-wa.patch
-+++ /dev/null
-@@ -1,44 +0,0 @@
--From a7ed7828ecda0c2b5e0d7f55dedd4230afd4b583 Mon Sep 17 00:00:00 2001
--From: Hante Meuleman <hante.meuleman@broadcom.com>
--Date: Mon, 19 Sep 2016 12:09:58 +0100
--Subject: [PATCH] brcmfmac: fix out of bound access on clearing wowl wake
-- indicator
--
--Clearing the wowl wakeindicator happens with a rather odd
--construction where the string "clear" is used to set the iovar
--wowl_wakeind. This was implemented incorrectly as it caused an
--out of bound access. Use an intermediate variable of correct
--length and copy string in that. Problem was found using coverity.
--
--Reviewed-by: Arend Van Spriel <arend.vanspriel@broadcom.com>
--Reviewed-by: Franky Lin <franky.lin@broadcom.com>
--Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
--Signed-off-by: Hante Meuleman <hante.meuleman@broadcom.com>
--Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
-- drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 6 ++++--
-- 1 file changed, 4 insertions(+), 2 deletions(-)
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--@@ -3623,6 +3623,7 @@ static void brcmf_configure_wowl(struct
-- struct cfg80211_wowlan *wowl)
-- {
-- u32 wowl_config;
--+ struct brcmf_wowl_wakeind_le wowl_wakeind;
-- u32 i;
--
-- brcmf_dbg(TRACE, "Suspend, wowl config.\n");
--@@ -3664,8 +3665,9 @@ static void brcmf_configure_wowl(struct
-- if (!test_bit(BRCMF_VIF_STATUS_CONNECTED, &ifp->vif->sme_state))
-- wowl_config |= BRCMF_WOWL_UNASSOC;
--
--- brcmf_fil_iovar_data_set(ifp, "wowl_wakeind", "clear",
--- sizeof(struct brcmf_wowl_wakeind_le));
--+ memcpy(&wowl_wakeind, "clear", 6);
--+ brcmf_fil_iovar_data_set(ifp, "wowl_wakeind", &wowl_wakeind,
--+ sizeof(wowl_wakeind));
-- brcmf_fil_iovar_int_set(ifp, "wowl", wowl_config);
-- brcmf_fil_iovar_int_set(ifp, "wowl_activate", 1);
-- brcmf_bus_wowl_config(cfg->pub->bus_if, true);
-diff --git a/package/kernel/mac80211/patches/351-0047-brcmfmac-simplify-mapping-of-auth-type.patch b/package/kernel/mac80211/patches/351-0047-brcmfmac-simplify-mapping-of-auth-type.patch
-deleted file mode 100644
-index a652ae60b850540fb4f8996d912b0e8b6af06a9a..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/351-0047-brcmfmac-simplify-mapping-of-auth-type.patch
-+++ /dev/null
-@@ -1,39 +0,0 @@
--From 92c313604711a0976def79dabb9e8da3cc2cc780 Mon Sep 17 00:00:00 2001
--From: Hante Meuleman <hante.meuleman@broadcom.com>
--Date: Mon, 19 Sep 2016 12:09:59 +0100
--Subject: [PATCH] brcmfmac: simplify mapping of auth type
--
--The 802.11 standard only has four valid auth type configurations of which
--our firmware only supports two, ie. Open System and Shared Key. Simplify
--the mapping falling back to automatic for other types specified by
--user-space.
--
--Reviewed-by: Arend Van Spriel <arend.vanspriel@broadcom.com>
--Reviewed-by: Franky Lin <franky.lin@broadcom.com>
--Reviewed-by: Pieter-Paul Giesberts <pieter-paul.giesberts@broadcom.com>
--Signed-off-by: Hante Meuleman <hante.meuleman@broadcom.com>
--Signed-off-by: Arend van Spriel <arend.vanspriel@broadcom.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
-- drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 8 +-------
-- 1 file changed, 1 insertion(+), 7 deletions(-)
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--@@ -1577,15 +1577,9 @@ static s32 brcmf_set_auth_type(struct ne
-- val = 1;
-- brcmf_dbg(CONN, "shared key\n");
-- break;
--- case NL80211_AUTHTYPE_AUTOMATIC:
--- val = 2;
--- brcmf_dbg(CONN, "automatic\n");
--- break;
--- case NL80211_AUTHTYPE_NETWORK_EAP:
--- brcmf_dbg(CONN, "network eap\n");
-- default:
-- val = 2;
--- brcmf_err("invalid auth type (%d)\n", sme->auth_type);
--+ brcmf_dbg(CONN, "automatic, auth type (%d)\n", sme->auth_type);
-- break;
-- }
--
-diff --git a/package/kernel/mac80211/patches/351-0048-brcmfmac-fix-memory-leak-in-brcmf_fill_bss_param.patch b/package/kernel/mac80211/patches/351-0048-brcmfmac-fix-memory-leak-in-brcmf_fill_bss_param.patch
-deleted file mode 100644
-index a6fae378038dff7b672b82a21c0ed59f663473df..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/351-0048-brcmfmac-fix-memory-leak-in-brcmf_fill_bss_param.patch
-+++ /dev/null
-@@ -1,41 +0,0 @@
--From 23e9c128adb2038c27a424a5f91136e7fa3e0dc6 Mon Sep 17 00:00:00 2001
--From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
--Date: Wed, 21 Sep 2016 08:23:24 +0200
--Subject: [PATCH] brcmfmac: fix memory leak in brcmf_fill_bss_param
--MIME-Version: 1.0
--Content-Type: text/plain; charset=UTF-8
--Content-Transfer-Encoding: 8bit
--
--This function is called from get_station callback which means that every
--time user space was getting/dumping station(s) we were leaking 2 KiB.
--
--Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
--Fixes: 1f0dc59a6de ("brcmfmac: rework .get_station() callback")
--Cc: stable@vger.kernel.org # 4.2+
--Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
-- drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 5 ++++-
-- 1 file changed, 4 insertions(+), 1 deletion(-)
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--@@ -2463,7 +2463,7 @@ static void brcmf_fill_bss_param(struct
-- WL_BSS_INFO_MAX);
-- if (err) {
-- brcmf_err("Failed to get bss info (%d)\n", err);
--- return;
--+ goto out_kfree;
-- }
-- si->filled |= BIT(NL80211_STA_INFO_BSS_PARAM);
-- si->bss_param.beacon_interval = le16_to_cpu(buf->bss_le.beacon_period);
--@@ -2475,6 +2475,9 @@ static void brcmf_fill_bss_param(struct
-- si->bss_param.flags |= BSS_PARAM_FLAGS_SHORT_PREAMBLE;
-- if (capability & WLAN_CAPABILITY_SHORT_SLOT_TIME)
-- si->bss_param.flags |= BSS_PARAM_FLAGS_SHORT_SLOT_TIME;
--+
--+out_kfree:
--+ kfree(buf);
-- }
--
-- static s32
-diff --git a/package/kernel/mac80211/patches/351-0049-brcmfmac-drop-unused-fields-from-struct-brcmf_pub.patch b/package/kernel/mac80211/patches/351-0049-brcmfmac-drop-unused-fields-from-struct-brcmf_pub.patch
-deleted file mode 100644
-index 47af73ad29115ab80fe22cde35c127b86db8b8f5..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/351-0049-brcmfmac-drop-unused-fields-from-struct-brcmf_pub.patch
-+++ /dev/null
-@@ -1,60 +0,0 @@
--From 2df86ad959c9d1cdbeb2f23a0801857731156692 Mon Sep 17 00:00:00 2001
--From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
--Date: Fri, 23 Sep 2016 15:27:46 +0200
--Subject: [PATCH] brcmfmac: drop unused fields from struct brcmf_pub
--MIME-Version: 1.0
--Content-Type: text/plain; charset=UTF-8
--Content-Transfer-Encoding: 8bit
--
--They seem to be there from the first day. We calculate these values but
--never use them.
--
--Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
-- drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c | 3 ---
-- drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h | 4 ----
-- drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c | 2 --
-- 3 files changed, 9 deletions(-)
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
--@@ -508,9 +508,6 @@ int brcmf_net_attach(struct brcmf_if *if
-- ndev->hard_header_len += drvr->hdrlen;
-- ndev->ethtool_ops = &brcmf_ethtool_ops;
--
--- drvr->rxsz = ndev->mtu + ndev->hard_header_len +
--- drvr->hdrlen;
---
-- /* set the mac address */
-- memcpy(ndev->dev_addr, ifp->mac_addr, ETH_ALEN);
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.h
--@@ -112,15 +112,11 @@ struct brcmf_pub {
--
-- /* Internal brcmf items */
-- uint hdrlen; /* Total BRCMF header length (proto + bus) */
--- uint rxsz; /* Rx buffer size bus module should use */
--
-- /* Dongle media info */
-- char fwver[BRCMF_DRIVER_FIRMWARE_VERSION_LEN];
-- u8 mac[ETH_ALEN]; /* MAC address obtained from dongle */
--
--- /* Multicast data packets sent to dongle */
--- unsigned long tx_multicast;
---
-- struct mac_address addresses[BRCMF_MAX_IFS];
--
-- struct brcmf_if *iflist[BRCMF_MAX_IFS];
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fwsignal.c
--@@ -2104,8 +2104,6 @@ int brcmf_fws_process_skb(struct brcmf_i
-- if (!skb->priority)
-- skb->priority = cfg80211_classify8021d(skb, NULL);
--
--- drvr->tx_multicast += !!multicast;
---
-- if (fws->avoid_queueing) {
-- rc = brcmf_proto_txdata(drvr, ifp->ifidx, 0, skb);
-- if (rc < 0)
-diff --git a/package/kernel/mac80211/patches/351-0050-brcmfmac-replace-WARNING-on-timeout-with-a-simple-er.patch b/package/kernel/mac80211/patches/351-0050-brcmfmac-replace-WARNING-on-timeout-with-a-simple-er.patch
-deleted file mode 100644
-index ca4863a19500ccc0d1f7f21b6ef032c48097aeba..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/351-0050-brcmfmac-replace-WARNING-on-timeout-with-a-simple-er.patch
-+++ /dev/null
-@@ -1,38 +0,0 @@
--From 2f0e56fa37cce60a5ac5d451bcadec51cd711436 Mon Sep 17 00:00:00 2001
--From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
--Date: Tue, 27 Sep 2016 12:12:24 +0200
--Subject: [PATCH] brcmfmac: replace WARNING on timeout with a simple error
-- message
--MIME-Version: 1.0
--Content-Type: text/plain; charset=UTF-8
--Content-Transfer-Encoding: 8bit
--
--Even with timeout increased to 950 ms we get WARNINGs from time to time.
--It mostly happens on A-MPDU stalls (e.g. when station goes out of
--range). It may take up to 5-10 secods for the firmware to recover and
--for that time it doesn't process packets.
--
--It's still useful to have a message on time out as it may indicate some
--firmware problem and incorrect key update. Raising a WARNING however
--wasn't really that necessary, it doesn't point to any driver bug anymore
--and backtrace wasn't much useful.
--
--Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
--Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com>
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
-- drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c | 3 ++-
-- 1 file changed, 2 insertions(+), 1 deletion(-)
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
--@@ -1155,7 +1155,8 @@ int brcmf_netdev_wait_pend8021x(struct b
-- !brcmf_get_pend_8021x_cnt(ifp),
-- MAX_WAIT_FOR_8021X_TX);
--
--- WARN_ON(!err);
--+ if (!err)
--+ brcmf_err("Timed out waiting for no pending 802.1x packets\n");
--
-- return !err;
-- }
-diff --git a/package/kernel/mac80211/patches/351-0051-brcmfmac-use-correct-skb-freeing-helper-when-deletin.patch b/package/kernel/mac80211/patches/351-0051-brcmfmac-use-correct-skb-freeing-helper-when-deletin.patch
-deleted file mode 100644
-index 697635941b6eb28bc99c89e589b4a530107d2fa3..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/351-0051-brcmfmac-use-correct-skb-freeing-helper-when-deletin.patch
-+++ /dev/null
-@@ -1,58 +0,0 @@
--From 7f00ee2bbc630900ba16fc2690473f3e2db0e264 Mon Sep 17 00:00:00 2001
--From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
--Date: Tue, 27 Sep 2016 14:11:04 +0200
--Subject: [PATCH] brcmfmac: use correct skb freeing helper when deleting
-- flowring
--MIME-Version: 1.0
--Content-Type: text/plain; charset=UTF-8
--Content-Transfer-Encoding: 8bit
--
--Flowrings contain skbs waiting for transmission that were passed to us
--by netif. It means we checked every one of them looking for 802.1x
--Ethernet type. When deleting flowring we have to use freeing function
--that will check for 802.1x type as well.
--
--Freeing skbs without a proper check was leading to counter not being
--properly decreased. This was triggering a WARNING every time
--brcmf_netdev_wait_pend8021x was called.
--
--Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
--Acked-by: Arend van Spriel <arend@broadcom.com>
--Cc: stable@vger.kernel.org # 4.5+
--Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
-----
-- drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.c | 9 ++++++++-
-- 1 file changed, 8 insertions(+), 1 deletion(-)
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/flowring.c
--@@ -234,13 +234,20 @@ static void brcmf_flowring_block(struct
--
-- void brcmf_flowring_delete(struct brcmf_flowring *flow, u16 flowid)
-- {
--+ struct brcmf_bus *bus_if = dev_get_drvdata(flow->dev);
-- struct brcmf_flowring_ring *ring;
--+ struct brcmf_if *ifp;
-- u16 hash_idx;
--+ u8 ifidx;
-- struct sk_buff *skb;
--
-- ring = flow->rings[flowid];
-- if (!ring)
-- return;
--+
--+ ifidx = brcmf_flowring_ifidx_get(flow, flowid);
--+ ifp = brcmf_get_ifp(bus_if->drvr, ifidx);
--+
-- brcmf_flowring_block(flow, flowid, false);
-- hash_idx = ring->hash_id;
-- flow->hash[hash_idx].ifidx = BRCMF_FLOWRING_INVALID_IFIDX;
--@@ -249,7 +256,7 @@ void brcmf_flowring_delete(struct brcmf_
--
-- skb = skb_dequeue(&ring->skblist);
-- while (skb) {
--- brcmu_pkt_buf_free_skb(skb);
--+ brcmf_txfinalize(ifp, skb, false);
-- skb = skb_dequeue(&ring->skblist);
-- }
--
-diff --git a/package/kernel/mac80211/patches/402-ath_regd_optional.patch b/package/kernel/mac80211/patches/402-ath_regd_optional.patch
-index 735135307631290037afa6a00bab73a50fea78ba..463428371b4c96ee63b6eba1477023ff739c6129 100644
---- a/package/kernel/mac80211/patches/402-ath_regd_optional.patch
-+++ b/package/kernel/mac80211/patches/402-ath_regd_optional.patch
-@@ -8,7 +8,7 @@
- + return;
- +#endif
- +
-- for (band = 0; band < IEEE80211_NUM_BANDS; band++) {
-+ for (band = 0; band < NUM_NL80211_BANDS; band++) {
- if (!wiphy->bands[band])
- continue;
- @@ -374,6 +378,10 @@ ath_reg_apply_ir_flags(struct wiphy *wip
-@@ -19,7 +19,7 @@
- + return;
- +#endif
- +
-- sband = wiphy->bands[IEEE80211_BAND_2GHZ];
-+ sband = wiphy->bands[NL80211_BAND_2GHZ];
- if (!sband)
- return;
- @@ -402,6 +410,10 @@ static void ath_reg_apply_radar_flags(st
-@@ -30,7 +30,7 @@
- + return;
- +#endif
- +
-- if (!wiphy->bands[IEEE80211_BAND_5GHZ])
-+ if (!wiphy->bands[NL80211_BAND_5GHZ])
- return;
-
- @@ -633,6 +645,11 @@ ath_regd_init_wiphy(struct ath_regulator
-@@ -59,7 +59,7 @@
- ---help---
- --- a/.local-symbols
- +++ b/.local-symbols
--@@ -125,6 +125,7 @@ ADM8211=
-+@@ -127,6 +127,7 @@ ADM8211=
- ATH_COMMON=
- WLAN_VENDOR_ATH=
- ATH_DEBUG=
-diff --git a/package/kernel/mac80211/patches/410-ath9k_allow_adhoc_and_ap.patch b/package/kernel/mac80211/patches/410-ath9k_allow_adhoc_and_ap.patch
-index 1a624849546ca40db86f27a5edc3ffe860b2280d..f2f52f93afcd9501df5170dad99905c5baef06bc 100644
---- a/package/kernel/mac80211/patches/410-ath9k_allow_adhoc_and_ap.patch
-+++ b/package/kernel/mac80211/patches/410-ath9k_allow_adhoc_and_ap.patch
-@@ -1,6 +1,6 @@
- --- a/drivers/net/wireless/ath/ath9k/init.c
- +++ b/drivers/net/wireless/ath/ath9k/init.c
--@@ -722,6 +722,7 @@ static const struct ieee80211_iface_limi
-+@@ -727,6 +727,7 @@ static const struct ieee80211_iface_limi
- BIT(NL80211_IFTYPE_AP) },
- { .max = 1, .types = BIT(NL80211_IFTYPE_P2P_CLIENT) |
- BIT(NL80211_IFTYPE_P2P_GO) },
-diff --git a/package/kernel/mac80211/patches/500-ath9k_eeprom_debugfs.patch b/package/kernel/mac80211/patches/500-ath9k_eeprom_debugfs.patch
-index a7f9d9f8b9706b0c2d359e09e3d3ef396764b3d3..f21eed18c3f1ff0ec43f42632bda1fd4c1236faf 100644
---- a/package/kernel/mac80211/patches/500-ath9k_eeprom_debugfs.patch
-+++ b/package/kernel/mac80211/patches/500-ath9k_eeprom_debugfs.patch
-@@ -1,6 +1,6 @@
- --- a/drivers/net/wireless/ath/ath9k/debug.c
- +++ b/drivers/net/wireless/ath/ath9k/debug.c
--@@ -1301,6 +1301,53 @@ void ath9k_deinit_debug(struct ath_softc
-+@@ -1315,6 +1315,53 @@ void ath9k_deinit_debug(struct ath_softc
- ath9k_cmn_spectral_deinit_debug(&sc->spec_priv);
- }
-
-@@ -54,7 +54,7 @@
- int ath9k_init_debug(struct ath_hw *ah)
- {
- struct ath_common *common = ath9k_hw_common(ah);
--@@ -1320,6 +1367,8 @@ int ath9k_init_debug(struct ath_hw *ah)
-+@@ -1334,6 +1381,8 @@ int ath9k_init_debug(struct ath_hw *ah)
- ath9k_tx99_init_debug(sc);
- ath9k_cmn_spectral_init_debug(&sc->spec_priv, sc->debug.debugfs_phy);
-
-diff --git a/package/kernel/mac80211/patches/501-ath9k_ahb_init.patch b/package/kernel/mac80211/patches/501-ath9k_ahb_init.patch
-index 5892c3e17a65ae7eea33fd44906a6eb8cb511c70..1825d77b7f83e4a5cf5922ba6fd314a4c8704759 100644
---- a/package/kernel/mac80211/patches/501-ath9k_ahb_init.patch
-+++ b/package/kernel/mac80211/patches/501-ath9k_ahb_init.patch
-@@ -1,6 +1,6 @@
- --- a/drivers/net/wireless/ath/ath9k/init.c
- +++ b/drivers/net/wireless/ath/ath9k/init.c
--@@ -1024,23 +1024,23 @@ static int __init ath9k_init(void)
-+@@ -1030,23 +1030,23 @@ static int __init ath9k_init(void)
- {
- int error;
-
-diff --git a/package/kernel/mac80211/patches/511-ath9k_reduce_rxbuf.patch b/package/kernel/mac80211/patches/511-ath9k_reduce_rxbuf.patch
-index 6766111dfd3e43b2251a0248f256e97f8d5cbffa..15b8d7b86b137b9c5ba46ae5a7afc7ac5f455aaf 100644
---- a/package/kernel/mac80211/patches/511-ath9k_reduce_rxbuf.patch
-+++ b/package/kernel/mac80211/patches/511-ath9k_reduce_rxbuf.patch
-@@ -8,4 +8,4 @@
- +#define ATH_RXBUF 256
- #define ATH_TXBUF 512
- #define ATH_TXBUF_RESERVE 5
-- #define ATH_MAX_QDEPTH (ATH_TXBUF / 4 - ATH_TXBUF_RESERVE)
-+ #define ATH_TXMAXTRY 13
-diff --git a/package/kernel/mac80211/patches/512-ath9k_channelbw_debugfs.patch b/package/kernel/mac80211/patches/512-ath9k_channelbw_debugfs.patch
-index 5ecf528e598aff996c21b128d7fdcfecc6fa564f..c98072bac9cba922eac5031dede34116485ac435 100644
---- a/package/kernel/mac80211/patches/512-ath9k_channelbw_debugfs.patch
-+++ b/package/kernel/mac80211/patches/512-ath9k_channelbw_debugfs.patch
-@@ -1,6 +1,6 @@
- --- a/drivers/net/wireless/ath/ath9k/debug.c
- +++ b/drivers/net/wireless/ath/ath9k/debug.c
--@@ -1348,6 +1348,52 @@ static const struct file_operations fops
-+@@ -1362,6 +1362,52 @@ static const struct file_operations fops
- .owner = THIS_MODULE
- };
-
-@@ -53,7 +53,7 @@
- int ath9k_init_debug(struct ath_hw *ah)
- {
- struct ath_common *common = ath9k_hw_common(ah);
--@@ -1369,6 +1415,8 @@ int ath9k_init_debug(struct ath_hw *ah)
-+@@ -1383,6 +1429,8 @@ int ath9k_init_debug(struct ath_hw *ah)
-
- debugfs_create_file("eeprom", S_IRUSR, sc->debug.debugfs_phy, sc,
- &fops_eeprom);
-@@ -90,7 +90,7 @@
- ichan->channel = chan->center_freq;
- ichan->chan = chan;
- @@ -308,7 +310,19 @@ static void ath9k_cmn_update_ichannel(st
-- if (chan->band == IEEE80211_BAND_5GHZ)
-+ if (chan->band == NL80211_BAND_5GHZ)
- flags |= CHANNEL_5GHZ;
-
- - switch (chandef->width) {
-diff --git a/package/kernel/mac80211/patches/513-ath9k_add_pci_ids.patch b/package/kernel/mac80211/patches/513-ath9k_add_pci_ids.patch
-index c84d1bc8290e673d8366e3fcf9b97e84e634726a..167eeff2d2acfd98de87a8275bd56ef1c22928cd 100644
---- a/package/kernel/mac80211/patches/513-ath9k_add_pci_ids.patch
-+++ b/package/kernel/mac80211/patches/513-ath9k_add_pci_ids.patch
-@@ -20,7 +20,7 @@
- #define AR9160_DEVID_PCI 0x0027
- --- a/drivers/net/wireless/ath/ath9k/pci.c
- +++ b/drivers/net/wireless/ath/ath9k/pci.c
--@@ -751,6 +751,7 @@ static const struct pci_device_id ath_pc
-+@@ -761,6 +761,7 @@ static const struct pci_device_id ath_pc
- .driver_data = ATH9K_PCI_BT_ANT_DIV },
- #endif
-
-diff --git a/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch b/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch
-index e151a12967ccf90d2de7cfde5728803b1069591c..c40598dde63b7c91cef9040e9927274cfd0c358a 100644
---- a/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch
-+++ b/package/kernel/mac80211/patches/522-mac80211_configure_antenna_gain.patch
-@@ -1,6 +1,6 @@
- --- a/include/net/cfg80211.h
- +++ b/include/net/cfg80211.h
--@@ -2363,6 +2363,7 @@ struct cfg80211_qos_map {
-+@@ -2410,6 +2410,7 @@ struct cfg80211_qos_map {
- * (as advertised by the nl80211 feature flag.)
- * @get_tx_power: store the current TX power into the dbm variable;
- * return 0 if successful
-@@ -8,7 +8,7 @@
- *
- * @set_wds_peer: set the WDS peer for a WDS interface
- *
--@@ -2624,6 +2625,7 @@ struct cfg80211_ops {
-+@@ -2671,6 +2672,7 @@ struct cfg80211_ops {
- enum nl80211_tx_power_setting type, int mbm);
- int (*get_tx_power)(struct wiphy *wiphy, struct wireless_dev *wdev,
- int *dbm);
-@@ -18,7 +18,7 @@
- const u8 *addr);
- --- a/include/net/mac80211.h
- +++ b/include/net/mac80211.h
--@@ -1286,6 +1286,7 @@ enum ieee80211_smps_mode {
-+@@ -1317,6 +1317,7 @@ enum ieee80211_smps_mode {
- *
- * @power_level: requested transmit power (in dBm), backward compatibility
- * value only that is set to the minimum of all interfaces
-@@ -26,7 +26,7 @@
- *
- * @chandef: the channel definition to tune to
- * @radar_enabled: whether radar detection is enabled
--@@ -1306,6 +1307,7 @@ enum ieee80211_smps_mode {
-+@@ -1337,6 +1338,7 @@ enum ieee80211_smps_mode {
- struct ieee80211_conf {
- u32 flags;
- int power_level, dynamic_ps_timeout;
-@@ -36,9 +36,9 @@
- u8 ps_dtim_period;
- --- a/include/uapi/linux/nl80211.h
- +++ b/include/uapi/linux/nl80211.h
--@@ -1790,6 +1790,9 @@ enum nl80211_commands {
-- * between scans. The scan plans are executed sequentially.
-- * Each scan plan is a nested attribute of &enum nl80211_sched_scan_plan.
-+@@ -1829,6 +1829,9 @@ enum nl80211_commands {
-+ * %NL80211_ATTR_EXT_CAPA_MASK, to specify the extended capabilities per
-+ * interface type.
- *
- + * @NL80211_ATTR_WIPHY_ANTENNA_GAIN: Configured antenna gain. Used to reduce
- + * transmit power to stay within regulatory limits. u32, dBi.
-@@ -46,9 +46,9 @@
- * @NUM_NL80211_ATTR: total number of nl80211_attrs available
- * @NL80211_ATTR_MAX: highest attribute number currently defined
- * @__NL80211_ATTR_AFTER_LAST: internal use
--@@ -2164,6 +2167,8 @@ enum nl80211_attrs {
-- NL80211_ATTR_MAX_SCAN_PLAN_ITERATIONS,
-- NL80211_ATTR_SCHED_SCAN_PLANS,
-+@@ -2213,6 +2216,8 @@ enum nl80211_attrs {
-+
-+ NL80211_ATTR_IFTYPE_EXT_CAPA,
-
- + NL80211_ATTR_WIPHY_ANTENNA_GAIN,
- +
-@@ -57,7 +57,7 @@
- __NL80211_ATTR_AFTER_LAST,
- --- a/net/mac80211/cfg.c
- +++ b/net/mac80211/cfg.c
--@@ -2229,6 +2229,19 @@ static int ieee80211_get_tx_power(struct
-+@@ -2238,6 +2238,19 @@ static int ieee80211_get_tx_power(struct
- return 0;
- }
-
-@@ -77,7 +77,7 @@
- static int ieee80211_set_wds_peer(struct wiphy *wiphy, struct net_device *dev,
- const u8 *addr)
- {
--@@ -3403,6 +3416,7 @@ const struct cfg80211_ops mac80211_confi
-+@@ -3412,6 +3425,7 @@ const struct cfg80211_ops mac80211_confi
- .set_wiphy_params = ieee80211_set_wiphy_params,
- .set_tx_power = ieee80211_set_tx_power,
- .get_tx_power = ieee80211_get_tx_power,
-@@ -87,7 +87,7 @@
- CFG80211_TESTMODE_CMD(ieee80211_testmode_cmd)
- --- a/net/mac80211/ieee80211_i.h
- +++ b/net/mac80211/ieee80211_i.h
--@@ -1318,6 +1318,7 @@ struct ieee80211_local {
-+@@ -1338,6 +1338,7 @@ struct ieee80211_local {
- int dynamic_ps_forced_timeout;
-
- int user_power_level; /* in dBm, for all interfaces */
-@@ -119,7 +119,7 @@
- if (local->hw.conf.power_level != power) {
- changed |= IEEE80211_CONF_CHANGE_POWER;
- local->hw.conf.power_level = power;
--@@ -586,6 +592,7 @@ struct ieee80211_hw *ieee80211_alloc_hw_
-+@@ -588,6 +594,7 @@ struct ieee80211_hw *ieee80211_alloc_hw_
- IEEE80211_RADIOTAP_MCS_HAVE_BW;
- local->hw.radiotap_vht_details = IEEE80211_RADIOTAP_VHT_KNOWN_GI |
- IEEE80211_RADIOTAP_VHT_KNOWN_BANDWIDTH;
-@@ -129,15 +129,15 @@
- local->user_power_level = IEEE80211_UNSET_POWER_LEVEL;
- --- a/net/wireless/nl80211.c
- +++ b/net/wireless/nl80211.c
--@@ -403,6 +403,7 @@ static const struct nla_policy nl80211_p
-- [NL80211_ATTR_NETNS_FD] = { .type = NLA_U32 },
-- [NL80211_ATTR_SCHED_SCAN_DELAY] = { .type = NLA_U32 },
-- [NL80211_ATTR_REG_INDOOR] = { .type = NLA_FLAG },
-+@@ -407,6 +407,7 @@ static const struct nla_policy nl80211_p
-+ [NL80211_ATTR_PBSS] = { .type = NLA_FLAG },
-+ [NL80211_ATTR_BSS_SELECT] = { .type = NLA_NESTED },
-+ [NL80211_ATTR_STA_SUPPORT_P2P_PS] = { .type = NLA_U8 },
- + [NL80211_ATTR_WIPHY_ANTENNA_GAIN] = { .type = NLA_U32 },
- };
-
- /* policy for the key attributes */
--@@ -2220,6 +2221,20 @@ static int nl80211_set_wiphy(struct sk_b
-+@@ -2294,6 +2295,20 @@ static int nl80211_set_wiphy(struct sk_b
- if (result)
- return result;
- }
-diff --git a/package/kernel/mac80211/patches/530-ath9k_extra_leds.patch b/package/kernel/mac80211/patches/530-ath9k_extra_leds.patch
-index 5a5e4643f5287e1426dd63a662b1f9b75cf22c80..0b257496082bab62ac43daf232f83628888e04ed 100644
---- a/package/kernel/mac80211/patches/530-ath9k_extra_leds.patch
-+++ b/package/kernel/mac80211/patches/530-ath9k_extra_leds.patch
-@@ -1,16 +1,16 @@
- --- a/drivers/net/wireless/ath/ath9k/ath9k.h
- +++ b/drivers/net/wireless/ath/ath9k/ath9k.h
- @@ -814,6 +814,9 @@ static inline int ath9k_dump_btcoex(stru
-+ #ifdef CPTCFG_MAC80211_LEDS
- void ath_init_leds(struct ath_softc *sc);
- void ath_deinit_leds(struct ath_softc *sc);
-- void ath_fill_led_pin(struct ath_softc *sc);
- +int ath_create_gpio_led(struct ath_softc *sc, int gpio, const char *name,
--+ const char *trigger, bool active_low);
-++ const char *trigger, bool active_low);
- +
- #else
- static inline void ath_init_leds(struct ath_softc *sc)
- {
--@@ -953,6 +956,13 @@ void ath_ant_comb_scan(struct ath_softc
-+@@ -950,6 +953,13 @@ void ath_ant_comb_scan(struct ath_softc
-
- #define ATH9K_NUM_CHANCTX 2 /* supports 2 operating channels */
-
-@@ -24,7 +24,7 @@
- struct ath_softc {
- struct ieee80211_hw *hw;
- struct device *dev;
--@@ -1005,9 +1015,8 @@ struct ath_softc {
-+@@ -1002,9 +1012,8 @@ struct ath_softc {
- spinlock_t chan_lock;
-
- #ifdef CPTCFG_MAC80211_LEDS
-@@ -38,24 +38,33 @@
- #ifdef CPTCFG_ATH9K_DEBUGFS
- --- a/drivers/net/wireless/ath/ath9k/gpio.c
- +++ b/drivers/net/wireless/ath/ath9k/gpio.c
--@@ -24,45 +24,102 @@
-- static void ath_led_brightness(struct led_classdev *led_cdev,
-- enum led_brightness brightness)
-+@@ -22,7 +22,7 @@
-+
-+ #ifdef CPTCFG_MAC80211_LEDS
-+
-+-void ath_fill_led_pin(struct ath_softc *sc)
-++static void ath_fill_led_pin(struct ath_softc *sc)
- {
--- struct ath_softc *sc = container_of(led_cdev, struct ath_softc, led_cdev);
--- u32 val = (brightness == LED_OFF);
-+ struct ath_hw *ah = sc->sc_ah;
-+
-+@@ -39,61 +39,111 @@ void ath_fill_led_pin(struct ath_softc *
-+ else
-+ ah->led_pin = ATH_LED_PIN_DEF;
-+ }
-++}
-++
-++static void ath_led_brightness(struct led_classdev *led_cdev,
-++ enum led_brightness brightness)
-++{
- + struct ath_led *led = container_of(led_cdev, struct ath_led, cdev);
- + struct ath_softc *sc = led->sc;
--
--- if (sc->sc_ah->config.led_active_high)
--- val = !val;
-++
- + ath9k_ps_wakeup(sc);
- + ath9k_hw_set_gpio(sc->sc_ah, led->gpio->gpio,
- + (brightness != LED_OFF) ^ led->gpio->active_low);
- + ath9k_ps_restore(sc);
- +}
--
--- ath9k_hw_set_gpio(sc->sc_ah, sc->sc_ah->led_pin, val);
-++
- +static int ath_add_led(struct ath_softc *sc, struct ath_led *led)
- +{
- + const struct gpio_led *gpio = led->gpio;
-@@ -71,30 +80,40 @@
- +
- + led->sc = sc;
- + list_add(&led->list, &sc->leds);
--+
--+ /* Configure gpio for output */
--+ ath9k_hw_cfg_output(sc->sc_ah, gpio->gpio,
--+ AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
--+
-+
-+ /* Configure gpio for output */
-+- ath9k_hw_gpio_request_out(ah, ah->led_pin, "ath9k-led",
-++ ath9k_hw_gpio_request_out(sc->sc_ah, gpio->gpio, gpio->name,
-+ AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
-+
-+- /* LED off, active low */
-+- ath9k_hw_set_gpio(ah, ah->led_pin, ah->config.led_active_high ? 0 : 1);
- + /* LED off */
- + ath9k_hw_set_gpio(sc->sc_ah, gpio->gpio, gpio->active_low);
- +
- + return 0;
--+}
--+
-+ }
-+
-+-static void ath_led_brightness(struct led_classdev *led_cdev,
-+- enum led_brightness brightness)
- +int ath_create_gpio_led(struct ath_softc *sc, int gpio_num, const char *name,
- + const char *trigger, bool active_low)
--+{
-+ {
-+- struct ath_softc *sc = container_of(led_cdev, struct ath_softc, led_cdev);
-+- u32 val = (brightness == LED_OFF);
- + struct ath_led *led;
- + struct gpio_led *gpio;
- + char *_name;
- + int ret;
--+
-+
-+- if (sc->sc_ah->config.led_active_high)
-+- val = !val;
- + led = kzalloc(sizeof(*led) + sizeof(*gpio) + strlen(name) + 1,
- + GFP_KERNEL);
- + if (!led)
- + return -ENOMEM;
--+
-+
-+- ath9k_hw_set_gpio(sc->sc_ah, sc->sc_ah->led_pin, val);
- + led->gpio = gpio = (struct gpio_led *) (led + 1);
- + _name = (char *) (led->gpio + 1);
- +
-@@ -115,15 +134,18 @@
- {
- - if (!sc->led_registered)
- - return;
--+ struct ath_led *led;
--
-+-
- - ath_led_brightness(&sc->led_cdev, LED_OFF);
- - led_classdev_unregister(&sc->led_cdev);
-++ struct ath_led *led;
-+
-+- ath9k_hw_gpio_free(sc->sc_ah, sc->sc_ah->led_pin);
- + while (!list_empty(&sc->leds)) {
- + led = list_first_entry(&sc->leds, struct ath_led, list);
- + list_del(&led->list);
- + ath_led_brightness(&led->cdev, LED_OFF);
- + led_classdev_unregister(&led->cdev);
-++ ath9k_hw_gpio_free(sc->sc_ah, led->gpio->gpio);
- + kfree(led);
- + }
- }
-@@ -139,6 +161,8 @@
- if (AR_SREV_9100(sc->sc_ah))
- return;
-
-+ ath_fill_led_pin(sc);
-+
- - if (!ath9k_led_blink)
- - sc->led_cdev.default_trigger =
- - ieee80211_get_radio_led_name(sc->hw);
-@@ -159,13 +183,14 @@
- + trigger = ieee80211_get_radio_led_name(sc->hw);
-
- - sc->led_registered = true;
--+ ath_create_gpio_led(sc, sc->sc_ah->led_pin, led_name, trigger, !sc->sc_ah->config.led_active_high);
-++ ath_create_gpio_led(sc, sc->sc_ah->led_pin, led_name, trigger,
-++ !sc->sc_ah->config.led_active_high);
- }
-+ #endif
-
-- void ath_fill_led_pin(struct ath_softc *sc)
- --- a/drivers/net/wireless/ath/ath9k/init.c
- +++ b/drivers/net/wireless/ath/ath9k/init.c
--@@ -936,7 +936,7 @@ int ath9k_init_device(u16 devid, struct
-+@@ -942,7 +942,7 @@ int ath9k_init_device(u16 devid, struct
-
- #ifdef CPTCFG_MAC80211_LEDS
- /* must be initialized before ieee80211_register_hw */
-@@ -176,7 +201,7 @@
- #endif
- --- a/drivers/net/wireless/ath/ath9k/debug.c
- +++ b/drivers/net/wireless/ath/ath9k/debug.c
--@@ -1393,6 +1393,61 @@ static const struct file_operations fops
-+@@ -1407,6 +1407,61 @@ static const struct file_operations fops
- .llseek = default_llseek,
- };
-
-@@ -238,7 +263,7 @@
-
- int ath9k_init_debug(struct ath_hw *ah)
- {
--@@ -1417,6 +1472,10 @@ int ath9k_init_debug(struct ath_hw *ah)
-+@@ -1431,6 +1486,10 @@ int ath9k_init_debug(struct ath_hw *ah)
- &fops_eeprom);
- debugfs_create_file("chanbw", S_IRUSR | S_IWUSR, sc->debug.debugfs_phy,
- sc, &fops_chanbw);
-diff --git a/package/kernel/mac80211/patches/531-ath9k_extra_platform_leds.patch b/package/kernel/mac80211/patches/531-ath9k_extra_platform_leds.patch
-index 7c10ea6b0d042db76b703e12356f53bea36e90de..f656697a077a417c7993bd41880f65b7b261fc99 100644
---- a/package/kernel/mac80211/patches/531-ath9k_extra_platform_leds.patch
-+++ b/package/kernel/mac80211/patches/531-ath9k_extra_platform_leds.patch
-@@ -1,6 +1,6 @@
- --- a/include/linux/ath9k_platform.h
- +++ b/include/linux/ath9k_platform.h
--@@ -41,6 +41,9 @@ struct ath9k_platform_data {
-+@@ -45,6 +45,9 @@ struct ath9k_platform_data {
- int (*external_reset)(void);
-
- bool use_eeprom;
-@@ -20,7 +20,7 @@
-
- /********************************/
- /* LED functions */
--@@ -88,6 +89,24 @@ int ath_create_gpio_led(struct ath_softc
-+@@ -108,6 +109,24 @@ int ath_create_gpio_led(struct ath_softc
- return ret;
- }
-
-@@ -45,7 +45,7 @@
- void ath_deinit_leds(struct ath_softc *sc)
- {
- struct ath_led *led;
--@@ -103,8 +122,10 @@ void ath_deinit_leds(struct ath_softc *s
-+@@ -124,8 +143,10 @@ void ath_deinit_leds(struct ath_softc *s
-
- void ath_init_leds(struct ath_softc *sc)
- {
-@@ -56,10 +56,10 @@
-
- INIT_LIST_HEAD(&sc->leds);
-
--@@ -120,6 +141,12 @@ void ath_init_leds(struct ath_softc *sc)
-- trigger = ieee80211_get_radio_led_name(sc->hw);
-+@@ -144,6 +165,12 @@ void ath_init_leds(struct ath_softc *sc)
-
-- ath_create_gpio_led(sc, sc->sc_ah->led_pin, led_name, trigger, !sc->sc_ah->config.led_active_high);
-+ ath_create_gpio_led(sc, sc->sc_ah->led_pin, led_name, trigger,
-+ !sc->sc_ah->config.led_active_high);
- +
- + if (!pdata)
- + return;
-@@ -67,5 +67,5 @@
- + for (i = 0; i < pdata->num_leds; i++)
- + ath_create_platform_led(sc, &pdata->leds[i]);
- }
-+ #endif
-
-- void ath_fill_led_pin(struct ath_softc *sc)
-diff --git a/package/kernel/mac80211/patches/532-ath9k_get_led_polarity_from_platform_data.patch b/package/kernel/mac80211/patches/532-ath9k_get_led_polarity_from_platform_data.patch
-index 6d62a2b1c2cdb716c9e207e219cad96075b82bac..50d8a7abae686b6b25ad561c71176b5661dbc437 100644
---- a/package/kernel/mac80211/patches/532-ath9k_get_led_polarity_from_platform_data.patch
-+++ b/package/kernel/mac80211/patches/532-ath9k_get_led_polarity_from_platform_data.patch
-@@ -1,6 +1,6 @@
- --- a/include/linux/ath9k_platform.h
- +++ b/include/linux/ath9k_platform.h
--@@ -36,6 +36,7 @@ struct ath9k_platform_data {
-+@@ -40,6 +40,7 @@ struct ath9k_platform_data {
- bool tx_gain_buffalo;
- bool disable_2ghz;
- bool disable_5ghz;
-@@ -10,7 +10,7 @@
- int (*external_reset)(void);
- --- a/drivers/net/wireless/ath/ath9k/init.c
- +++ b/drivers/net/wireless/ath/ath9k/init.c
--@@ -577,6 +577,7 @@ static int ath9k_init_softc(u16 devid, s
-+@@ -580,6 +580,7 @@ static int ath9k_init_softc(u16 devid, s
- ah->external_reset = pdata->external_reset;
- ah->disable_2ghz = pdata->disable_2ghz;
- ah->disable_5ghz = pdata->disable_5ghz;
-diff --git a/package/kernel/mac80211/patches/541-ath9k_rx_dma_stop_check.patch b/package/kernel/mac80211/patches/541-ath9k_rx_dma_stop_check.patch
-index 3c5e9f5fcda6cc16bcdbfe1a757f8a5c352eed15..c2d27815592ba1e09251e1c581e634c985750c5e 100644
---- a/package/kernel/mac80211/patches/541-ath9k_rx_dma_stop_check.patch
-+++ b/package/kernel/mac80211/patches/541-ath9k_rx_dma_stop_check.patch
-@@ -1,6 +1,6 @@
- --- a/drivers/net/wireless/ath/ath9k/mac.c
- +++ b/drivers/net/wireless/ath/ath9k/mac.c
--@@ -695,7 +695,7 @@ bool ath9k_hw_stopdmarecv(struct ath_hw
-+@@ -698,7 +698,7 @@ bool ath9k_hw_stopdmarecv(struct ath_hw
- {
- #define AH_RX_STOP_DMA_TIMEOUT 10000 /* usec */
- struct ath_common *common = ath9k_hw_common(ah);
-@@ -9,7 +9,7 @@
- int i;
-
- /* Enable access to the DMA observation bus */
--@@ -725,6 +725,16 @@ bool ath9k_hw_stopdmarecv(struct ath_hw
-+@@ -728,6 +728,16 @@ bool ath9k_hw_stopdmarecv(struct ath_hw
- }
-
- if (i == 0) {
-diff --git a/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch b/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch
-index e83c6bfbf90d18577398c50fca1fa46b46e7822c..461564350feb43410e5c702a8a67514cdfaa3961 100644
---- a/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch
-+++ b/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch
-@@ -1,6 +1,6 @@
- --- a/drivers/net/wireless/ath/ath9k/debug.c
- +++ b/drivers/net/wireless/ath/ath9k/debug.c
--@@ -1449,6 +1449,50 @@ static const struct file_operations fops
-+@@ -1463,6 +1463,50 @@ static const struct file_operations fops
- #endif
-
-
-@@ -51,7 +51,7 @@
- int ath9k_init_debug(struct ath_hw *ah)
- {
- struct ath_common *common = ath9k_hw_common(ah);
--@@ -1476,6 +1520,8 @@ int ath9k_init_debug(struct ath_hw *ah)
-+@@ -1490,6 +1534,8 @@ int ath9k_init_debug(struct ath_hw *ah)
- debugfs_create_file("gpio_led", S_IWUSR,
- sc->debug.debugfs_phy, sc, &fops_gpio_led);
- #endif
-@@ -62,7 +62,7 @@
- debugfs_create_devm_seqfile(sc->dev, "interrupt", sc->debug.debugfs_phy,
- --- a/drivers/net/wireless/ath/ath9k/hw.h
- +++ b/drivers/net/wireless/ath/ath9k/hw.h
--@@ -519,6 +519,12 @@ enum {
-+@@ -520,6 +520,12 @@ enum {
- ATH9K_RESET_COLD,
- };
-
-@@ -75,7 +75,7 @@
- struct ath9k_hw_version {
- u32 magic;
- u16 devid;
--@@ -804,6 +810,8 @@ struct ath_hw {
-+@@ -805,6 +811,8 @@ struct ath_hw {
- u32 rfkill_polarity;
- u32 ah_flags;
-
-@@ -84,7 +84,7 @@
- bool reset_power_on;
- bool htc_reset_init;
-
--@@ -1066,6 +1074,7 @@ void ath9k_hw_check_nav(struct ath_hw *a
-+@@ -1068,6 +1076,7 @@ void ath9k_hw_check_nav(struct ath_hw *a
- bool ath9k_hw_check_alive(struct ath_hw *ah);
-
- bool ath9k_hw_setpower(struct ath_hw *ah, enum ath9k_power_mode mode);
-@@ -94,7 +94,7 @@
- struct ath_gen_timer *ath_gen_timer_alloc(struct ath_hw *ah,
- --- a/drivers/net/wireless/ath/ath9k/hw.c
- +++ b/drivers/net/wireless/ath/ath9k/hw.c
--@@ -1819,6 +1819,20 @@ u32 ath9k_hw_get_tsf_offset(struct times
-+@@ -1841,6 +1841,20 @@ u32 ath9k_hw_get_tsf_offset(struct times
- }
- EXPORT_SYMBOL(ath9k_hw_get_tsf_offset);
-
-@@ -115,7 +115,7 @@
- int ath9k_hw_reset(struct ath_hw *ah, struct ath9k_channel *chan,
- struct ath9k_hw_cal_data *caldata, bool fastcc)
- {
--@@ -2027,6 +2041,7 @@ int ath9k_hw_reset(struct ath_hw *ah, st
-+@@ -2049,6 +2063,7 @@ int ath9k_hw_reset(struct ath_hw *ah, st
- ar9003_hw_disable_phy_restart(ah);
-
- ath9k_hw_apply_gpio_override(ah);
-diff --git a/package/kernel/mac80211/patches/543-ath9k_entropy_from_adc.patch b/package/kernel/mac80211/patches/543-ath9k_entropy_from_adc.patch
-index d7bb5a12ce6f4135cdb7eaa951321cec48d221b8..656ed439b9b8aebd554e91f9963c2f6521651960 100644
---- a/package/kernel/mac80211/patches/543-ath9k_entropy_from_adc.patch
-+++ b/package/kernel/mac80211/patches/543-ath9k_entropy_from_adc.patch
-@@ -1,6 +1,6 @@
- --- a/drivers/net/wireless/ath/ath9k/hw.h
- +++ b/drivers/net/wireless/ath/ath9k/hw.h
--@@ -720,6 +720,7 @@ struct ath_spec_scan {
-+@@ -721,6 +721,7 @@ struct ath_spec_scan {
- * @config_pci_powersave:
- * @calibrate: periodic calibration for NF, ANI, IQ, ADC gain, ADC-DC
- *
-@@ -8,7 +8,7 @@
- * @spectral_scan_config: set parameters for spectral scan and enable/disable it
- * @spectral_scan_trigger: trigger a spectral scan run
- * @spectral_scan_wait: wait for a spectral scan run to finish
--@@ -742,6 +743,7 @@ struct ath_hw_ops {
-+@@ -743,6 +744,7 @@ struct ath_hw_ops {
- struct ath_hw_antcomb_conf *antconf);
- void (*antdiv_comb_conf_set)(struct ath_hw *ah,
- struct ath_hw_antcomb_conf *antconf);
-@@ -18,7 +18,7 @@
- void (*spectral_scan_trigger)(struct ath_hw *ah);
- --- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
- +++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
--@@ -1998,6 +1998,26 @@ void ar9003_hw_init_rate_txpower(struct
-+@@ -1945,6 +1945,26 @@ void ar9003_hw_init_rate_txpower(struct
- }
- }
-
-@@ -45,7 +45,7 @@
- void ar9003_hw_attach_phy_ops(struct ath_hw *ah)
- {
- struct ath_hw_private_ops *priv_ops = ath9k_hw_private_ops(ah);
--@@ -2034,6 +2054,7 @@ void ar9003_hw_attach_phy_ops(struct ath
-+@@ -1981,6 +2001,7 @@ void ar9003_hw_attach_phy_ops(struct ath
- priv_ops->set_radar_params = ar9003_hw_set_radar_params;
- priv_ops->fast_chan_change = ar9003_hw_fast_chan_change;
-
-@@ -55,9 +55,9 @@
- ops->spectral_scan_config = ar9003_hw_spectral_scan_config;
- --- a/drivers/net/wireless/ath/ath9k/init.c
- +++ b/drivers/net/wireless/ath/ath9k/init.c
--@@ -711,7 +711,8 @@ static void ath9k_init_txpower_limits(st
-+@@ -716,7 +716,8 @@ static void ath9k_init_txpower_limits(st
- if (ah->caps.hw_caps & ATH9K_HW_CAP_5GHZ)
-- ath9k_init_band_txpower(sc, IEEE80211_BAND_5GHZ);
-+ ath9k_init_band_txpower(sc, NL80211_BAND_5GHZ);
-
- - ah->curchan = curchan;
- + if (curchan)
-@@ -65,7 +65,7 @@
- }
-
- static const struct ieee80211_iface_limit if_limits[] = {
--@@ -897,6 +898,18 @@ static void ath9k_set_hw_capab(struct at
-+@@ -903,6 +904,18 @@ static void ath9k_set_hw_capab(struct at
- SET_IEEE80211_PERM_ADDR(hw, common->macaddr);
- }
-
-@@ -84,7 +84,7 @@
- int ath9k_init_device(u16 devid, struct ath_softc *sc,
- const struct ath_bus_ops *bus_ops)
- {
--@@ -942,6 +955,8 @@ int ath9k_init_device(u16 devid, struct
-+@@ -948,6 +961,8 @@ int ath9k_init_device(u16 devid, struct
- ARRAY_SIZE(ath9k_tpt_blink));
- #endif
-
-@@ -110,7 +110,7 @@
- static inline void ath9k_hw_set_bt_ant_diversity(struct ath_hw *ah, bool enable)
- --- a/drivers/net/wireless/ath/ath9k/ar5008_phy.c
- +++ b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
--@@ -1327,9 +1327,30 @@ void ar5008_hw_init_rate_txpower(struct
-+@@ -1325,9 +1325,30 @@ void ar5008_hw_init_rate_txpower(struct
- }
- }
-
-@@ -141,7 +141,7 @@
- static const u32 ar5416_cca_regs[6] = {
- AR_PHY_CCA,
- AR_PHY_CH1_CCA,
--@@ -1344,6 +1365,8 @@ int ar5008_hw_attach_phy_ops(struct ath_
-+@@ -1342,6 +1363,8 @@ int ar5008_hw_attach_phy_ops(struct ath_
- if (ret)
- return ret;
-
-@@ -175,7 +175,7 @@
- #define AR_PHY_TIMING2 0x9810
- #define AR_PHY_TIMING3 0x9814
- #define AR_PHY_TIMING3_DSC_MAN 0xFFFE0000
--@@ -390,6 +399,8 @@
-+@@ -393,6 +402,8 @@
- #define AR_PHY_RFBUS_GRANT 0x9C20
- #define AR_PHY_RFBUS_GRANT_EN 0x00000001
-
-diff --git a/package/kernel/mac80211/patches/544-ath9k-ar933x-usb-hang-workaround.patch b/package/kernel/mac80211/patches/544-ath9k-ar933x-usb-hang-workaround.patch
-index 8768c5d89a7b38d0e0a3c07dc94bf52edb480732..b9c962e1b5d13338ab4f7ddf6f370dbffeda299a 100644
---- a/package/kernel/mac80211/patches/544-ath9k-ar933x-usb-hang-workaround.patch
-+++ b/package/kernel/mac80211/patches/544-ath9k-ar933x-usb-hang-workaround.patch
-@@ -20,9 +20,9 @@
- /******************/
- /* Chip Revisions */
- /******************/
--@@ -1397,6 +1410,9 @@ static bool ath9k_hw_set_reset(struct at
-- if (AR_SREV_9100(ah))
-+@@ -1417,6 +1430,9 @@ static bool ath9k_hw_set_reset(struct at
- udelay(50);
-+ }
-
- + if (AR_SREV_9330(ah) || AR_SREV_9340(ah))
- + ath9k_hw_disable_pll_lock_detect(ah);
-@@ -30,7 +30,7 @@
- return true;
- }
-
--@@ -1496,6 +1512,9 @@ static bool ath9k_hw_chip_reset(struct a
-+@@ -1516,6 +1532,9 @@ static bool ath9k_hw_chip_reset(struct a
- ar9003_hw_internal_regulator_apply(ah);
- ath9k_hw_init_pll(ah, chan);
-
-@@ -40,7 +40,7 @@
- return true;
- }
-
--@@ -1797,8 +1816,14 @@ static int ath9k_hw_do_fastcc(struct ath
-+@@ -1819,8 +1838,14 @@ static int ath9k_hw_do_fastcc(struct ath
- if (AR_SREV_9271(ah))
- ar9002_hw_load_ani_reg(ah, chan);
-
-@@ -55,7 +55,7 @@
- return -EINVAL;
- }
-
--@@ -2052,6 +2077,9 @@ int ath9k_hw_reset(struct ath_hw *ah, st
-+@@ -2074,6 +2099,9 @@ int ath9k_hw_reset(struct ath_hw *ah, st
- ath9k_hw_set_radar_params(ah);
- }
-
-diff --git a/package/kernel/mac80211/patches/545-ath9k_ani_ws_detect.patch b/package/kernel/mac80211/patches/545-ath9k_ani_ws_detect.patch
-index 3d24ccda1f83daee789973c101bd650df4c1694b..b639f972d83b8966812b98c7b99f546b187001fc 100644
---- a/package/kernel/mac80211/patches/545-ath9k_ani_ws_detect.patch
-+++ b/package/kernel/mac80211/patches/545-ath9k_ani_ws_detect.patch
-@@ -1,6 +1,6 @@
- --- a/drivers/net/wireless/ath/ath9k/ar5008_phy.c
- +++ b/drivers/net/wireless/ath/ath9k/ar5008_phy.c
--@@ -956,55 +956,6 @@ static bool ar5008_hw_ani_control_new(st
-+@@ -954,55 +954,6 @@ static bool ar5008_hw_ani_control_new(st
- * on == 0 means more noise imm
- */
- u32 on = param ? 1 : 0;
-@@ -58,7 +58,7 @@
- REG_SET_BIT(ah, AR_PHY_SFCORR_LOW,
- --- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
- +++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
--@@ -41,20 +41,6 @@ static const int cycpwrThr1_table[] =
-+@@ -42,20 +42,6 @@ static const int cycpwrThr1_table[] =
- /* level: 0 1 2 3 4 5 6 7 8 */
- { -6, -4, -2, 0, 2, 4, 6, 8 }; /* lvl 0-7, default 3 */
-
-@@ -79,7 +79,7 @@
- static const u8 ofdm2pwr[] = {
- ALL_TARGET_LEGACY_6_24,
- ALL_TARGET_LEGACY_6_24,
--@@ -1089,11 +1075,6 @@ static bool ar9003_hw_ani_control(struct
-+@@ -1095,11 +1081,6 @@ static bool ar9003_hw_ani_control(struct
- struct ath_common *common = ath9k_hw_common(ah);
- struct ath9k_channel *chan = ah->curchan;
- struct ar5416AniState *aniState = &ah->ani;
-@@ -91,7 +91,7 @@
- s32 value, value2;
-
- switch (cmd & ah->ani_function) {
--@@ -1107,61 +1088,6 @@ static bool ar9003_hw_ani_control(struct
-+@@ -1113,61 +1094,6 @@ static bool ar9003_hw_ani_control(struct
- */
- u32 on = param ? 1 : 0;
-
-diff --git a/package/kernel/mac80211/patches/546-ath9k_platform_led_name.patch b/package/kernel/mac80211/patches/546-ath9k_platform_led_name.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..ced72c6c69fe30ebbc1c416c5e60d95dc985d6db
---- /dev/null
-+++ b/package/kernel/mac80211/patches/546-ath9k_platform_led_name.patch
-@@ -0,0 +1,39 @@
-+From: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
-+Date: Sun, 31 Jan 2016 20:45:57 +0100
-+Subject: [PATCH v4 1/8] mac80211: ath9k: enable platform WLAN LED name
-+
-+Enable platform-supplied WLAN LED name for ath9k device. It replaces generic
-+'ath9k-phy*' label with string set during platform initialization.
-+
-+Signed-off-by: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
-+---
-+ drivers/net/wireless/ath/ath9k/gpio.c | 10 +++++++---
-+ include/linux/ath9k_platform.h | 1 +
-+ 2 files changed, 8 insertions(+), 3 deletions(-)
-+
-+--- a/drivers/net/wireless/ath/ath9k/gpio.c
-++++ b/drivers/net/wireless/ath/ath9k/gpio.c
-+@@ -155,8 +155,11 @@ void ath_init_leds(struct ath_softc *sc)
-+
-+ ath_fill_led_pin(sc);
-+
-+- snprintf(led_name, sizeof(led_name), "ath9k-%s",
-+- wiphy_name(sc->hw->wiphy));
-++ if (pdata && pdata->led_name)
-++ strncpy(led_name, pdata->led_name, sizeof(led_name));
-++ else
-++ snprintf(led_name, sizeof(led_name), "ath9k-%s",
-++ wiphy_name(sc->hw->wiphy));
-+
-+ if (ath9k_led_blink)
-+ trigger = sc->led_default_trigger;
-+--- a/include/linux/ath9k_platform.h
-++++ b/include/linux/ath9k_platform.h
-+@@ -49,6 +49,7 @@ struct ath9k_platform_data {
-+
-+ int num_leds;
-+ const struct gpio_led *leds;
-++ const char *led_name;
-+ };
-+
-+ #endif /* _LINUX_ATH9K_PLATFORM_H */
-diff --git a/package/kernel/mac80211/patches/547-ath9k_led_defstate_fix.patch b/package/kernel/mac80211/patches/547-ath9k_led_defstate_fix.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..5d84cf0c423a6138b0a48305006202f00e4bbdef
---- /dev/null
-+++ b/package/kernel/mac80211/patches/547-ath9k_led_defstate_fix.patch
-@@ -0,0 +1,29 @@
-+From: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
-+Date: Sun, 31 Jan 2016 20:48:49 +0100
-+Subject: [PATCH v4 2/8] mac80211: ath9k: set default state for platform LEDs
-+
-+Support default state for platform LEDs connected to ath9k device.
-+Now LEDs are correctly set on or off at ath9k module initialization.
-+Very useful if power LED is connected to wireless chip.
-+
-+Signed-off-by: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
-+---
-+ gpio.c | 7 +++++--
-+ 1 file changed, 5 insertions(+), 2 deletions(-)
-+
-+--- a/drivers/net/wireless/ath/ath9k/gpio.c
-++++ b/drivers/net/wireless/ath/ath9k/gpio.c
-+@@ -74,8 +74,11 @@ static int ath_add_led(struct ath_softc
-+ ath9k_hw_gpio_request_out(sc->sc_ah, gpio->gpio, gpio->name,
-+ AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
-+
-+- /* LED off */
-+- ath9k_hw_set_gpio(sc->sc_ah, gpio->gpio, gpio->active_low);
-++ /* Set default LED state */
-++ if (gpio->default_state == LEDS_GPIO_DEFSTATE_ON)
-++ ath9k_hw_set_gpio(sc->sc_ah, gpio->gpio, !gpio->active_low);
-++ else
-++ ath9k_hw_set_gpio(sc->sc_ah, gpio->gpio, gpio->active_low);
-+
-+ return 0;
-+ }
-diff --git a/package/kernel/mac80211/patches/548-ath9k_enable_gpio_chip.patch b/package/kernel/mac80211/patches/548-ath9k_enable_gpio_chip.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..de7c0ac8f034402d6cae563ee3a6b1aafa184ab0
---- /dev/null
-+++ b/package/kernel/mac80211/patches/548-ath9k_enable_gpio_chip.patch
-@@ -0,0 +1,234 @@
-+From: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
-+Date: Sun, 31 Jan 2016 21:01:31 +0100
-+Subject: [PATCH v4 4/8] mac80211: ath9k: enable access to GPIO
-+
-+Enable access to GPIO chip and its pins for Atheros AR92xx
-+wireless devices. For now AR9285 and AR9287 are supported.
-+
-+Signed-off-by: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
-+Signed-off-by: Felix Fietkau <nbd@nbd.name>
-+---
-+--- a/drivers/net/wireless/ath/ath9k/ath9k.h
-++++ b/drivers/net/wireless/ath/ath9k/ath9k.h
-+@@ -24,6 +24,7 @@
-+ #include <linux/completion.h>
-+ #include <linux/time.h>
-+ #include <linux/hw_random.h>
-++#include <linux/gpio/driver.h>
-+
-+ #include "common.h"
-+ #include "debug.h"
-+@@ -960,6 +961,14 @@ struct ath_led {
-+ struct led_classdev cdev;
-+ };
-+
-++#ifdef CONFIG_GPIOLIB
-++struct ath9k_gpio_chip {
-++ struct ath_softc *sc;
-++ char label[32];
-++ struct gpio_chip gchip;
-++};
-++#endif
-++
-+ struct ath_softc {
-+ struct ieee80211_hw *hw;
-+ struct device *dev;
-+@@ -1014,6 +1023,9 @@ struct ath_softc {
-+ #ifdef CPTCFG_MAC80211_LEDS
-+ const char *led_default_trigger;
-+ struct list_head leds;
-++#ifdef CONFIG_GPIOLIB
-++ struct ath9k_gpio_chip *gpiochip;
-++#endif
-+ #endif
-+
-+ #ifdef CPTCFG_ATH9K_DEBUGFS
-+--- a/drivers/net/wireless/ath/ath9k/gpio.c
-++++ b/drivers/net/wireless/ath/ath9k/gpio.c
-+@@ -16,13 +16,135 @@
-+
-+ #include "ath9k.h"
-+ #include <linux/ath9k_platform.h>
-++#include <linux/gpio.h>
-++
-++#ifdef CPTCFG_MAC80211_LEDS
-++
-++#ifdef CONFIG_GPIOLIB
-++
-++/***************/
-++/* GPIO Chip */
-++/***************/
-++
-++/* gpio_chip handler : set GPIO to input */
-++static int ath9k_gpio_pin_cfg_input(struct gpio_chip *chip, unsigned offset)
-++{
-++ struct ath9k_gpio_chip *gc = container_of(chip, struct ath9k_gpio_chip,
-++ gchip);
-++
-++ ath9k_hw_gpio_request_in(gc->sc->sc_ah, offset, "ath9k-gpio");
-++
-++ return 0;
-++}
-++
-++/* gpio_chip handler : set GPIO to output */
-++static int ath9k_gpio_pin_cfg_output(struct gpio_chip *chip, unsigned offset,
-++ int value)
-++{
-++ struct ath9k_gpio_chip *gc = container_of(chip, struct ath9k_gpio_chip,
-++ gchip);
-++
-++ ath9k_hw_gpio_request_out(gc->sc->sc_ah, offset, "ath9k-gpio",
-++ AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
-++ ath9k_hw_set_gpio(gc->sc->sc_ah, offset, value);
-++
-++ return 0;
-++}
-++
-++/* gpio_chip handler : query GPIO direction (0=out, 1=in) */
-++static int ath9k_gpio_pin_get_dir(struct gpio_chip *chip, unsigned offset)
-++{
-++ struct ath9k_gpio_chip *gc = container_of(chip, struct ath9k_gpio_chip,
-++ gchip);
-++ struct ath_hw *ah = gc->sc->sc_ah;
-++
-++ return !((REG_READ(ah, AR_GPIO_OE_OUT) >> (offset * 2)) & 3);
-++}
-++
-++/* gpio_chip handler : get GPIO pin value */
-++static int ath9k_gpio_pin_get(struct gpio_chip *chip, unsigned offset)
-++{
-++ struct ath9k_gpio_chip *gc = container_of(chip, struct ath9k_gpio_chip,
-++ gchip);
-++
-++ return ath9k_hw_gpio_get(gc->sc->sc_ah, offset);
-++}
-++
-++/* gpio_chip handler : set GPIO pin to value */
-++static void ath9k_gpio_pin_set(struct gpio_chip *chip, unsigned offset,
-++ int value)
-++{
-++ struct ath9k_gpio_chip *gc = container_of(chip, struct ath9k_gpio_chip,
-++ gchip);
-++
-++ ath9k_hw_set_gpio(gc->sc->sc_ah, offset, value);
-++}
-++
-++/* register GPIO chip */
-++static void ath9k_register_gpio_chip(struct ath_softc *sc)
-++{
-++ struct ath9k_gpio_chip *gc;
-++ struct ath_hw *ah = sc->sc_ah;
-++
-++ gc = kzalloc(sizeof(struct ath9k_gpio_chip), GFP_KERNEL);
-++ if (!gc)
-++ return;
-++
-++ snprintf(gc->label, sizeof(gc->label), "ath9k-%s",
-++ wiphy_name(sc->hw->wiphy));
-++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,5,0)
-++ gc->gchip.parent = sc->dev;
-++#else
-++ gc->gchip.dev = sc->dev;
-++#endif
-++ gc->gchip.label = gc->label;
-++ gc->gchip.base = -1; /* determine base automatically */
-++ gc->gchip.ngpio = ah->caps.num_gpio_pins;
-++ gc->gchip.direction_input = ath9k_gpio_pin_cfg_input;
-++ gc->gchip.direction_output = ath9k_gpio_pin_cfg_output;
-++ gc->gchip.get_direction = ath9k_gpio_pin_get_dir;
-++ gc->gchip.get = ath9k_gpio_pin_get;
-++ gc->gchip.set = ath9k_gpio_pin_set;
-++
-++ if (gpiochip_add(&gc->gchip)) {
-++ kfree(gc);
-++ return;
-++ }
-++
-++ gc->gchip.owner = NULL;
-++ sc->gpiochip = gc;
-++ gc->sc = sc;
-++}
-++
-++/* remove GPIO chip */
-++static void ath9k_unregister_gpio_chip(struct ath_softc *sc)
-++{
-++ struct ath9k_gpio_chip *gc = sc->gpiochip;
-++
-++ if (!gc)
-++ return;
-++
-++ gpiochip_remove(&gc->gchip);
-++ kfree(gc);
-++ sc->gpiochip = NULL;
-++}
-++
-++#else /* CONFIG_GPIOLIB */
-++
-++static inline void ath9k_register_gpio_chip(struct ath_softc *sc)
-++{
-++}
-++
-++static inline void ath9k_unregister_gpio_chip(struct ath_softc *sc)
-++{
-++}
-++
-++#endif /* CONFIG_GPIOLIB */
-+
-+ /********************************/
-+ /* LED functions */
-+ /********************************/
-+
-+-#ifdef CPTCFG_MAC80211_LEDS
-+-
-+ static void ath_fill_led_pin(struct ath_softc *sc)
-+ {
-+ struct ath_hw *ah = sc->sc_ah;
-+@@ -80,6 +202,12 @@ static int ath_add_led(struct ath_softc
-+ else
-+ ath9k_hw_set_gpio(sc->sc_ah, gpio->gpio, gpio->active_low);
-+
-++#ifdef CONFIG_GPIOLIB
-++ /* If there is GPIO chip configured, reserve LED pin */
-++ if (sc->gpiochip)
-++ gpio_request(sc->gpiochip->gchip.base + gpio->gpio, gpio->name);
-++#endif
-++
-+ return 0;
-+ }
-+
-+@@ -136,12 +264,18 @@ void ath_deinit_leds(struct ath_softc *s
-+
-+ while (!list_empty(&sc->leds)) {
-+ led = list_first_entry(&sc->leds, struct ath_led, list);
-++#ifdef CONFIG_GPIOLIB
-++ /* If there is GPIO chip configured, free LED pin */
-++ if (sc->gpiochip)
-++ gpio_free(sc->gpiochip->gchip.base + led->gpio->gpio);
-++#endif
-+ list_del(&led->list);
-+ ath_led_brightness(&led->cdev, LED_OFF);
-+ led_classdev_unregister(&led->cdev);
-+ ath9k_hw_gpio_free(sc->sc_ah, led->gpio->gpio);
-+ kfree(led);
-+ }
-++ ath9k_unregister_gpio_chip(sc);
-+ }
-+
-+ void ath_init_leds(struct ath_softc *sc)
-+@@ -158,6 +292,8 @@ void ath_init_leds(struct ath_softc *sc)
-+
-+ ath_fill_led_pin(sc);
-+
-++ ath9k_register_gpio_chip(sc);
-++
-+ if (pdata && pdata->led_name)
-+ strncpy(led_name, pdata->led_name, sizeof(led_name));
-+ else
-+@@ -178,6 +314,7 @@ void ath_init_leds(struct ath_softc *sc)
-+ for (i = 0; i < pdata->num_leds; i++)
-+ ath_create_platform_led(sc, &pdata->leds[i]);
-+ }
-++
-+ #endif
-+
-+ /*******************/
-diff --git a/package/kernel/mac80211/patches/549-ath9k_enable_gpio_buttons.patch b/package/kernel/mac80211/patches/549-ath9k_enable_gpio_buttons.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..b9d18834393dca078e444950c77642095a83f401
---- /dev/null
-+++ b/package/kernel/mac80211/patches/549-ath9k_enable_gpio_buttons.patch
-@@ -0,0 +1,149 @@
-+From: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
-+Subject: [PATCH v5 5/8] mac80211: ath9k: enable GPIO buttons
-+
-+Enable platform-defined GPIO button support for ath9k device.
-+Key poller is activated for attached platform buttons.
-+Requires ath9k GPIO chip access.
-+
-+Signed-off-by: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
-+Signed-off-by: Felix Fietkau <nbd@nbd.name>
-+---
-+--- a/drivers/net/wireless/ath/ath9k/ath9k.h
-++++ b/drivers/net/wireless/ath/ath9k/ath9k.h
-+@@ -1025,6 +1025,7 @@ struct ath_softc {
-+ struct list_head leds;
-+ #ifdef CONFIG_GPIOLIB
-+ struct ath9k_gpio_chip *gpiochip;
-++ struct platform_device *btnpdev; /* gpio-keys-polled */
-+ #endif
-+ #endif
-+
-+--- a/drivers/net/wireless/ath/ath9k/gpio.c
-++++ b/drivers/net/wireless/ath/ath9k/gpio.c
-+@@ -17,6 +17,8 @@
-+ #include "ath9k.h"
-+ #include <linux/ath9k_platform.h>
-+ #include <linux/gpio.h>
-++#include <linux/platform_device.h>
-++#include <linux/gpio_keys.h>
-+
-+ #ifdef CPTCFG_MAC80211_LEDS
-+
-+@@ -129,6 +131,64 @@ static void ath9k_unregister_gpio_chip(s
-+ sc->gpiochip = NULL;
-+ }
-+
-++/******************/
-++/* GPIO Buttons */
-++/******************/
-++
-++/* add GPIO buttons */
-++static void ath9k_init_buttons(struct ath_softc *sc)
-++{
-++ struct ath9k_platform_data *pdata = sc->dev->platform_data;
-++ struct platform_device *pdev;
-++ struct gpio_keys_platform_data gkpdata;
-++ struct gpio_keys_button *bt;
-++ int i;
-++
-++ if (!sc->gpiochip)
-++ return;
-++
-++ if (!pdata || !pdata->btns || !pdata->num_btns)
-++ return;
-++
-++ bt = devm_kmemdup(sc->dev, pdata->btns,
-++ pdata->num_btns * sizeof(struct gpio_keys_button),
-++ GFP_KERNEL);
-++ if (!bt)
-++ return;
-++
-++ for (i = 0; i < pdata->num_btns; i++) {
-++ ath9k_hw_gpio_request_in(sc->sc_ah, pdata->btns[i].gpio,
-++ "ath9k-gpio");
-++ bt[i].gpio = sc->gpiochip->gchip.base + pdata->btns[i].gpio;
-++ }
-++
-++ memset(&gkpdata, 0, sizeof(struct gpio_keys_platform_data));
-++ gkpdata.buttons = bt;
-++ gkpdata.nbuttons = pdata->num_btns;
-++ gkpdata.poll_interval = pdata->btn_poll_interval;
-++
-++ pdev = platform_device_register_data(sc->dev, "gpio-keys-polled",
-++ PLATFORM_DEVID_AUTO, &gkpdata,
-++ sizeof(gkpdata));
-++ if (!IS_ERR_OR_NULL(pdev))
-++ sc->btnpdev = pdev;
-++ else {
-++ sc->btnpdev = NULL;
-++ devm_kfree(sc->dev, bt);
-++ }
-++}
-++
-++/* remove GPIO buttons */
-++static void ath9k_deinit_buttons(struct ath_softc *sc)
-++{
-++ if (!sc->gpiochip || !sc->btnpdev)
-++ return;
-++
-++ platform_device_unregister(sc->btnpdev);
-++
-++ sc->btnpdev = NULL;
-++}
-++
-+ #else /* CONFIG_GPIOLIB */
-+
-+ static inline void ath9k_register_gpio_chip(struct ath_softc *sc)
-+@@ -139,6 +199,14 @@ static inline void ath9k_unregister_gpio
-+ {
-+ }
-+
-++static inline void ath9k_init_buttons(struct ath_softc *sc)
-++{
-++}
-++
-++static inline void ath9k_deinit_buttons(struct ath_softc *sc)
-++{
-++}
-++
-+ #endif /* CONFIG_GPIOLIB */
-+
-+ /********************************/
-+@@ -262,6 +330,7 @@ void ath_deinit_leds(struct ath_softc *s
-+ {
-+ struct ath_led *led;
-+
-++ ath9k_deinit_buttons(sc);
-+ while (!list_empty(&sc->leds)) {
-+ led = list_first_entry(&sc->leds, struct ath_led, list);
-+ #ifdef CONFIG_GPIOLIB
-+@@ -293,6 +362,7 @@ void ath_init_leds(struct ath_softc *sc)
-+ ath_fill_led_pin(sc);
-+
-+ ath9k_register_gpio_chip(sc);
-++ ath9k_init_buttons(sc);
-+
-+ if (pdata && pdata->led_name)
-+ strncpy(led_name, pdata->led_name, sizeof(led_name));
-+@@ -308,7 +378,7 @@ void ath_init_leds(struct ath_softc *sc)
-+ ath_create_gpio_led(sc, sc->sc_ah->led_pin, led_name, trigger,
-+ !sc->sc_ah->config.led_active_high);
-+
-+- if (!pdata)
-++ if (!pdata || !pdata->leds || !pdata->num_leds)
-+ return;
-+
-+ for (i = 0; i < pdata->num_leds; i++)
-+--- a/include/linux/ath9k_platform.h
-++++ b/include/linux/ath9k_platform.h
-+@@ -50,6 +50,10 @@ struct ath9k_platform_data {
-+ int num_leds;
-+ const struct gpio_led *leds;
-+ const char *led_name;
-++
-++ unsigned num_btns;
-++ const struct gpio_keys_button *btns;
-++ unsigned btn_poll_interval;
-+ };
-+
-+ #endif /* _LINUX_ATH9K_PLATFORM_H */
-diff --git a/package/kernel/mac80211/patches/600-0002-rt2x00-rt2800lib-introduce-RT2800_HAS_HIGH_SHARED_ME.patch b/package/kernel/mac80211/patches/600-0002-rt2x00-rt2800lib-introduce-RT2800_HAS_HIGH_SHARED_ME.patch
-index 82459091fe47c8b2fb17c88ed9cef1c1b9502280..db70a334bde149dd28461161f69b4f36623a9db4 100644
---- a/package/kernel/mac80211/patches/600-0002-rt2x00-rt2800lib-introduce-RT2800_HAS_HIGH_SHARED_ME.patch
-+++ b/package/kernel/mac80211/patches/600-0002-rt2x00-rt2800lib-introduce-RT2800_HAS_HIGH_SHARED_ME.patch
-@@ -24,7 +24,7 @@ Changes since v1:
-
- --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
- +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
--@@ -7722,6 +7722,7 @@ static int rt2800_probe_rt(struct rt2x00
-+@@ -7726,6 +7726,7 @@ static int rt2800_probe_rt(struct rt2x00
-
- int rt2800_probe_hw(struct rt2x00_dev *rt2x00dev)
- {
-@@ -32,7 +32,7 @@ Changes since v1:
- int retval;
- u32 reg;
-
--@@ -7729,6 +7730,9 @@ int rt2800_probe_hw(struct rt2x00_dev *r
-+@@ -7733,6 +7734,9 @@ int rt2800_probe_hw(struct rt2x00_dev *r
- if (retval)
- return retval;
-
-diff --git a/package/kernel/mac80211/patches/600-0003-rt2x00-rt2800-serialize-shared-memory-access.patch b/package/kernel/mac80211/patches/600-0003-rt2x00-rt2800-serialize-shared-memory-access.patch
-index 7abfcd16f2e68354cb990b85d75c792fe9468fcb..a3b62bcc14d62f0930e264fc61c7d7668964db88 100644
---- a/package/kernel/mac80211/patches/600-0003-rt2x00-rt2800-serialize-shared-memory-access.patch
-+++ b/package/kernel/mac80211/patches/600-0003-rt2x00-rt2800-serialize-shared-memory-access.patch
-@@ -239,7 +239,7 @@ Changes since v1: ---
- msleep(1);
-
- /*
--@@ -7726,6 +7774,8 @@ int rt2800_probe_hw(struct rt2x00_dev *r
-+@@ -7730,6 +7778,8 @@ int rt2800_probe_hw(struct rt2x00_dev *r
- int retval;
- u32 reg;
-
-@@ -248,7 +248,7 @@ Changes since v1: ---
- retval = rt2800_probe_rt(rt2x00dev);
- if (retval)
- return retval;
--@@ -7809,8 +7859,11 @@ void rt2800_get_key_seq(struct ieee80211
-+@@ -7813,8 +7863,11 @@ void rt2800_get_key_seq(struct ieee80211
- return;
-
- offset = MAC_IVEIV_ENTRY(key->hw_key_idx);
-diff --git a/package/kernel/mac80211/patches/600-0005-rt2x00-rt2800lib-add-hw_beacon_count-field-to-struct.patch b/package/kernel/mac80211/patches/600-0005-rt2x00-rt2800lib-add-hw_beacon_count-field-to-struct.patch
-index 02b2acfeee4c40af3f4739362d12ca0ce7f5e587..f41a160d3f953fca0695d8dadfca589f810a24e6 100644
---- a/package/kernel/mac80211/patches/600-0005-rt2x00-rt2800lib-add-hw_beacon_count-field-to-struct.patch
-+++ b/package/kernel/mac80211/patches/600-0005-rt2x00-rt2800lib-add-hw_beacon_count-field-to-struct.patch
-@@ -41,7 +41,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
- rt2800_clear_beacon_register(rt2x00dev, i);
-
- if (rt2x00_is_usb(rt2x00dev)) {
--@@ -7827,6 +7828,8 @@ int rt2800_probe_hw(struct rt2x00_dev *r
-+@@ -7831,6 +7832,8 @@ int rt2800_probe_hw(struct rt2x00_dev *r
- if (rt2x00_rt(rt2x00dev, RT3593))
- __set_bit(RT2800_HAS_HIGH_SHARED_MEM, &drv_data->rt2800_flags);
-
-diff --git a/package/kernel/mac80211/patches/600-0007-rt2x00-rt2800lib-fix-max-supported-beacon-count-for-.patch b/package/kernel/mac80211/patches/600-0007-rt2x00-rt2800lib-fix-max-supported-beacon-count-for-.patch
-index e90927271090fafef5f2e1b33be1a43f2a0eeba8..5099c64492e4f1c6f96657d4c738f094a919d7fc 100644
---- a/package/kernel/mac80211/patches/600-0007-rt2x00-rt2800lib-fix-max-supported-beacon-count-for-.patch
-+++ b/package/kernel/mac80211/patches/600-0007-rt2x00-rt2800lib-fix-max-supported-beacon-count-for-.patch
-@@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
-
- --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
- +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
--@@ -7852,7 +7852,10 @@ int rt2800_probe_hw(struct rt2x00_dev *r
-+@@ -7856,7 +7856,10 @@ int rt2800_probe_hw(struct rt2x00_dev *r
- if (rt2x00_rt(rt2x00dev, RT3593))
- __set_bit(RT2800_HAS_HIGH_SHARED_MEM, &drv_data->rt2800_flags);
-
-diff --git a/package/kernel/mac80211/patches/600-0009-rt2x00-rt2800lib-enable-support-for-RT3883.patch b/package/kernel/mac80211/patches/600-0009-rt2x00-rt2800lib-enable-support-for-RT3883.patch
-index 7fe38e0958a170f6f127fedc3764a0df87163180..a2e701527b99a4e9f1f8beb3a0fffd48d07c0bef 100644
---- a/package/kernel/mac80211/patches/600-0009-rt2x00-rt2800lib-enable-support-for-RT3883.patch
-+++ b/package/kernel/mac80211/patches/600-0009-rt2x00-rt2800lib-enable-support-for-RT3883.patch
-@@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
-
- --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
- +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
--@@ -7822,6 +7822,7 @@ static int rt2800_probe_rt(struct rt2x00
-+@@ -7826,6 +7826,7 @@ static int rt2800_probe_rt(struct rt2x00
- case RT3390:
- case RT3572:
- case RT3593:
-diff --git a/package/kernel/mac80211/patches/600-0010-rt2x00-rt2800lib-add-rf_vals-for-RF3853.patch b/package/kernel/mac80211/patches/600-0010-rt2x00-rt2800lib-add-rf_vals-for-RF3853.patch
-index 253a0c0c1e67def822917c469a41bea3b2d0c862..89bd0acb87a0599962efd1d82a61512d45890b4c 100644
---- a/package/kernel/mac80211/patches/600-0010-rt2x00-rt2800lib-add-rf_vals-for-RF3853.patch
-+++ b/package/kernel/mac80211/patches/600-0010-rt2x00-rt2800lib-add-rf_vals-for-RF3853.patch
-@@ -98,7 +98,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
- static const struct rf_channel rf_vals_5592_xtal20[] = {
- /* Channel, N, K, mod, R */
- {1, 482, 4, 10, 3},
--@@ -7669,6 +7729,11 @@ static int rt2800_probe_hw_mode(struct r
-+@@ -7673,6 +7733,11 @@ static int rt2800_probe_hw_mode(struct r
- spec->channels = rf_vals_3x;
- break;
-
-diff --git a/package/kernel/mac80211/patches/600-0011-rt2x00-rt2800lib-enable-VCO-calibration-for-RF3853.patch b/package/kernel/mac80211/patches/600-0011-rt2x00-rt2800lib-enable-VCO-calibration-for-RF3853.patch
-index f15c22b30f8e517e10f71c64082e8bea3a2b1d63..b7efc9f31bed7a4afd9a52d9f05b2aa4ca46e320 100644
---- a/package/kernel/mac80211/patches/600-0011-rt2x00-rt2800lib-enable-VCO-calibration-for-RF3853.patch
-+++ b/package/kernel/mac80211/patches/600-0011-rt2x00-rt2800lib-enable-VCO-calibration-for-RF3853.patch
-@@ -18,7 +18,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
- case RF5360:
- case RF5362:
- case RF5370:
--@@ -7848,6 +7849,7 @@ static int rt2800_probe_hw_mode(struct r
-+@@ -7852,6 +7853,7 @@ static int rt2800_probe_hw_mode(struct r
- case RF3053:
- case RF3070:
- case RF3290:
-diff --git a/package/kernel/mac80211/patches/600-0026-rt2x00-rt2800lib-use-correct-beacon-count-for-RT3883.patch b/package/kernel/mac80211/patches/600-0026-rt2x00-rt2800lib-use-correct-beacon-count-for-RT3883.patch
-index 6ce224aba27242f5e55030a396ea044d16528653..220e35fe4c201bed6678fb4a8e293563c41c1240 100644
---- a/package/kernel/mac80211/patches/600-0026-rt2x00-rt2800lib-use-correct-beacon-count-for-RT3883.patch
-+++ b/package/kernel/mac80211/patches/600-0026-rt2x00-rt2800lib-use-correct-beacon-count-for-RT3883.patch
-@@ -10,7 +10,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
-
- --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
- +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
--@@ -8403,7 +8403,8 @@ int rt2800_probe_hw(struct rt2x00_dev *r
-+@@ -8407,7 +8407,8 @@ int rt2800_probe_hw(struct rt2x00_dev *r
- if (rt2x00_rt(rt2x00dev, RT3593))
- __set_bit(RT2800_HAS_HIGH_SHARED_MEM, &drv_data->rt2800_flags);
-
-diff --git a/package/kernel/mac80211/patches/600-0032-rt2x00-rt2800lib-enable-RT2800_HAS_HIGH_SHARED_MEM-f.patch b/package/kernel/mac80211/patches/600-0032-rt2x00-rt2800lib-enable-RT2800_HAS_HIGH_SHARED_MEM-f.patch
-index 25753af81b2bf911fec969118e81c90a6c95e975..2ffa5a4162f65c0451e2462842c5801fade1c25d 100644
---- a/package/kernel/mac80211/patches/600-0032-rt2x00-rt2800lib-enable-RT2800_HAS_HIGH_SHARED_MEM-f.patch
-+++ b/package/kernel/mac80211/patches/600-0032-rt2x00-rt2800lib-enable-RT2800_HAS_HIGH_SHARED_MEM-f.patch
-@@ -11,7 +11,7 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
-
- --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
- +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
--@@ -8416,7 +8416,8 @@ int rt2800_probe_hw(struct rt2x00_dev *r
-+@@ -8420,7 +8420,8 @@ int rt2800_probe_hw(struct rt2x00_dev *r
- if (retval)
- return retval;
-
-diff --git a/package/kernel/mac80211/patches/602-rt2x00-introduce-rt2x00_platform_h.patch b/package/kernel/mac80211/patches/602-rt2x00-introduce-rt2x00_platform_h.patch
-index 7a183a404bae73cdcc120b41e83910ab579974ea..daa5dc61f9db18ba73cc19ea908587bb868bf292 100644
---- a/package/kernel/mac80211/patches/602-rt2x00-introduce-rt2x00_platform_h.patch
-+++ b/package/kernel/mac80211/patches/602-rt2x00-introduce-rt2x00_platform_h.patch
-@@ -22,10 +22,10 @@
- +#endif /* _RT2X00_PLATFORM_H */
- --- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h
- +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h
--@@ -38,6 +38,7 @@
-- #include <linux/kfifo.h>
-+@@ -39,6 +39,7 @@
- #include <linux/hrtimer.h>
- #include <linux/average.h>
-+ #include <linux/usb.h>
- +#include <linux/rt2x00_platform.h>
-
- #include <net/mac80211.h>
-diff --git a/package/kernel/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch b/package/kernel/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch
-index bc056cd7357f57570168e5c1a4dbd4b9acd9a3c3..8ae5da38797df39f8bc13e3eace5f2f9496cde9c 100644
---- a/package/kernel/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch
-+++ b/package/kernel/mac80211/patches/603-rt2x00-introduce-rt2x00eeprom.patch
-@@ -1,6 +1,6 @@
- --- a/.local-symbols
- +++ b/.local-symbols
--@@ -329,6 +329,7 @@ RT2X00_LIB_FIRMWARE=
-+@@ -331,6 +331,7 @@ RT2X00_LIB_FIRMWARE=
- RT2X00_LIB_CRYPTO=
- RT2X00_LIB_LEDS=
- RT2X00_LIB_DEBUGFS=
-@@ -105,7 +105,7 @@
- .drv_init_registers = rt2800mmio_init_registers,
- --- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h
- +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h
--@@ -697,6 +697,7 @@ enum rt2x00_capability_flags {
-+@@ -699,6 +699,7 @@ enum rt2x00_capability_flags {
- REQUIRE_HT_TX_DESC,
- REQUIRE_PS_AUTOWAKE,
- REQUIRE_DELAYED_RFKILL,
-@@ -127,7 +127,7 @@
- DECLARE_KFIFO_PTR(txstatus_fifo, u32);
- --- a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
- +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
--@@ -1335,6 +1335,10 @@ int rt2x00lib_probe_dev(struct rt2x00_de
-+@@ -1334,6 +1334,10 @@ int rt2x00lib_probe_dev(struct rt2x00_de
- INIT_DELAYED_WORK(&rt2x00dev->autowakeup_work, rt2x00lib_autowakeup);
- INIT_WORK(&rt2x00dev->sleep_work, rt2x00lib_sleep);
-
-@@ -138,7 +138,7 @@
- /*
- * Let the driver probe the device to detect the capabilities.
- */
--@@ -1475,6 +1479,11 @@ void rt2x00lib_remove_dev(struct rt2x00_
-+@@ -1477,6 +1481,11 @@ void rt2x00lib_remove_dev(struct rt2x00_
- * Free the driver data.
- */
- kfree(rt2x00dev->drv_data);
-diff --git a/package/kernel/mac80211/patches/607-rt2x00-allow_disabling_bands_through_platform_data.patch b/package/kernel/mac80211/patches/607-rt2x00-allow_disabling_bands_through_platform_data.patch
-index d923e05c770f2f325d7b47a9a5c9bcdf63cbbbdc..a2e1faf9c3793b51f912c743a38f7a9afd3bd0a0 100644
---- a/package/kernel/mac80211/patches/607-rt2x00-allow_disabling_bands_through_platform_data.patch
-+++ b/package/kernel/mac80211/patches/607-rt2x00-allow_disabling_bands_through_platform_data.patch
-@@ -37,7 +37,7 @@
- num_rates += 4;
- --- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h
- +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h
--@@ -405,6 +405,7 @@ struct hw_mode_spec {
-+@@ -406,6 +406,7 @@ struct hw_mode_spec {
- unsigned int supported_bands;
- #define SUPPORT_BAND_2GHZ 0x00000001
- #define SUPPORT_BAND_5GHZ 0x00000002
-diff --git a/package/kernel/mac80211/patches/608-add_platform_data_mac_addr.patch b/package/kernel/mac80211/patches/608-add_platform_data_mac_addr.patch
-index a645ba176e4ab17046945a87bb97359602b675c6..6704ff835c186b575b79c62ad6d83021fee3ee8a 100644
---- a/package/kernel/mac80211/patches/608-add_platform_data_mac_addr.patch
-+++ b/package/kernel/mac80211/patches/608-add_platform_data_mac_addr.patch
-@@ -31,7 +31,7 @@
- {
- --- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h
- +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h
--@@ -1414,6 +1414,7 @@ static inline void rt2x00debug_dump_fram
-+@@ -1416,6 +1416,7 @@ static inline void rt2x00debug_dump_fram
- */
- u32 rt2x00lib_get_bssidx(struct rt2x00_dev *rt2x00dev,
- struct ieee80211_vif *vif);
-diff --git a/package/kernel/mac80211/patches/610-rt2x00-fix-rt3352-ext-pa.patch b/package/kernel/mac80211/patches/610-rt2x00-fix-rt3352-ext-pa.patch
-index c69d33025d91dfb49ec411cbe2fc506ba67d03ff..9f10fe35c3a5c599bf3fb897583481a0971ef475 100644
---- a/package/kernel/mac80211/patches/610-rt2x00-fix-rt3352-ext-pa.patch
-+++ b/package/kernel/mac80211/patches/610-rt2x00-fix-rt3352-ext-pa.patch
-@@ -200,7 +200,7 @@
- * EEPROM frequency
- --- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h
- +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h
--@@ -717,6 +717,8 @@ enum rt2x00_capability_flags {
-+@@ -719,6 +719,8 @@ enum rt2x00_capability_flags {
- CAPABILITY_DOUBLE_ANTENNA,
- CAPABILITY_BT_COEXIST,
- CAPABILITY_VCO_RECALIBRATION,
-diff --git a/package/kernel/mac80211/patches/611-rt2x00-rf_vals-rt3352-xtal20.patch b/package/kernel/mac80211/patches/611-rt2x00-rf_vals-rt3352-xtal20.patch
-index b44fe900d53f87580ab8c0e502bc7f94958e6109..860fdc07ede072fce1cd65b177115dfd4dc30c03 100644
---- a/package/kernel/mac80211/patches/611-rt2x00-rf_vals-rt3352-xtal20.patch
-+++ b/package/kernel/mac80211/patches/611-rt2x00-rf_vals-rt3352-xtal20.patch
-@@ -28,7 +28,7 @@
- static int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
- {
- struct hw_mode_spec *spec = &rt2x00dev->spec;
--@@ -8272,7 +8293,10 @@ static int rt2800_probe_hw_mode(struct r
-+@@ -8276,7 +8297,10 @@ static int rt2800_probe_hw_mode(struct r
- case RF5390:
- case RF5392:
- spec->num_channels = 14;
-@@ -40,7 +40,7 @@
- break;
-
- case RF3052:
--@@ -8456,6 +8480,19 @@ static int rt2800_probe_rt(struct rt2x00
-+@@ -8460,6 +8484,19 @@ static int rt2800_probe_rt(struct rt2x00
- return 0;
- }
-
-@@ -60,7 +60,7 @@
- int rt2800_probe_hw(struct rt2x00_dev *rt2x00dev)
- {
- struct rt2800_drv_data *drv_data = rt2x00dev->drv_data;
--@@ -8498,6 +8535,15 @@ int rt2800_probe_hw(struct rt2x00_dev *r
-+@@ -8502,6 +8539,15 @@ int rt2800_probe_hw(struct rt2x00_dev *r
- rt2800_register_write(rt2x00dev, GPIO_CTRL, reg);
-
- /*
-@@ -78,7 +78,7 @@
- retval = rt2800_probe_hw_mode(rt2x00dev);
- --- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h
- +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h
--@@ -400,6 +400,7 @@ static inline struct rt2x00_intf* vif_to
-+@@ -401,6 +401,7 @@ static inline struct rt2x00_intf* vif_to
- * @channels: Device/chipset specific channel values (See &struct rf_channel).
- * @channels_info: Additional information for channels (See &struct channel_info).
- * @ht: Driver HT Capabilities (See &ieee80211_sta_ht_cap).
-@@ -86,7 +86,7 @@
- */
- struct hw_mode_spec {
- unsigned int supported_bands;
--@@ -416,6 +417,7 @@ struct hw_mode_spec {
-+@@ -417,6 +418,7 @@ struct hw_mode_spec {
- const struct channel_info *channels_info;
-
- struct ieee80211_sta_ht_cap ht;
-diff --git a/package/kernel/mac80211/patches/615-rt2x00-fix_20mhz_clk.patch b/package/kernel/mac80211/patches/615-rt2x00-fix_20mhz_clk.patch
-index 8e3bd2a3622c1954a01ed548c71e436be9e92d8e..e7b2a8ca896118d5733e81a44ffb3a37502aeb42 100644
---- a/package/kernel/mac80211/patches/615-rt2x00-fix_20mhz_clk.patch
-+++ b/package/kernel/mac80211/patches/615-rt2x00-fix_20mhz_clk.patch
-@@ -8,7 +8,7 @@
-
- #include "rt2x00.h"
- #include "rt2800lib.h"
--@@ -8482,13 +8483,14 @@ static int rt2800_probe_rt(struct rt2x00
-+@@ -8486,13 +8487,14 @@ static int rt2800_probe_rt(struct rt2x00
-
- int rt2800_probe_clk(struct rt2x00_dev *rt2x00dev)
- {
-diff --git a/package/kernel/mac80211/patches/616-rt2x00-support-rt5350.patch b/package/kernel/mac80211/patches/616-rt2x00-support-rt5350.patch
-index faa5879de68b0ec27d0099b51e296cfd7ccf7416..44bd8a194b23f9ef807fb66e99f6695998fc844c 100644
---- a/package/kernel/mac80211/patches/616-rt2x00-support-rt5350.patch
-+++ b/package/kernel/mac80211/patches/616-rt2x00-support-rt5350.patch
-@@ -240,7 +240,7 @@
- case RF5360:
- case RF5362:
- case RF5370:
--@@ -8287,6 +8398,7 @@ static int rt2800_probe_hw_mode(struct r
-+@@ -8291,6 +8402,7 @@ static int rt2800_probe_hw_mode(struct r
- case RF3290:
- case RF3320:
- case RF3322:
-@@ -248,7 +248,7 @@
- case RF5360:
- case RF5362:
- case RF5370:
--@@ -8426,6 +8538,7 @@ static int rt2800_probe_hw_mode(struct r
-+@@ -8430,6 +8542,7 @@ static int rt2800_probe_hw_mode(struct r
- case RF3070:
- case RF3290:
- case RF3853:
-@@ -256,7 +256,7 @@
- case RF5360:
- case RF5362:
- case RF5370:
--@@ -8466,6 +8579,7 @@ static int rt2800_probe_rt(struct rt2x00
-+@@ -8470,6 +8583,7 @@ static int rt2800_probe_rt(struct rt2x00
- case RT3572:
- case RT3593:
- case RT3883:
-@@ -266,7 +266,7 @@
- case RT5592:
- --- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h
- +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h
--@@ -169,6 +169,7 @@ struct rt2x00_chip {
-+@@ -170,6 +170,7 @@ struct rt2x00_chip {
- #define RT3572 0x3572
- #define RT3593 0x3593
- #define RT3883 0x3883 /* WSOC */
-diff --git a/package/kernel/mac80211/patches/620-rt2x00-add-AP+STA-support.patch b/package/kernel/mac80211/patches/620-rt2x00-add-AP+STA-support.patch
-index 55452b9ebde82e716e9fbf557db07abdde07dce5..dba6033edb83aaec0943a523dc1bf2c8f3ba5b31 100644
---- a/package/kernel/mac80211/patches/620-rt2x00-add-AP+STA-support.patch
-+++ b/package/kernel/mac80211/patches/620-rt2x00-add-AP+STA-support.patch
-@@ -1,6 +1,6 @@
- --- a/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
- +++ b/drivers/net/wireless/ralink/rt2x00/rt2x00dev.c
--@@ -1284,7 +1284,7 @@ static inline void rt2x00lib_set_if_comb
-+@@ -1283,7 +1283,7 @@ static inline void rt2x00lib_set_if_comb
- */
- if_limit = &rt2x00dev->if_limits_ap;
- if_limit->max = rt2x00dev->ops->max_ap_intf;
-diff --git a/package/kernel/mac80211/patches/801-libertas-configure-sysfs-links.patch b/package/kernel/mac80211/patches/801-libertas-configure-sysfs-links.patch
-index fd885cc002461dbdb4b21f3bc4c5ae97c6609ad3..02f3053b2f34305e5db0a953aee3378fc17f351f 100644
---- a/package/kernel/mac80211/patches/801-libertas-configure-sysfs-links.patch
-+++ b/package/kernel/mac80211/patches/801-libertas-configure-sysfs-links.patch
-@@ -1,6 +1,6 @@
- --- a/drivers/net/wireless/marvell/libertas/cfg.c
- +++ b/drivers/net/wireless/marvell/libertas/cfg.c
--@@ -2084,6 +2084,8 @@ struct wireless_dev *lbs_cfg_alloc(struc
-+@@ -2122,6 +2122,8 @@ struct wireless_dev *lbs_cfg_alloc(struc
- goto err_wiphy_new;
- }
-
-diff --git a/package/kernel/mac80211/patches/802-libertas-set-wireless-macaddr.patch b/package/kernel/mac80211/patches/802-libertas-set-wireless-macaddr.patch
-index b67a95f948b79b4430799beadbcb98fc6f05e0da..ad306083da6cddff80b36241689cfeb3ba77d072 100644
---- a/package/kernel/mac80211/patches/802-libertas-set-wireless-macaddr.patch
-+++ b/package/kernel/mac80211/patches/802-libertas-set-wireless-macaddr.patch
-@@ -1,6 +1,6 @@
- --- a/drivers/net/wireless/marvell/libertas/cfg.c
- +++ b/drivers/net/wireless/marvell/libertas/cfg.c
--@@ -2174,6 +2174,8 @@ int lbs_cfg_register(struct lbs_private
-+@@ -2212,6 +2212,8 @@ int lbs_cfg_register(struct lbs_private
- wdev->wiphy->n_cipher_suites = ARRAY_SIZE(cipher_suites);
- wdev->wiphy->reg_notifier = lbs_reg_notifier;
-
-diff --git a/package/kernel/mac80211/patches/804-b43-sync-with-bcma.patch b/package/kernel/mac80211/patches/804-b43-sync-with-bcma.patch
-deleted file mode 100644
-index 74cd4489f15fb1b18a2157441011a4ff68bb60f8..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/804-b43-sync-with-bcma.patch
-+++ /dev/null
-@@ -1,17 +0,0 @@
----- a/drivers/net/wireless/broadcom/b43/main.c
--+++ b/drivers/net/wireless/broadcom/b43/main.c
--@@ -1215,10 +1215,10 @@ void b43_wireless_core_phy_pll_reset(str
-- case B43_BUS_BCMA:
-- bcma_cc = &dev->dev->bdev->bus->drv_cc;
--
--- bcma_cc_write32(bcma_cc, BCMA_CC_CHIPCTL_ADDR, 0);
--- bcma_cc_mask32(bcma_cc, BCMA_CC_CHIPCTL_DATA, ~0x4);
--- bcma_cc_set32(bcma_cc, BCMA_CC_CHIPCTL_DATA, 0x4);
--- bcma_cc_mask32(bcma_cc, BCMA_CC_CHIPCTL_DATA, ~0x4);
--+ bcma_cc_write32(bcma_cc, BCMA_CC_PMU_CHIPCTL_ADDR, 0);
--+ bcma_cc_mask32(bcma_cc, BCMA_CC_PMU_CHIPCTL_DATA, ~0x4);
--+ bcma_cc_set32(bcma_cc, BCMA_CC_PMU_CHIPCTL_DATA, 0x4);
--+ bcma_cc_mask32(bcma_cc, BCMA_CC_PMU_CHIPCTL_DATA, ~0x4);
-- break;
-- #endif
-- #ifdef CPTCFG_B43_SSB
-diff --git a/package/kernel/mac80211/patches/820-b43-add-antenna-control.patch b/package/kernel/mac80211/patches/820-b43-add-antenna-control.patch
-index 06c731fce677f7ea4a29652916c678f6de4dfc7d..f8f555f3e6ec510c333a97e76f47cca92e96a774 100644
---- a/package/kernel/mac80211/patches/820-b43-add-antenna-control.patch
-+++ b/package/kernel/mac80211/patches/820-b43-add-antenna-control.patch
-@@ -9,7 +9,7 @@
- antenna = b43_antenna_to_phyctl(antenna);
- ctl = b43_shm_read16(dev, B43_SHM_SHARED, B43_SHM_SH_BEACPHYCTL);
- /* We can't send beacons with short preamble. Would get PHY errors. */
--@@ -3300,8 +3300,8 @@ static int b43_chip_init(struct b43_wlde
-+@@ -3297,8 +3297,8 @@ static int b43_chip_init(struct b43_wlde
-
- /* Select the antennae */
- if (phy->ops->set_rx_antenna)
-@@ -20,7 +20,7 @@
-
- if (phy->type == B43_PHYTYPE_B) {
- value16 = b43_read16(dev, 0x005E);
--@@ -4001,7 +4001,6 @@ static int b43_op_config(struct ieee8021
-+@@ -3998,7 +3998,6 @@ static int b43_op_config(struct ieee8021
- struct b43_wldev *dev = wl->current_dev;
- struct b43_phy *phy = &dev->phy;
- struct ieee80211_conf *conf = &hw->conf;
-@@ -28,7 +28,7 @@
- int err = 0;
-
- mutex_lock(&wl->mutex);
--@@ -4044,11 +4043,9 @@ static int b43_op_config(struct ieee8021
-+@@ -4041,11 +4040,9 @@ static int b43_op_config(struct ieee8021
- }
-
- /* Antennas for RX and management frame TX. */
-@@ -42,7 +42,7 @@
-
- if (wl->radio_enabled != phy->radio_on) {
- if (wl->radio_enabled) {
--@@ -5209,6 +5206,47 @@ static int b43_op_get_survey(struct ieee
-+@@ -5189,6 +5186,47 @@ static int b43_op_get_survey(struct ieee
- return 0;
- }
-
-@@ -90,7 +90,7 @@
- static const struct ieee80211_ops b43_hw_ops = {
- .tx = b43_op_tx,
- .conf_tx = b43_op_conf_tx,
--@@ -5230,6 +5268,8 @@ static const struct ieee80211_ops b43_hw
-+@@ -5210,6 +5248,8 @@ static const struct ieee80211_ops b43_hw
- .sw_scan_complete = b43_op_sw_scan_complete_notifier,
- .get_survey = b43_op_get_survey,
- .rfkill_poll = b43_rfkill_poll,
-@@ -99,7 +99,7 @@
- };
-
- /* Hard-reset the chip. Do not call this directly.
--@@ -5538,6 +5578,8 @@ static int b43_one_core_attach(struct b4
-+@@ -5513,6 +5553,8 @@ static int b43_one_core_attach(struct b4
- if (!wldev)
- goto out;
-
-@@ -108,7 +108,7 @@
- wldev->use_pio = b43_modparam_pio;
- wldev->dev = dev;
- wldev->wl = wl;
--@@ -5628,6 +5670,9 @@ static struct b43_wl *b43_wireless_init(
-+@@ -5603,6 +5645,9 @@ static struct b43_wl *b43_wireless_init(
-
- hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
-
-diff --git a/package/kernel/mac80211/patches/860-brcmfmac-add-missing-eth_type_trans-call.patch b/package/kernel/mac80211/patches/860-brcmfmac-add-missing-eth_type_trans-call.patch
-deleted file mode 100644
-index e2653542def01a708c6b3399a78484a322919a57..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/860-brcmfmac-add-missing-eth_type_trans-call.patch
-+++ /dev/null
-@@ -1,26 +0,0 @@
--From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
--Subject: [PATCH] brcmfmac: add missing eth_type_trans call
--MIME-Version: 1.0
--Content-Type: text/plain; charset=UTF-8
--Content-Transfer-Encoding: 8bit
--
--There are 2 protocols supported by brcmfmac and msgbuf one was missing a
--proper skb setup before passing it to the netif. This was triggering
--"NULL pointer dereference".
--
--Fixes: 9c349892ccc9 ("brcmfmac: revise handling events in receive path")
--Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
-----
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c
--@@ -1157,6 +1157,9 @@ brcmf_msgbuf_process_rx_complete(struct
-- brcmu_pkt_buf_free_skb(skb);
-- return;
-- }
--+
--+ skb->protocol = eth_type_trans(skb, ifp->ndev);
--+
-- brcmf_netif_rx(ifp, skb);
-- }
--
-diff --git a/package/kernel/mac80211/patches/860-brcmfmac-register-wiphy-s-during-module_init.patch b/package/kernel/mac80211/patches/860-brcmfmac-register-wiphy-s-during-module_init.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..ae571c99ab151245355d0080a6475bcabbb9a2fb
---- /dev/null
-+++ b/package/kernel/mac80211/patches/860-brcmfmac-register-wiphy-s-during-module_init.patch
-@@ -0,0 +1,97 @@
-+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
-+Date: Mon, 8 Jun 2015 16:11:40 +0200
-+Subject: [PATCH] brcmfmac: register wiphy(s) during module_init
-+MIME-Version: 1.0
-+Content-Type: text/plain; charset=UTF-8
-+Content-Transfer-Encoding: 8bit
-+
-+This is needed by OpenWrt which expects all PHYs to be created after
-+module loads successfully.
-+
-+Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
-+---
-+
-+--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
-++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
-+@@ -1213,6 +1213,7 @@ int __init brcmf_core_init(void)
-+ {
-+ if (!schedule_work(&brcmf_driver_work))
-+ return -EBUSY;
-++ flush_work(&brcmf_driver_work);
-+
-+ return 0;
-+ }
-+--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
-++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
-+@@ -444,6 +444,7 @@ struct brcmf_fw {
-+ u16 bus_nr;
-+ void (*done)(struct device *dev, const struct firmware *fw,
-+ void *nvram_image, u32 nvram_len);
-++ struct completion *completion;
-+ };
-+
-+ static void brcmf_fw_request_nvram_done(const struct firmware *fw, void *ctx)
-+@@ -478,6 +479,8 @@ static void brcmf_fw_request_nvram_done(
-+ goto fail;
-+
-+ fwctx->done(fwctx->dev, fwctx->code, nvram, nvram_length);
-++ if (fwctx->completion)
-++ complete(fwctx->completion);
-+ kfree(fwctx);
-+ return;
-+
-+@@ -485,6 +488,8 @@ fail:
-+ brcmf_dbg(TRACE, "failed: dev=%s\n", dev_name(fwctx->dev));
-+ release_firmware(fwctx->code);
-+ device_release_driver(fwctx->dev);
-++ if (fwctx->completion)
-++ complete(fwctx->completion);
-+ kfree(fwctx);
-+ }
-+
-+@@ -500,6 +505,8 @@ static void brcmf_fw_request_code_done(c
-+ /* only requested code so done here */
-+ if (!(fwctx->flags & BRCMF_FW_REQUEST_NVRAM)) {
-+ fwctx->done(fwctx->dev, fw, NULL, 0);
-++ if (fwctx->completion)
-++ complete(fwctx->completion);
-+ kfree(fwctx);
-+ return;
-+ }
-+@@ -517,6 +524,8 @@ static void brcmf_fw_request_code_done(c
-+ fail:
-+ brcmf_dbg(TRACE, "failed: dev=%s\n", dev_name(fwctx->dev));
-+ device_release_driver(fwctx->dev);
-++ if (fwctx->completion)
-++ complete(fwctx->completion);
-+ kfree(fwctx);
-+ }
-+
-+@@ -528,6 +537,8 @@ int brcmf_fw_get_firmwares_pcie(struct d
-+ u16 domain_nr, u16 bus_nr)
-+ {
-+ struct brcmf_fw *fwctx;
-++ struct completion completion;
-++ int err;
-+
-+ brcmf_dbg(TRACE, "enter: dev=%s\n", dev_name(dev));
-+ if (!fw_cb || !code)
-+@@ -548,9 +559,17 @@ int brcmf_fw_get_firmwares_pcie(struct d
-+ fwctx->domain_nr = domain_nr;
-+ fwctx->bus_nr = bus_nr;
-+
-+- return request_firmware_nowait(THIS_MODULE, true, code, dev,
-++ init_completion(&completion);
-++ fwctx->completion = &completion;
-++
-++ err = request_firmware_nowait(THIS_MODULE, true, code, dev,
-+ GFP_KERNEL, fwctx,
-+ brcmf_fw_request_code_done);
-++ if (!err)
-++ wait_for_completion_timeout(fwctx->completion,
-++ msecs_to_jiffies(5000));
-++ fwctx->completion = NULL;
-++ return err;
-+ }
-+
-+ int brcmf_fw_get_firmwares(struct device *dev, u16 flags,
-diff --git a/package/kernel/mac80211/patches/861-brcmfmac-register-wiphy-s-during-module_init.patch b/package/kernel/mac80211/patches/861-brcmfmac-register-wiphy-s-during-module_init.patch
-deleted file mode 100644
-index f7f44f513f5e80f18f26c49073f916a435c6c534..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/861-brcmfmac-register-wiphy-s-during-module_init.patch
-+++ /dev/null
-@@ -1,97 +0,0 @@
--From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
--Date: Mon, 8 Jun 2015 16:11:40 +0200
--Subject: [PATCH] brcmfmac: register wiphy(s) during module_init
--MIME-Version: 1.0
--Content-Type: text/plain; charset=UTF-8
--Content-Transfer-Encoding: 8bit
--
--This is needed by OpenWrt which expects all PHYs to be created after
--module loads successfully.
--
--Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
-----
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
--@@ -1200,6 +1200,7 @@ int __init brcmf_core_init(void)
-- {
-- if (!schedule_work(&brcmf_driver_work))
-- return -EBUSY;
--+ flush_work(&brcmf_driver_work);
--
-- return 0;
-- }
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
--@@ -444,6 +444,7 @@ struct brcmf_fw {
-- u16 bus_nr;
-- void (*done)(struct device *dev, const struct firmware *fw,
-- void *nvram_image, u32 nvram_len);
--+ struct completion *completion;
-- };
--
-- static void brcmf_fw_request_nvram_done(const struct firmware *fw, void *ctx)
--@@ -478,6 +479,8 @@ static void brcmf_fw_request_nvram_done(
-- goto fail;
--
-- fwctx->done(fwctx->dev, fwctx->code, nvram, nvram_length);
--+ if (fwctx->completion)
--+ complete(fwctx->completion);
-- kfree(fwctx);
-- return;
--
--@@ -485,6 +488,8 @@ fail:
-- brcmf_dbg(TRACE, "failed: dev=%s\n", dev_name(fwctx->dev));
-- release_firmware(fwctx->code);
-- device_release_driver(fwctx->dev);
--+ if (fwctx->completion)
--+ complete(fwctx->completion);
-- kfree(fwctx);
-- }
--
--@@ -500,6 +505,8 @@ static void brcmf_fw_request_code_done(c
-- /* only requested code so done here */
-- if (!(fwctx->flags & BRCMF_FW_REQUEST_NVRAM)) {
-- fwctx->done(fwctx->dev, fw, NULL, 0);
--+ if (fwctx->completion)
--+ complete(fwctx->completion);
-- kfree(fwctx);
-- return;
-- }
--@@ -517,6 +524,8 @@ static void brcmf_fw_request_code_done(c
-- fail:
-- brcmf_dbg(TRACE, "failed: dev=%s\n", dev_name(fwctx->dev));
-- device_release_driver(fwctx->dev);
--+ if (fwctx->completion)
--+ complete(fwctx->completion);
-- kfree(fwctx);
-- }
--
--@@ -528,6 +537,8 @@ int brcmf_fw_get_firmwares_pcie(struct d
-- u16 domain_nr, u16 bus_nr)
-- {
-- struct brcmf_fw *fwctx;
--+ struct completion completion;
--+ int err;
--
-- brcmf_dbg(TRACE, "enter: dev=%s\n", dev_name(dev));
-- if (!fw_cb || !code)
--@@ -548,9 +559,17 @@ int brcmf_fw_get_firmwares_pcie(struct d
-- fwctx->domain_nr = domain_nr;
-- fwctx->bus_nr = bus_nr;
--
--- return request_firmware_nowait(THIS_MODULE, true, code, dev,
--+ init_completion(&completion);
--+ fwctx->completion = &completion;
--+
--+ err = request_firmware_nowait(THIS_MODULE, true, code, dev,
-- GFP_KERNEL, fwctx,
-- brcmf_fw_request_code_done);
--+ if (!err)
--+ wait_for_completion_timeout(fwctx->completion,
--+ msecs_to_jiffies(5000));
--+ fwctx->completion = NULL;
--+ return err;
-- }
--
-- int brcmf_fw_get_firmwares(struct device *dev, u16 flags,
-diff --git a/package/kernel/mac80211/patches/861-brcmfmac-workaround-bug-with-some-inconsistent-BSSes.patch b/package/kernel/mac80211/patches/861-brcmfmac-workaround-bug-with-some-inconsistent-BSSes.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..87211550f77d6e06bef8f7124940ba30ac4222ef
---- /dev/null
-+++ b/package/kernel/mac80211/patches/861-brcmfmac-workaround-bug-with-some-inconsistent-BSSes.patch
-@@ -0,0 +1,50 @@
-+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
-+Date: Thu, 9 Jul 2015 00:07:59 +0200
-+Subject: [PATCH] brcmfmac: workaround bug with some inconsistent BSSes state
-+MIME-Version: 1.0
-+Content-Type: text/plain; charset=UTF-8
-+Content-Transfer-Encoding: 8bit
-+
-+Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
-+---
-+
-+--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
-++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
-+@@ -665,9 +665,37 @@ static struct wireless_dev *brcmf_cfg802
-+ u32 *flags,
-+ struct vif_params *params)
-+ {
-++ struct net_device *dev;
-+ struct wireless_dev *wdev;
-+ int err;
-+
-++ /*
-++ * There is a bug with in-firmware BSS management. When adding virtual
-++ * interface brcmfmac first tells firmware to create new BSS and then
-++ * it creates new struct net_device.
-++ *
-++ * If creating/registering netdev(ice) fails, BSS remains in some bugged
-++ * state. It conflicts with existing BSSes by overtaking their auth
-++ * requests.
-++ *
-++ * It results in one BSS (addresss X) sending beacons and another BSS
-++ * (address Y) replying to authentication requests. This makes interface
-++ * unusable as AP.
-++ *
-++ * To workaround this bug we may try to guess if register_netdev(ice)
-++ * will fail. The most obvious case is using interface name that already
-++ * exists. This is actually quite likely with brcmfmac & some user space
-++ * scripts as brcmfmac doesn't allow deleting virtual interfaces.
-++ * So this bug can be triggered even by something trivial like:
-++ * iw dev wlan0 delete
-++ * iw phy phy0 interface add wlan0 type __ap
-++ */
-++ dev = dev_get_by_name(&init_net, name);
-++ if (dev) {
-++ dev_put(dev);
-++ return ERR_PTR(-ENFILE);
-++ }
-++
-+ brcmf_dbg(TRACE, "enter: %s type %d\n", name, type);
-+ err = brcmf_vif_add_validate(wiphy_to_cfg(wiphy), type);
-+ if (err) {
-diff --git a/package/kernel/mac80211/patches/862-brcmfmac-Disable-power-management.patch b/package/kernel/mac80211/patches/862-brcmfmac-Disable-power-management.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..f301fe1e4e7daa2cabd73aaf869327e2a0fb7d22
---- /dev/null
-+++ b/package/kernel/mac80211/patches/862-brcmfmac-Disable-power-management.patch
-@@ -0,0 +1,27 @@
-+From 66ae1b1750720a33e29792a177b1e696f4f005fb Mon Sep 17 00:00:00 2001
-+From: Phil Elwell <phil@raspberrypi.org>
-+Date: Wed, 9 Mar 2016 17:25:59 +0000
-+Subject: [PATCH] brcmfmac: Disable power management
-+
-+Disable wireless power saving in the brcmfmac WLAN driver. This is a
-+temporary measure until the connectivity loss resulting from power
-+saving is resolved.
-+
-+Signed-off-by: Phil Elwell <phil@raspberrypi.org>
-+---
-+ drivers/net/wireless/brcm80211/brcmfmac/cfg80211.c | 2 ++
-+ 1 file changed, 2 insertions(+)
-+
-+--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
-++++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
-+@@ -2783,6 +2783,10 @@ brcmf_cfg80211_set_power_mgmt(struct wip
-+ * preference in cfg struct to apply this to
-+ * FW later while initializing the dongle
-+ */
-++#if defined(CONFIG_BCM2708) || defined(CONFIG_BCM2709)
-++ pr_info("power management disabled\n");
-++ enabled = false;
-++#endif
-+ cfg->pwr_save = enabled;
-+ if (!check_vif_up(ifp->vif)) {
-+
-diff --git a/package/kernel/mac80211/patches/862-brcmfmac-workaround-bug-with-some-inconsistent-BSSes.patch b/package/kernel/mac80211/patches/862-brcmfmac-workaround-bug-with-some-inconsistent-BSSes.patch
-deleted file mode 100644
-index 1e440c02f33ffa7389837442fde8bdcb21002d61..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/862-brcmfmac-workaround-bug-with-some-inconsistent-BSSes.patch
-+++ /dev/null
-@@ -1,50 +0,0 @@
--From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
--Date: Thu, 9 Jul 2015 00:07:59 +0200
--Subject: [PATCH] brcmfmac: workaround bug with some inconsistent BSSes state
--MIME-Version: 1.0
--Content-Type: text/plain; charset=UTF-8
--Content-Transfer-Encoding: 8bit
--
--Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
-----
--
----- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
--@@ -651,9 +651,37 @@ static struct wireless_dev *brcmf_cfg802
-- u32 *flags,
-- struct vif_params *params)
-- {
--+ struct net_device *dev;
-- struct wireless_dev *wdev;
-- int err;
--
--+ /*
--+ * There is a bug with in-firmware BSS management. When adding virtual
--+ * interface brcmfmac first tells firmware to create new BSS and then
--+ * it creates new struct net_device.
--+ *
--+ * If creating/registering netdev(ice) fails, BSS remains in some bugged
--+ * state. It conflicts with existing BSSes by overtaking their auth
--+ * requests.
--+ *
--+ * It results in one BSS (addresss X) sending beacons and another BSS
--+ * (address Y) replying to authentication requests. This makes interface
--+ * unusable as AP.
--+ *
--+ * To workaround this bug we may try to guess if register_netdev(ice)
--+ * will fail. The most obvious case is using interface name that already
--+ * exists. This is actually quite likely with brcmfmac & some user space
--+ * scripts as brcmfmac doesn't allow deleting virtual interfaces.
--+ * So this bug can be triggered even by something trivial like:
--+ * iw dev wlan0 delete
--+ * iw phy phy0 interface add wlan0 type __ap
--+ */
--+ dev = dev_get_by_name(&init_net, name);
--+ if (dev) {
--+ dev_put(dev);
--+ return ERR_PTR(-ENFILE);
--+ }
--+
-- brcmf_dbg(TRACE, "enter: %s type %d\n", name, type);
-- err = brcmf_vif_add_validate(wiphy_to_cfg(wiphy), type);
-- if (err) {
-diff --git a/package/kernel/mac80211/patches/910-01-add-support-for-mt7620.patch b/package/kernel/mac80211/patches/910-01-add-support-for-mt7620.patch
-index f2e21ea49feafaf060846d95746ea6132819536f..be210f2d4bfc22a20b7473012000338e22622bd9 100644
---- a/package/kernel/mac80211/patches/910-01-add-support-for-mt7620.patch
-+++ b/package/kernel/mac80211/patches/910-01-add-support-for-mt7620.patch
-@@ -1184,7 +1184,7 @@
- break;
- default:
- rt2x00_err(rt2x00dev, "Invalid RF chipset 0x%04x detected\n",
--@@ -8423,6 +9363,7 @@ static int rt2800_probe_hw_mode(struct r
-+@@ -8427,6 +9367,7 @@ static int rt2800_probe_hw_mode(struct r
- case RF5372:
- case RF5390:
- case RF5392:
-@@ -1192,7 +1192,7 @@
- spec->num_channels = 14;
- if (spec->clk_is_20mhz)
- spec->channels = rf_vals_xtal20mhz_3x;
--@@ -8563,6 +9504,7 @@ static int rt2800_probe_hw_mode(struct r
-+@@ -8567,6 +9508,7 @@ static int rt2800_probe_hw_mode(struct r
- case RF5372:
- case RF5390:
- case RF5392:
-diff --git a/package/kernel/mac80211/patches/921-ath10k_init_devices_synchronously.patch b/package/kernel/mac80211/patches/921-ath10k_init_devices_synchronously.patch
-index 8c6d720a73cf73e007eeede2829ec9019d5a2d40..e842d612b7b55caaa557c20836ca84e3cd21f906 100644
---- a/package/kernel/mac80211/patches/921-ath10k_init_devices_synchronously.patch
-+++ b/package/kernel/mac80211/patches/921-ath10k_init_devices_synchronously.patch
-@@ -14,7 +14,7 @@ Signed-off-by: Sven Eckelmann <sven@open-mesh.com>
-
- --- a/drivers/net/wireless/ath/ath10k/core.c
- +++ b/drivers/net/wireless/ath/ath10k/core.c
--@@ -1914,6 +1914,16 @@ int ath10k_core_register(struct ath10k *
-+@@ -2107,6 +2107,16 @@ int ath10k_core_register(struct ath10k *
- ar->chip_id = chip_id;
- queue_work(ar->workqueue, &ar->register_work);
-
-diff --git a/package/kernel/mac80211/patches/930-ath10k_add_tpt_led_trigger.patch b/package/kernel/mac80211/patches/930-ath10k_add_tpt_led_trigger.patch
-index 281b4475ada3f4388292d930a9fd252b234ec0c5..a501b998d0f279eeac266df9a4cd03e5cb731f98 100644
---- a/package/kernel/mac80211/patches/930-ath10k_add_tpt_led_trigger.patch
-+++ b/package/kernel/mac80211/patches/930-ath10k_add_tpt_led_trigger.patch
-@@ -1,6 +1,6 @@
- --- a/drivers/net/wireless/ath/ath10k/mac.c
- +++ b/drivers/net/wireless/ath/ath10k/mac.c
--@@ -7141,6 +7141,21 @@ struct ath10k_vif *ath10k_get_arvif(stru
-+@@ -7742,6 +7742,21 @@ struct ath10k_vif *ath10k_get_arvif(stru
- return arvif_iter.arvif;
- }
-
-@@ -22,11 +22,11 @@
- int ath10k_mac_register(struct ath10k *ar)
- {
- static const u32 cipher_suites[] = {
--@@ -7357,6 +7372,12 @@ int ath10k_mac_register(struct ath10k *a
-+@@ -7975,6 +7990,12 @@ int ath10k_mac_register(struct ath10k *a
- ar->hw->wiphy->cipher_suites = cipher_suites;
- ar->hw->wiphy->n_cipher_suites = ARRAY_SIZE(cipher_suites);
-
--+#if CPTCFG_MAC80211_LEDS
-++#ifdef CPTCFG_MAC80211_LEDS
- + ieee80211_create_tpt_led_trigger(ar->hw,
- + IEEE80211_TPT_LEDTRIG_FL_RADIO, ath10k_tpt_blink,
- + ARRAY_SIZE(ath10k_tpt_blink));
-diff --git a/package/kernel/mac80211/patches/936-ath10k_skip_otp_check.patch b/package/kernel/mac80211/patches/936-ath10k_skip_otp_check.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..596ef9863902ecbbd3cdb394c7ffde3ba509414f
---- /dev/null
-+++ b/package/kernel/mac80211/patches/936-ath10k_skip_otp_check.patch
-@@ -0,0 +1,51 @@
-+--- a/drivers/net/wireless/ath/ath10k/core.c
-++++ b/drivers/net/wireless/ath/ath10k/core.c
-+@@ -1243,9 +1243,6 @@ static int ath10k_core_fetch_firmware_fi
-+ {
-+ int ret;
-+
-+- /* calibration file is optional, don't check for any errors */
-+- ath10k_fetch_cal_file(ar);
-+-
-+ ar->fw_api = 5;
-+ ath10k_dbg(ar, ATH10K_DBG_BOOT, "trying fw api %d\n", ar->fw_api);
-+
-+@@ -1944,7 +1941,7 @@ EXPORT_SYMBOL(ath10k_core_stop);
-+ static int ath10k_core_probe_fw(struct ath10k *ar)
-+ {
-+ struct bmi_target_info target_info;
-+- int ret = 0;
-++ int calret, ret = 0;
-+
-+ ret = ath10k_hif_power_up(ar);
-+ if (ret) {
-+@@ -1968,6 +1965,9 @@ static int ath10k_core_probe_fw(struct a
-+ goto err_power_down;
-+ }
-+
-++ /* calibration file is optional, don't check for any errors */
-++ calret = ath10k_fetch_cal_file(ar);
-++
-+ ret = ath10k_core_fetch_firmware_files(ar);
-+ if (ret) {
-+ ath10k_err(ar, "could not fetch firmware files (%d)\n", ret);
-+@@ -1990,11 +1990,14 @@ static int ath10k_core_probe_fw(struct a
-+ "could not load pre cal data: %d\n", ret);
-+ }
-+
-+- ret = ath10k_core_get_board_id_from_otp(ar);
-+- if (ret && ret != -EOPNOTSUPP) {
-+- ath10k_err(ar, "failed to get board id from otp: %d\n",
-+- ret);
-+- goto err_free_firmware_files;
-++ /* otp and board file not needed if calibration data is present */
-++ if (calret) {
-++ ret = ath10k_core_get_board_id_from_otp(ar);
-++ if (ret && ret != -EOPNOTSUPP) {
-++ ath10k_err(ar, "failed to get board id from otp: %d\n",
-++ ret);
-++ goto err_free_firmware_files;
-++ }
-+ }
-+
-+ ret = ath10k_core_fetch_board_file(ar);
-diff --git a/package/kernel/mt76/Makefile b/package/kernel/mt76/Makefile
-index e49dd486d2c952f3bc985a02bb131fdc7a03ce4a..bd851e61910c9a57ca45a570855ca22329c9ae4b 100644
---- a/package/kernel/mt76/Makefile
-+++ b/package/kernel/mt76/Makefile
-@@ -1,7 +1,7 @@
- include $(TOPDIR)/rules.mk
-
- PKG_NAME:=mt76
--PKG_VERSION:=2016-03-03
-+PKG_VERSION:=2016-08-25
- PKG_RELEASE=1
-
- PKG_LICENSE:=GPLv2
-@@ -10,23 +10,26 @@ PKG_LICENSE_FILES:=
- PKG_SOURCE_URL:=https://github.com/openwrt/mt76
- PKG_SOURCE_PROTO:=git
- PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
--PKG_SOURCE_VERSION:=310d420178c86e253a172413da30ecf479b64251
-+PKG_SOURCE_VERSION:=c3127d2acc354b4a27c8604716b0591093601971
- PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
-
--PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
-+PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
- PKG_BUILD_PARALLEL:=1
-
-+STAMP_CONFIGURED_DEPENDS := $(STAGING_DIR)/usr/include/mac80211-backport/backport/autoconf.h
-+
- include $(INCLUDE_DIR)/kernel.mk
- include $(INCLUDE_DIR)/package.mk
-
- define KernelPackage/mt76
- SUBMENU:=Wireless Drivers
-- TITLE:=MediaTek MT76x2 wireless driver
-- DEPENDS:=+kmod-mac80211 +@DRIVER_11N_SUPPORT @PCI_SUPPORT
-+ TITLE:=MediaTek MT76x2/MT7603 wireless driver
-+ DEPENDS:=+kmod-mac80211 +@DRIVER_11N_SUPPORT @PCI_SUPPORT @!LINUX_3_18
- FILES:=\
- $(PKG_BUILD_DIR)/mt76.ko \
-- $(PKG_BUILD_DIR)/mt76x2e.ko
-- AUTOLOAD:=$(call AutoLoad,50,mac80211 mt76 mt76x2e)
-+ $(PKG_BUILD_DIR)/mt76x2e.ko \
-+ $(PKG_BUILD_DIR)/mt7603e.ko
-+ AUTOLOAD:=$(call AutoLoad,50,mac80211 mt76 mt76x2e mt7603e)
- endef
-
- NOSTDINC_FLAGS = \
-@@ -54,6 +57,12 @@ endef
- define KernelPackage/mt76/install
- $(INSTALL_DIR) $(1)/lib/firmware
- cp \
-+ $(if $(CONFIG_TARGET_ramips_mt7628) || $(CONFIG_TARGET_ramips_mt7688), \
-+ $(PKG_BUILD_DIR)/firmware/mt7628_e1.bin \
-+ $(PKG_BUILD_DIR)/firmware/mt7628_e2.bin \
-+ ) \
-+ $(PKG_BUILD_DIR)/firmware/mt7603_e1.bin \
-+ $(PKG_BUILD_DIR)/firmware/mt7603_e2.bin \
- $(PKG_BUILD_DIR)/firmware/mt7662_rom_patch.bin \
- $(PKG_BUILD_DIR)/firmware/mt7662.bin \
- $(1)/lib/firmware
-diff --git a/package/network/services/hostapd/Config.in b/package/network/services/hostapd/Config.in
-index aee2a15fd314479ba4d5e29a8bb4ec5855a78342..645888e74510c5c42c21a7208ee0dcc884fb0e2a 100644
---- a/package/network/services/hostapd/Config.in
-+++ b/package/network/services/hostapd/Config.in
-@@ -10,11 +10,10 @@ config WPA_SUPPLICANT_NO_TIMESTAMP_CHECK
- choice
- prompt "Choose TLS provider"
- default WPA_SUPPLICANT_INTERNAL
-- depends on PACKAGE_wpa-supplicant || PACKAGE_wpa-supplicant-mesh || PACKAGE_wpad || PACKAGE_wpad-mesh
-+ depends on PACKAGE_wpa-supplicant || PACKAGE_wpad
-
- config WPA_SUPPLICANT_INTERNAL
- bool "internal"
-- depends on PACKAGE_wpa-supplicant || PACKAGE_wpad
-
- config WPA_SUPPLICANT_OPENSSL
- bool "openssl"
-diff --git a/package/network/services/hostapd/Makefile b/package/network/services/hostapd/Makefile
-index 8e706dc5a3dac630076e32eafbffbee2ba7e2976..5caf3e33786890b9c06a21365356fb39a7b4341d 100644
---- a/package/network/services/hostapd/Makefile
-+++ b/package/network/services/hostapd/Makefile
-@@ -7,18 +7,18 @@
- include $(TOPDIR)/rules.mk
-
- PKG_NAME:=hostapd
--PKG_VERSION:=2015-03-25
-+PKG_VERSION:=2016-06-15
- PKG_RELEASE:=1
--PKG_REV:=8278138e679174b1ec8af7f169c2810a8888e202
-+PKG_REV:=31d3692fe5d56c05753ed4a70c7943979e1d29e7
-
- PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
--PKG_SOURCE_URL:=git://w1.fi/srv/git/hostap.git
-+PKG_SOURCE_URL:=http://w1.fi/hostap.git
- PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
- PKG_SOURCE_VERSION:=$(PKG_REV)
- PKG_SOURCE_PROTO:=git
- # PKG_MIRROR_MD5SUM:=4e7c1f97edd7514535056fce54ae053a
-
--PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
-+PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
- PKG_LICENSE:=BSD-3-Clause
-
- PKG_BUILD_PARALLEL:=1
-@@ -29,7 +29,6 @@ PKG_CONFIG_DEPENDS:= \
- CONFIG_PACKAGE_kmod-cfg80211 \
- CONFIG_PACKAGE_hostapd \
- CONFIG_PACKAGE_hostapd-mini \
-- CONFIG_PACKAGE_kmod-hostap \
- CONFIG_WPA_RFKILL_SUPPORT \
- CONFIG_DRIVER_WEXT_SUPPORT \
- CONFIG_DRIVER_11N_SUPPORT
-@@ -40,6 +39,10 @@ LOCAL_TYPE=$(strip \
- hostapd \
- )))
- LOCAL_VARIANT=$(patsubst wpad-%,%,$(patsubst supplicant-%,%,$(BUILD_VARIANT)))
-+CONFIG_VARIANT:=$(LOCAL_VARIANT)
-+ifeq ($(LOCAL_VARIANT),mesh)
-+ CONFIG_VARIANT:=full
-+endif
-
- ifeq ($(LOCAL_TYPE),supplicant)
- ifeq ($(LOCAL_VARIANT),full)
-@@ -47,10 +50,6 @@ ifeq ($(LOCAL_TYPE),supplicant)
- CONFIG_WPA_SUPPLICANT_INTERNAL \
- CONFIG_WPA_SUPPLICANT_OPENSSL
- endif
-- ifeq ($(LOCAL_VARIANT),mesh)
-- PKG_CONFIG_DEPENDS += \
-- CONFIG_WPA_SUPPLICANT_OPENSSL
-- endif
- endif
-
- PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
-@@ -66,7 +65,6 @@ endif
- DRIVER_MAKEOPTS= \
- CONFIG_ACS=$(CONFIG_PACKAGE_kmod-cfg80211) \
- CONFIG_DRIVER_NL80211=$(CONFIG_PACKAGE_kmod-cfg80211) \
-- CONFIG_DRIVER_HOSTAP=$(CONFIG_PACKAGE_kmod-hostap) \
- CONFIG_IEEE80211N=$(HOSTAPD_IEEE80211N) \
- CONFIG_DRIVER_WEXT=$(CONFIG_DRIVER_WEXT_SUPPORT) \
-
-@@ -82,7 +80,7 @@ ifneq ($(LOCAL_TYPE),hostapd)
- endif
- endif
- ifeq ($(LOCAL_VARIANT),mesh)
-- DRIVER_MAKEOPTS += CONFIG_TLS=openssl
-+ DRIVER_MAKEOPTS += CONFIG_TLS=openssl CONFIG_AP=y CONFIG_SAE=y CONFIG_MESH=y
- TARGET_LDFLAGS += -lcrypto -lssl
- endif
- ifdef CONFIG_WPA_SUPPLICANT_NO_TIMESTAMP_CHECK
-@@ -177,8 +175,7 @@ endef
- define Package/wpad-mesh
- $(call Package/wpad/Default)
- TITLE+= (with 802.11s mesh and SAE support)
-- DEPENDS:=$(DRV_DEPENDS) +libubus +libopenssl +@CONFIG_WPA_SUPPLICANT_OPENSSL @(!TARGET_uml||BROKEN)
-- CONFLICTS:=@WPA_SUPPLICANT_INTERNAL
-+ DEPENDS:=$(DRV_DEPENDS) +libubus +PACKAGE_wpad-mesh:libopenssl @(!TARGET_uml||BROKEN)
- VARIANT:=wpad-mesh
- endef
-
-@@ -257,12 +254,6 @@ define Package/hostapd-common
- CATEGORY:=Network
- endef
-
--define Package/hostapd-common-old
-- TITLE:=hostapd/wpa_supplicant common support files (legacy drivers)
-- SECTION:=net
-- CATEGORY:=Network
--endef
--
- define Package/eapol-test
- TITLE:=802.1x authentication test utility
- SECTION:=net
-@@ -284,10 +275,10 @@ endif
-
- define Build/Configure
- $(Build/Configure/rebuild)
-- $(if $(wildcard ./files/hostapd-$(LOCAL_VARIANT).config), \
-- $(CP) ./files/hostapd-$(LOCAL_VARIANT).config $(PKG_BUILD_DIR)/hostapd/.config \
-+ $(if $(wildcard ./files/hostapd-$(CONFIG_VARIANT).config), \
-+ $(CP) ./files/hostapd-$(CONFIG_VARIANT).config $(PKG_BUILD_DIR)/hostapd/.config \
- )
-- $(CP) ./files/wpa_supplicant-$(LOCAL_VARIANT).config $(PKG_BUILD_DIR)/wpa_supplicant/.config
-+ $(CP) ./files/wpa_supplicant-$(CONFIG_VARIANT).config $(PKG_BUILD_DIR)/wpa_supplicant/.config
- endef
-
- TARGET_CPPFLAGS := \
-@@ -379,12 +370,6 @@ define Package/hostapd-common/install
- $(INSTALL_DATA) ./files/netifd.sh $(1)/lib/netifd/hostapd.sh
- endef
-
--define Package/hostapd-common-old/install
-- $(INSTALL_DIR) $(1)/lib/wifi
-- $(INSTALL_DATA) ./files/hostapd.sh $(1)/lib/wifi/hostapd.sh
-- $(INSTALL_DATA) ./files/wpa_supplicant.sh $(1)/lib/wifi/wpa_supplicant.sh
--endef
--
- define Package/hostapd/install
- $(call Install/hostapd,$(1))
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/hostapd/hostapd $(1)/usr/sbin/
-@@ -442,5 +427,4 @@ $(eval $(call BuildPackage,wpa-supplicant-p2p))
- $(eval $(call BuildPackage,wpa-cli))
- $(eval $(call BuildPackage,hostapd-utils))
- $(eval $(call BuildPackage,hostapd-common))
--$(eval $(call BuildPackage,hostapd-common-old))
- $(eval $(call BuildPackage,eapol-test))
-diff --git a/package/network/services/hostapd/files/hostapd-full.config b/package/network/services/hostapd/files/hostapd-full.config
-index f1b2655cfcb7f8cbc61399eb3ffb886770b55a3f..e388109fbb6bac4b965e5fced6e2cc189f883255 100644
---- a/package/network/services/hostapd/files/hostapd-full.config
-+++ b/package/network/services/hostapd/files/hostapd-full.config
-@@ -10,7 +10,7 @@
- # to override previous values of the variables.
-
- # Driver interface for Host AP driver
--CONFIG_DRIVER_HOSTAP=y
-+#CONFIG_DRIVER_HOSTAP=y
-
- # Driver interface for wired authenticator
- CONFIG_DRIVER_WIRED=y
-@@ -53,6 +53,9 @@ CONFIG_PEERKEY=y
- # Integrated EAP server
- CONFIG_EAP=y
-
-+# EAP-FAST for the integrated EAP server
-+CONFIG_EAP_FAST=y
-+
- # EAP-MD5 for the integrated EAP server
- CONFIG_EAP_MD5=y
-
-diff --git a/package/network/services/hostapd/files/hostapd-mini.config b/package/network/services/hostapd/files/hostapd-mini.config
-index 118d97cb3a21c195bc903fde2d4f885699b2425b..8baff18fe47a0322b2c6b3312581635ccf518143 100644
---- a/package/network/services/hostapd/files/hostapd-mini.config
-+++ b/package/network/services/hostapd/files/hostapd-mini.config
-@@ -10,7 +10,7 @@
- # to override previous values of the variables.
-
- # Driver interface for Host AP driver
--CONFIG_DRIVER_HOSTAP=y
-+#CONFIG_DRIVER_HOSTAP=y
-
- # Driver interface for wired authenticator
- CONFIG_DRIVER_WIRED=y
-diff --git a/package/network/services/hostapd/files/hostapd.sh b/package/network/services/hostapd/files/hostapd.sh
-deleted file mode 100644
-index 7aec7ad8a40ae843453e2c3e8f812a93c9635320..0000000000000000000000000000000000000000
---- a/package/network/services/hostapd/files/hostapd.sh
-+++ /dev/null
-@@ -1,394 +0,0 @@
--hostapd_set_bss_options() {
-- local var="$1"
-- local vif="$2"
-- local enc wep_rekey wpa_group_rekey wpa_pair_rekey wpa_master_rekey wps_possible wpa_key_mgmt
--
-- config_get enc "$vif" encryption "none"
-- config_get wep_rekey "$vif" wep_rekey # 300
-- config_get wpa_group_rekey "$vif" wpa_group_rekey # 300
-- config_get wpa_pair_rekey "$vif" wpa_pair_rekey # 300
-- config_get wpa_master_rekey "$vif" wpa_master_rekey # 640
-- config_get_bool ap_isolate "$vif" isolate 0
-- config_get_bool disassoc_low_ack "$vif" disassoc_low_ack 1
-- config_get max_num_sta "$vif" max_num_sta 0
-- config_get max_inactivity "$vif" max_inactivity 0
-- config_get_bool preamble "$vif" short_preamble 1
--
-- config_get device "$vif" device
-- config_get hwmode "$device" hwmode
-- config_get phy "$device" phy
--
-- append "$var" "ctrl_interface=/var/run/hostapd-$phy" "$N"
--
-- if [ "$ap_isolate" -gt 0 ]; then
-- append "$var" "ap_isolate=$ap_isolate" "$N"
-- fi
-- if [ "$max_num_sta" -gt 0 ]; then
-- append "$var" "max_num_sta=$max_num_sta" "$N"
-- fi
-- if [ "$max_inactivity" -gt 0 ]; then
-- append "$var" "ap_max_inactivity=$max_inactivity" "$N"
-- fi
-- append "$var" "disassoc_low_ack=$disassoc_low_ack" "$N"
-- if [ "$preamble" -gt 0 ]; then
-- append "$var" "preamble=$preamble" "$N"
-- fi
--
-- # Examples:
-- # psk-mixed/tkip => WPA1+2 PSK, TKIP
-- # wpa-psk2/tkip+aes => WPA2 PSK, CCMP+TKIP
-- # wpa2/tkip+aes => WPA2 RADIUS, CCMP+TKIP
-- # ...
--
-- # TODO: move this parsing function somewhere generic, so that
-- # later it can be reused by drivers that don't use hostapd
--
-- # crypto defaults: WPA2 vs WPA1
-- case "$enc" in
-- wpa2*|*psk2*)
-- wpa=2
-- crypto="CCMP"
-- ;;
-- *mixed*)
-- wpa=3
-- crypto="CCMP TKIP"
-- ;;
-- *)
-- wpa=1
-- crypto="TKIP"
-- ;;
-- esac
--
-- # explicit override for crypto setting
-- case "$enc" in
-- *tkip+aes|*tkip+ccmp|*aes+tkip|*ccmp+tkip) crypto="CCMP TKIP";;
-- *aes|*ccmp) crypto="CCMP";;
-- *tkip) crypto="TKIP";;
-- esac
--
-- # enforce CCMP for 11ng and 11na
-- case "$hwmode:$crypto" in
-- *ng:TKIP|*na:TKIP) crypto="CCMP TKIP";;
-- esac
--
-- # use crypto/auth settings for building the hostapd config
-- case "$enc" in
-- none)
-- wps_possible=1
-- wpa=0
-- crypto=
-- # Here we make the assumption that if we're in open mode
-- # with WPS enabled, we got to be in unconfigured state.
-- wps_not_configured=1
-- ;;
-- *psk*)
-- config_get psk "$vif" key
-- if [ ${#psk} -eq 64 ]; then
-- append "$var" "wpa_psk=$psk" "$N"
-- else
-- append "$var" "wpa_passphrase=$psk" "$N"
-- fi
-- wps_possible=1
-- [ -n "$wpa_group_rekey" ] && append "$var" "wpa_group_rekey=$wpa_group_rekey" "$N"
-- [ -n "$wpa_pair_rekey" ] && append "$var" "wpa_ptk_rekey=$wpa_pair_rekey" "$N"
-- [ -n "$wpa_master_rekey" ] && append "$var" "wpa_gmk_rekey=$wpa_master_rekey" "$N"
-- append wpa_key_mgmt "WPA-PSK"
-- ;;
-- *wpa*|*8021x*)
-- # required fields? formats?
-- # hostapd is particular, maybe a default configuration for failures
-- config_get auth_server "$vif" auth_server
-- [ -z "$auth_server" ] && config_get auth_server "$vif" server
-- append "$var" "auth_server_addr=$auth_server" "$N"
-- config_get auth_port "$vif" auth_port
-- [ -z "$auth_port" ] && config_get auth_port "$vif" port
-- auth_port=${auth_port:-1812}
-- append "$var" "auth_server_port=$auth_port" "$N"
-- config_get auth_secret "$vif" auth_secret
-- [ -z "$auth_secret" ] && config_get auth_secret "$vif" key
-- append "$var" "auth_server_shared_secret=$auth_secret" "$N"
-- # You don't really want to enable this unless you are doing
-- # some corner case testing or are using OpenWrt as a work around
-- # for some systematic issues.
-- config_get_bool auth_cache "$vif" auth_cache 0
-- config_get rsn_preauth "$vif" rsn_preauth
-- [ "$auth_cache" -gt 0 ] || [[ "$rsn_preauth" = 1 ]] || append "$var" "disable_pmksa_caching=1" "$N"
-- [ "$auth_cache" -gt 0 ] || [[ "$rsn_preauth" = 1 ]] || append "$var" "okc=0" "$N"
-- config_get acct_server "$vif" acct_server
-- [ -n "$acct_server" ] && append "$var" "acct_server_addr=$acct_server" "$N"
-- config_get acct_port "$vif" acct_port
-- [ -n "$acct_port" ] && acct_port=${acct_port:-1813}
-- [ -n "$acct_port" ] && append "$var" "acct_server_port=$acct_port" "$N"
-- config_get acct_secret "$vif" acct_secret
-- [ -n "$acct_secret" ] && append "$var" "acct_server_shared_secret=$acct_secret" "$N"
-- config_get eap_reauth_period "$vif" eap_reauth_period
-- [ -n "$eap_reauth_period" ] && append "$var" "eap_reauth_period=$eap_reauth_period" "$N"
-- config_get dae_client "$vif" dae_client
-- config_get dae_secret "$vif" dae_secret
-- [ -n "$dae_client" -a -n "$dae_secret" ] && {
-- config_get dae_port "$vif" dae_port
-- append "$var" "radius_das_port=${dae_port:-3799}" "$N"
-- append "$var" "radius_das_client=$dae_client $dae_secret" "$N"
-- }
-- config_get ownip "$vif" ownip
-- append "$var" "own_ip_addr=$ownip" "$N"
-- append "$var" "eapol_key_index_workaround=1" "$N"
-- append "$var" "ieee8021x=1" "$N"
-- append wpa_key_mgmt "WPA-EAP"
-- [ -n "$wpa_group_rekey" ] && append "$var" "wpa_group_rekey=$wpa_group_rekey" "$N"
-- [ -n "$wpa_pair_rekey" ] && append "$var" "wpa_ptk_rekey=$wpa_pair_rekey" "$N"
-- [ -n "$wpa_master_rekey" ] && append "$var" "wpa_gmk_rekey=$wpa_master_rekey" "$N"
-- ;;
-- *wep*)
-- config_get key "$vif" key
-- key="${key:-1}"
-- case "$key" in
-- [1234])
-- for idx in 1 2 3 4; do
-- local zidx
-- zidx=$(($idx - 1))
-- config_get ckey "$vif" "key${idx}"
-- [ -n "$ckey" ] && \
-- append "$var" "wep_key${zidx}=$(prepare_key_wep "$ckey")" "$N"
-- done
-- append "$var" "wep_default_key=$((key - 1))" "$N"
-- ;;
-- *)
-- append "$var" "wep_key0=$(prepare_key_wep "$key")" "$N"
-- append "$var" "wep_default_key=0" "$N"
-- [ -n "$wep_rekey" ] && append "$var" "wep_rekey_period=$wep_rekey" "$N"
-- ;;
-- esac
-- case "$enc" in
-- *shared*)
-- auth_algs=2
-- ;;
-- *mixed*)
-- auth_algs=3
-- ;;
-- esac
-- wpa=0
-- crypto=
-- ;;
-- *)
-- wpa=0
-- crypto=
-- ;;
-- esac
-- append "$var" "auth_algs=${auth_algs:-1}" "$N"
-- append "$var" "wpa=$wpa" "$N"
-- [ -n "$crypto" ] && append "$var" "wpa_pairwise=$crypto" "$N"
-- [ -n "$wpa_group_rekey" ] && append "$var" "wpa_group_rekey=$wpa_group_rekey" "$N"
--
-- config_get ssid "$vif" ssid
-- config_get bridge "$vif" bridge
-- config_get ieee80211d "$vif" ieee80211d
-- config_get iapp_interface "$vif" iapp_interface
--
-- config_get_bool wps_pbc "$vif" wps_pushbutton 0
-- config_get_bool wps_label "$vif" wps_label 0
--
-- config_get config_methods "$vif" wps_config
-- [ "$wps_pbc" -gt 0 ] && append config_methods push_button
--
-- [ -n "$wps_possible" -a -n "$config_methods" ] && {
-- config_get device_type "$vif" wps_device_type "6-0050F204-1"
-- config_get device_name "$vif" wps_device_name "OpenWrt AP"
-- config_get manufacturer "$vif" wps_manufacturer "openwrt.org"
-- config_get wps_pin "$vif" wps_pin
--
-- config_get_bool ext_registrar "$vif" ext_registrar 0
-- [ "$ext_registrar" -gt 0 -a -n "$bridge" ] && append "$var" "upnp_iface=$bridge" "$N"
--
-- append "$var" "eap_server=1" "$N"
-- [ -n "$wps_pin" ] && append "$var" "ap_pin=$wps_pin" "$N"
-- append "$var" "wps_state=${wps_not_configured:-2}" "$N"
-- append "$var" "ap_setup_locked=0" "$N"
-- append "$var" "device_type=$device_type" "$N"
-- append "$var" "device_name=$device_name" "$N"
-- append "$var" "manufacturer=$manufacturer" "$N"
-- append "$var" "config_methods=$config_methods" "$N"
-- }
--
-- append "$var" "ssid=$ssid" "$N"
-- [ -n "$bridge" ] && append "$var" "bridge=$bridge" "$N"
-- [ -n "$ieee80211d" ] && append "$var" "ieee80211d=$ieee80211d" "$N"
-- [ -n "$iapp_interface" ] && append "$var" iapp_interface=$(uci_get_state network "$iapp_interface" ifname "$iapp_interface") "$N"
--
-- if [ "$wpa" -ge "1" ]
-- then
-- config_get nasid "$vif" nasid
-- [ -n "$nasid" ] && append "$var" "nas_identifier=$nasid" "$N"
--
-- config_get_bool ieee80211r "$vif" ieee80211r 0
-- if [ "$ieee80211r" -gt 0 ]
-- then
-- config_get mobility_domain "$vif" mobility_domain "4f57"
-- config_get r0_key_lifetime "$vif" r0_key_lifetime "10000"
-- config_get r1_key_holder "$vif" r1_key_holder "00004f577274"
-- config_get reassociation_deadline "$vif" reassociation_deadline "1000"
-- config_get r0kh "$vif" r0kh
-- config_get r1kh "$vif" r1kh
-- config_get_bool pmk_r1_push "$vif" pmk_r1_push 0
--
-- append "$var" "mobility_domain=$mobility_domain" "$N"
-- append "$var" "r0_key_lifetime=$r0_key_lifetime" "$N"
-- append "$var" "r1_key_holder=$r1_key_holder" "$N"
-- append "$var" "reassociation_deadline=$reassociation_deadline" "$N"
-- append "$var" "pmk_r1_push=$pmk_r1_push" "$N"
--
-- for kh in $r0kh; do
-- "$var" "r0kh=${kh//,/ }" "$N"
-- done
-- for kh in $r1kh; do
-- "$var" "r1kh=${kh//,/ }" "$N"
-- done
--
-- [ "$wpa_key_mgmt" != "${wpa_key_mgmt/EAP/}" ] && append wpa_key_mgmt "FT-EAP"
-- [ "$wpa_key_mgmt" != "${wpa_key_mgmt/PSK/}" ] && append wpa_key_mgmt "FT-PSK"
-- fi
--
-- [ -n "wpa_key_mgmt" ] && append "$var" "wpa_key_mgmt=$wpa_key_mgmt"
-- fi
--
-- if [ "$wpa" -ge "2" ]
-- then
-- # RSN -> allow preauthentication. You have two
-- # options, rsn_preauth for production or rsn_preauth_testing
-- # for validation / testing.
-- if [ -n "$bridge" -a "$rsn_preauth" = 1 ]
-- then
-- append "$var" "rsn_preauth=1" "$N"
-- append "$var" "rsn_preauth_interfaces=$bridge" "$N"
-- append "$var" "okc=1" "$N"
-- else
-- # RSN preauthentication testings hould disable
-- # Opportunistic Key Caching (okc) as otherwise the PMKSA
-- # entry for a test could come from the Opportunistic Key Caching
-- config_get rsn_preauth_testing "$vif" rsn_preauth_testing
-- if [ -n "$bridge" -a "$rsn_preauth_testing" = 1 ]
-- then
-- append "$var" "rsn_preauth=1" "$N"
-- append "$var" "rsn_preauth_interfaces=$bridge" "$N"
-- append "$var" "okc=0" "$N"
-- fi
-- fi
--
-- # RSN -> allow management frame protection
-- config_get ieee80211w "$vif" ieee80211w
-- case "$ieee80211w" in
-- [012])
-- append "$var" "ieee80211w=$ieee80211w" "$N"
-- [ "$ieee80211w" -gt "0" ] && {
-- config_get ieee80211w_max_timeout "$vif" ieee80211w_max_timeout
-- config_get ieee80211w_retry_timeout "$vif" ieee80211w_retry_timeout
-- [ -n "$ieee80211w_max_timeout" ] && \
-- append "$var" "assoc_sa_query_max_timeout=$ieee80211w_max_timeout" "$N"
-- [ -n "$ieee80211w_retry_timeout" ] && \
-- append "$var" "assoc_sa_query_retry_timeout=$ieee80211w_retry_timeout" "$N"
-- }
-- ;;
-- esac
-- fi
--
-- config_get macfile "$vif" macfile
-- config_get maclist "$vif" maclist
-- if [ -z "$macfile" ]
-- then
-- # if no macfile has been specified, fallback to the default name
-- # and truncate file to avoid aggregating entries over time
-- macfile="/var/run/hostapd-$ifname.maclist"
-- echo "" > "$macfile"
-- else
-- if [ -n "$maclist" ]
-- then
-- # to avoid to overwrite the original file, make a copy
-- # before appending the entries specified by the maclist
-- # option
-- cp $macfile $macfile.maclist
-- macfile=$macfile.maclist
-- fi
-- fi
--
-- if [ -n "$maclist" ]
-- then
-- for mac in $maclist; do
-- echo "$mac" >> $macfile
-- done
-- fi
--
-- config_get macfilter "$vif" macfilter
-- case "$macfilter" in
-- allow)
-- append "$var" "macaddr_acl=1" "$N"
-- append "$var" "accept_mac_file=$macfile" "$N"
-- ;;
-- deny)
-- append "$var" "macaddr_acl=0" "$N"
-- append "$var" "deny_mac_file=$macfile" "$N"
-- ;;
-- esac
--}
--
--hostapd_set_log_options() {
-- local var="$1"
-- local cfg="$2"
-- local log_level log_80211 log_8021x log_radius log_wpa log_driver log_iapp log_mlme
--
-- config_get log_level "$cfg" log_level 2
--
-- config_get_bool log_80211 "$cfg" log_80211 1
-- config_get_bool log_8021x "$cfg" log_8021x 1
-- config_get_bool log_radius "$cfg" log_radius 1
-- config_get_bool log_wpa "$cfg" log_wpa 1
-- config_get_bool log_driver "$cfg" log_driver 1
-- config_get_bool log_iapp "$cfg" log_iapp 1
-- config_get_bool log_mlme "$cfg" log_mlme 1
--
-- local log_mask=$(( \
-- ($log_80211 << 0) | \
-- ($log_8021x << 1) | \
-- ($log_radius << 2) | \
-- ($log_wpa << 3) | \
-- ($log_driver << 4) | \
-- ($log_iapp << 5) | \
-- ($log_mlme << 6) \
-- ))
--
-- append "$var" "logger_syslog=$log_mask" "$N"
-- append "$var" "logger_syslog_level=$log_level" "$N"
-- append "$var" "logger_stdout=$log_mask" "$N"
-- append "$var" "logger_stdout_level=$log_level" "$N"
--}
--
--hostapd_setup_vif() {
-- local vif="$1"
-- local driver="$2"
-- local ifname device channel hwmode
--
-- hostapd_cfg=
--
-- config_get ifname "$vif" ifname
-- config_get device "$vif" device
-- config_get channel "$device" channel
-- config_get hwmode "$device" hwmode
--
-- hostapd_set_log_options hostapd_cfg "$device"
-- hostapd_set_bss_options hostapd_cfg "$vif"
--
-- case "$hwmode" in
-- *bg|*gdt|*gst|*fh) hwmode=g;;
-- *adt|*ast) hwmode=a;;
-- esac
-- [ "$channel" = auto ] && channel=
-- [ -n "$channel" -a -z "$hwmode" ] && wifi_fixup_hwmode "$device"
-- cat > /var/run/hostapd-$ifname.conf <<EOF
--driver=$driver
--interface=$ifname
--${hwmode:+hw_mode=${hwmode#11}}
--${channel:+channel=$channel}
--$hostapd_cfg
--EOF
-- hostapd -P /var/run/wifi-$ifname.pid -B /var/run/hostapd-$ifname.conf
--}
--
-diff --git a/package/network/services/hostapd/files/netifd.sh b/package/network/services/hostapd/files/netifd.sh
-index 23d2e7e83ebe5ca744f40e300fdbfb1014c555c5..e6b0b0d769c6301f05696d4ca963241c3ac11620 100644
---- a/package/network/services/hostapd/files/netifd.sh
-+++ b/package/network/services/hostapd/files/netifd.sh
-@@ -1,3 +1,5 @@
-+. /lib/functions/network.sh
-+
- wpa_supplicant_add_rate() {
- local var="$1"
- local val="$(($2 / 1000))"
-@@ -120,6 +122,7 @@ hostapd_common_add_bss_config() {
-
- config_add_boolean rsn_preauth auth_cache
- config_add_int ieee80211w
-+ config_add_int eapol_version
-
- config_add_string 'auth_server:host' 'server:host'
- config_add_string auth_secret
-@@ -136,10 +139,11 @@ hostapd_common_add_bss_config() {
- config_add_string nasid
- config_add_string ownip
- config_add_string iapp_interface
-- config_add_string eap_type ca_cert client_cert identity auth priv_key priv_key_pwd
-+ config_add_string eap_type ca_cert client_cert identity anonymous_identity auth priv_key priv_key_pwd
-
- config_add_int dynamic_vlan vlan_naming
- config_add_string vlan_tagged_interface vlan_bridge
-+ config_add_string vlan_file
-
- config_add_string 'key1:wepkey' 'key2:wepkey' 'key3:wepkey' 'key4:wepkey' 'password:wpakey'
-
-@@ -182,7 +186,7 @@ hostapd_set_bss_options() {
- wps_pushbutton wps_label ext_registrar wps_pbc_in_m1 \
- wps_device_type wps_device_name wps_manufacturer wps_pin \
- macfilter ssid wmm uapsd hidden short_preamble rsn_preauth \
-- iapp_interface
-+ iapp_interface eapol_version acct_server acct_secret acct_port
-
- set_default isolate 0
- set_default maxassoc 0
-@@ -192,6 +196,8 @@ hostapd_set_bss_options() {
- set_default hidden 0
- set_default wmm 1
- set_default uapsd 1
-+ set_default eapol_version 0
-+ set_default acct_port 1813
-
- append bss_conf "ctrl_interface=/var/run/hostapd"
- if [ "$isolate" -gt 0 ]; then
-@@ -216,6 +222,13 @@ hostapd_set_bss_options() {
- [ -n "$wpa_master_rekey" ] && append bss_conf "wpa_gmk_rekey=$wpa_master_rekey" "$N"
- }
-
-+ [ -n "$acct_server" ] && {
-+ append bss_conf "acct_server_addr=$acct_server" "$N"
-+ append bss_conf "acct_server_port=$acct_port" "$N"
-+ [ -n "$acct_secret" ] && \
-+ append bss_conf "acct_server_shared_secret=$acct_secret" "$N"
-+ }
-+
- case "$auth_type" in
- none)
- wps_possible=1
-@@ -237,18 +250,19 @@ hostapd_set_bss_options() {
- [ -e "$wpa_psk_file" ] || touch "$wpa_psk_file"
- append bss_conf "wpa_psk_file=$wpa_psk_file" "$N"
- }
-+ [ "$eapol_version" -ge "1" -a "$eapol_version" -le "2" ] && append bss_conf "eapol_version=$eapol_version" "$N"
-+
- wps_possible=1
- append wpa_key_mgmt "WPA-PSK"
- ;;
- eap)
- json_get_vars \
- auth_server auth_secret auth_port \
-- acct_server acct_secret acct_port \
- dae_client dae_secret dae_port \
- ownip \
- eap_reauth_period dynamic_vlan \
- vlan_naming vlan_tagged_interface \
-- vlan_bridge
-+ vlan_bridge vlan_file
-
- # legacy compatibility
- [ -n "$auth_server" ] || json_get_var auth_server server
-@@ -256,7 +270,6 @@ hostapd_set_bss_options() {
- [ -n "$auth_secret" ] || json_get_var auth_secret key
-
- set_default auth_port 1812
-- set_default acct_port 1813
- set_default dae_port 3799
-
- set_default vlan_naming 1
-@@ -265,13 +278,6 @@ hostapd_set_bss_options() {
- append bss_conf "auth_server_port=$auth_port" "$N"
- append bss_conf "auth_server_shared_secret=$auth_secret" "$N"
-
-- [ -n "$acct_server" ] && {
-- append bss_conf "acct_server_addr=$acct_server" "$N"
-- append bss_conf "acct_server_port=$acct_port" "$N"
-- [ -n "$acct_secret" ] && \
-- append bss_conf "acct_server_shared_secret=$acct_secret" "$N"
-- }
--
- [ -n "$eap_reauth_period" ] && append bss_conf "eap_reauth_period=$eap_reauth_period" "$N"
-
- [ -n "$dae_client" -a -n "$dae_secret" ] && {
-@@ -291,7 +297,13 @@ hostapd_set_bss_options() {
- append bss_conf "vlan_bridge=$vlan_bridge" "$N"
- [ -n "$vlan_tagged_interface" ] && \
- append bss_conf "vlan_tagged_interface=$vlan_tagged_interface" "$N"
-+ [ -n "$vlan_file" ] && {
-+ [ -e "$vlan_file" ] || touch "$vlan_file"
-+ append bss_conf "vlan_file=$vlan_file" "$N"
-+ }
- }
-+
-+ [ "$eapol_version" -ge "1" -a "$eapol_version" -le "2" ] && append bss_conf "eapol_version=$eapol_version" "$N"
- ;;
- wep)
- local wep_keyidx=0
-@@ -318,8 +330,8 @@ hostapd_set_bss_options() {
- [ -n "$wps_possible" -a -n "$config_methods" ] && {
- set_default ext_registrar 0
- set_default wps_device_type "6-0050F204-1"
-- set_default wps_device_name "OpenWrt AP"
-- set_default wps_manufacturer "openwrt.org"
-+ set_default wps_device_name "Lede AP"
-+ set_default wps_manufacturer "www.lede-project.org"
-
- wps_state=2
- [ -n "$wps_configured" ] && wps_state=1
-@@ -340,8 +352,9 @@ hostapd_set_bss_options() {
- append bss_conf "ssid=$ssid" "$N"
- [ -n "$network_bridge" ] && append bss_conf "bridge=$network_bridge" "$N"
- [ -n "$iapp_interface" ] && {
-- iapp_interface="$(uci_get_state network "$iapp_interface" ifname "$iapp_interface")"
-- [ -n "$iapp_interface" ] && append bss_conf "iapp_interface=$iapp_interface" "$N"
-+ local ifname
-+ network_get_device ifname "$iapp_interface" || ifname = "$iapp_interface"
-+ append bss_conf "iapp_interface=$ifname" "$N"
- }
-
- if [ "$wpa" -ge "1" ]; then
-@@ -522,9 +535,15 @@ wpa_supplicant_prepare_interface() {
- _w_modestr="mode=1"
- }
-
-+ local country_str=
-+ [ -n "$country" ] && {
-+ country_str="country=$country"
-+ }
-+
- wpa_supplicant_teardown_interface "$ifname"
- cat > "$_config" <<EOF
- $ap_scan
-+$country_str
- EOF
- return 0
- }
-@@ -538,7 +557,9 @@ wpa_supplicant_add_network() {
- json_get_vars \
- ssid bssid key \
- basic_rate mcast_rate \
-- ieee80211w
-+ ieee80211w ieee80211r
-+
-+ set_default ieee80211r 0
-
- local key_mgmt='NONE'
- local enc_str=
-@@ -549,6 +570,8 @@ wpa_supplicant_add_network() {
- local scan_ssid="scan_ssid=1"
- local freq
-
-+ [ "$ieee80211r" -gt 0 ] && wpa_key_mgmt="FT-PSK $wpa_key_mgmt"
-+
- [[ "$_w_mode" = "adhoc" ]] && {
- append network_data "mode=1" "$N$T"
- [ -n "$channel" ] && {
-@@ -563,6 +586,9 @@ wpa_supplicant_add_network() {
- }
-
- [[ "$_w_mode" = "mesh" ]] && {
-+ json_get_vars mesh_id
-+ ssid="${mesh_id}"
-+
- append network_data "mode=5" "$N$T"
- [ -n "$channel" ] && {
- freq="$(get_freq "$phy" "$channel")"
-@@ -594,10 +620,12 @@ wpa_supplicant_add_network() {
- ;;
- eap)
- key_mgmt='WPA-EAP'
-+ [ "$ieee80211r" -gt 0 ] && key_mgmt="FT-EAP $key_mgmt"
-
-- json_get_vars eap_type identity ca_cert
-+ json_get_vars eap_type identity anonymous_identity ca_cert
- [ -n "$ca_cert" ] && append network_data "ca_cert=\"$ca_cert\"" "$N$T"
- [ -n "$identity" ] && append network_data "identity=\"$identity\"" "$N$T"
-+ [ -n "$anonymous_identity" ] && append network_data "anonymous_identity=\"$anonymous_identity\"" "$N$T"
- case "$eap_type" in
- tls)
- json_get_vars client_cert priv_key priv_key_pwd
-@@ -605,11 +633,32 @@ wpa_supplicant_add_network() {
- append network_data "private_key=\"$priv_key\"" "$N$T"
- append network_data "private_key_passwd=\"$priv_key_pwd\"" "$N$T"
- ;;
-- peap|ttls)
-- json_get_vars auth password
-+ fast|peap|ttls)
-+ json_get_vars auth password ca_cert2 client_cert2 priv_key2 priv_key2_pwd
- set_default auth MSCHAPV2
-- append network_data "phase2=\"$auth\"" "$N$T"
-- append network_data "password=\"$password\"" "$N$T"
-+
-+ if [ "$auth" = "EAP-TLS" ]; then
-+ [ -n "$ca_cert2" ] &&
-+ append network_data "ca_cert2=\"$ca_cert2\"" "$N$T"
-+ append network_data "client_cert2=\"$client_cert2\"" "$N$T"
-+ append network_data "private_key2=\"$priv_key2\"" "$N$T"
-+ append network_data "private_key2_passwd=\"$priv_key2_pwd\"" "$N$T"
-+ else
-+ append network_data "password=\"$password\"" "$N$T"
-+ fi
-+
-+ phase2proto="auth="
-+ case "$auth" in
-+ "auth"*)
-+ phase2proto=""
-+ ;;
-+ "EAP-"*)
-+ auth="$(echo $auth | cut -b 5- )"
-+ [ "$eap_type" = "ttls" ] &&
-+ phase2proto="autheap="
-+ ;;
-+ esac
-+ append network_data "phase2=\"$phase2proto$auth\"" "$N$T"
- ;;
- esac
- append network_data "eap=$(echo $eap_type | tr 'a-z' 'A-Z')" "$N$T"
-diff --git a/package/network/services/hostapd/files/wpa_supplicant-full.config b/package/network/services/hostapd/files/wpa_supplicant-full.config
-index a9d04ab1752bf8cd8a51d5d4a7cb0431463add57..18c3f9a5c142b2eda67ec3136c73114555c4d131 100644
---- a/package/network/services/hostapd/files/wpa_supplicant-full.config
-+++ b/package/network/services/hostapd/files/wpa_supplicant-full.config
-@@ -41,7 +41,7 @@
-
-
- # Driver interface for Host AP driver
--CONFIG_DRIVER_HOSTAP=y
-+#CONFIG_DRIVER_HOSTAP=y
-
- # Driver interface for Agere driver
- #CONFIG_DRIVER_HERMES=y
-@@ -121,6 +121,9 @@ CONFIG_DRIVER_WIRED=y
- # included)
- CONFIG_IEEE8021X_EAPOL=y
-
-+# EAP-FAST
-+CONFIG_EAP_FAST=y
-+
- # EAP-MD5
- CONFIG_EAP_MD5=y
-
-@@ -367,7 +370,7 @@ CONFIG_INTERNAL_LIBTOMMATH_FAST=y
- #CONFIG_DYNAMIC_EAP_METHODS=y
-
- # IEEE Std 802.11r-2008 (Fast BSS Transition)
--#CONFIG_IEEE80211R=y
-+CONFIG_IEEE80211R=y
-
- # Add support for writing debug log to a file (/tmp/wpa_supplicant-log-#.txt)
- #CONFIG_DEBUG_FILE=y
-diff --git a/package/network/services/hostapd/files/wpa_supplicant-mesh.config b/package/network/services/hostapd/files/wpa_supplicant-mesh.config
-deleted file mode 100644
-index 36e29088c41ab819830e85f2fdadbcf700dc4071..0000000000000000000000000000000000000000
---- a/package/network/services/hostapd/files/wpa_supplicant-mesh.config
-+++ /dev/null
-@@ -1,407 +0,0 @@
--# Example wpa_supplicant build time configuration
--#
--# This file lists the configuration options that are used when building the
--# hostapd binary. All lines starting with # are ignored. Configuration option
--# lines must be commented out complete, if they are not to be included, i.e.,
--# just setting VARIABLE=n is not disabling that variable.
--#
--# This file is included in Makefile, so variables like CFLAGS and LIBS can also
--# be modified from here. In most cases, these lines should use += in order not
--# to override previous values of the variables.
--
--
--# Uncomment following two lines and fix the paths if you have installed OpenSSL
--# or GnuTLS in non-default location
--#CFLAGS += -I/usr/local/openssl/include
--#LIBS += -L/usr/local/openssl/lib
--
--# Some Red Hat versions seem to include kerberos header files from OpenSSL, but
--# the kerberos files are not in the default include path. Following line can be
--# used to fix build issues on such systems (krb5.h not found).
--#CFLAGS += -I/usr/include/kerberos
--
--# Example configuration for various cross-compilation platforms
--
--#### sveasoft (e.g., for Linksys WRT54G) ######################################
--#CC=mipsel-uclibc-gcc
--#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc
--#CFLAGS += -Os
--#CPPFLAGS += -I../src/include -I../../src/router/openssl/include
--#LIBS += -L/opt/brcm/hndtools-mipsel-uclibc-0.9.19/lib -lssl
--###############################################################################
--
--#### openwrt (e.g., for Linksys WRT54G) #######################################
--#CC=mipsel-uclibc-gcc
--#CC=/opt/brcm/hndtools-mipsel-uclibc/bin/mipsel-uclibc-gcc
--#CFLAGS += -Os
--#CPPFLAGS=-I../src/include -I../openssl-0.9.7d/include \
--# -I../WRT54GS/release/src/include
--#LIBS = -lssl
--###############################################################################
--
--
--# Driver interface for Host AP driver
--CONFIG_DRIVER_HOSTAP=y
--
--# Driver interface for Agere driver
--#CONFIG_DRIVER_HERMES=y
--# Change include directories to match with the local setup
--#CFLAGS += -I../../hcf -I../../include -I../../include/hcf
--#CFLAGS += -I../../include/wireless
--
--# Driver interface for ndiswrapper
--# Deprecated; use CONFIG_DRIVER_WEXT=y instead.
--#CONFIG_DRIVER_NDISWRAPPER=y
--
--# Driver interface for Atmel driver
--# CONFIG_DRIVER_ATMEL=y
--
--# Driver interface for old Broadcom driver
--# Please note that the newer Broadcom driver ("hybrid Linux driver") supports
--# Linux wireless extensions and does not need (or even work) with the old
--# driver wrapper. Use CONFIG_DRIVER_WEXT=y with that driver.
--#CONFIG_DRIVER_BROADCOM=y
--# Example path for wlioctl.h; change to match your configuration
--#CFLAGS += -I/opt/WRT54GS/release/src/include
--
--# Driver interface for Intel ipw2100/2200 driver
--# Deprecated; use CONFIG_DRIVER_WEXT=y instead.
--#CONFIG_DRIVER_IPW=y
--
--# Driver interface for Ralink driver
--#CONFIG_DRIVER_RALINK=y
--
--# Driver interface for generic Linux wireless extensions
--CONFIG_DRIVER_WEXT=y
--
--# Driver interface for Linux drivers using the nl80211 kernel interface
--CONFIG_DRIVER_NL80211=y
--
--# Driver interface for FreeBSD net80211 layer (e.g., Atheros driver)
--#CONFIG_DRIVER_BSD=y
--#CFLAGS += -I/usr/local/include
--#LIBS += -L/usr/local/lib
--#LIBS_p += -L/usr/local/lib
--#LIBS_c += -L/usr/local/lib
--
--# Driver interface for Windows NDIS
--#CONFIG_DRIVER_NDIS=y
--#CFLAGS += -I/usr/include/w32api/ddk
--#LIBS += -L/usr/local/lib
--# For native build using mingw
--#CONFIG_NATIVE_WINDOWS=y
--# Additional directories for cross-compilation on Linux host for mingw target
--#CFLAGS += -I/opt/mingw/mingw32/include/ddk
--#LIBS += -L/opt/mingw/mingw32/lib
--#CC=mingw32-gcc
--# By default, driver_ndis uses WinPcap for low-level operations. This can be
--# replaced with the following option which replaces WinPcap calls with NDISUIO.
--# However, this requires that WZC is disabled (net stop wzcsvc) before starting
--# wpa_supplicant.
--# CONFIG_USE_NDISUIO=y
--
--# Driver interface for development testing
--#CONFIG_DRIVER_TEST=y
--
--# Include client MLME (management frame processing) for test driver
--# This can be used to test MLME operations in hostapd with the test interface.
--# space.
--#CONFIG_CLIENT_MLME=y
--
--# Driver interface for wired Ethernet drivers
--CONFIG_DRIVER_WIRED=y
--
--# Driver interface for the Broadcom RoboSwitch family
--#CONFIG_DRIVER_ROBOSWITCH=y
--
--# Driver interface for no driver (e.g., WPS ER only)
--#CONFIG_DRIVER_NONE=y
--
--# Enable IEEE 802.1X Supplicant (automatically included if any EAP method is
--# included)
--CONFIG_IEEE8021X_EAPOL=y
--
--# EAP-MD5
--CONFIG_EAP_MD5=y
--
--# EAP-MSCHAPv2
--CONFIG_EAP_MSCHAPV2=y
--
--# EAP-TLS
--CONFIG_EAP_TLS=y
--
--# EAL-PEAP
--CONFIG_EAP_PEAP=y
--
--# EAP-TTLS
--CONFIG_EAP_TTLS=y
--
--# EAP-FAST
--# Note: Default OpenSSL package does not include support for all the
--# functionality needed for EAP-FAST. If EAP-FAST is enabled with OpenSSL,
--# the OpenSSL library must be patched (openssl-0.9.8d-tls-extensions.patch)
--# to add the needed functions.
--#CONFIG_EAP_FAST=y
--
--# EAP-GTC
--CONFIG_EAP_GTC=y
--
--# EAP-OTP
--CONFIG_EAP_OTP=y
--
--# EAP-SIM (enable CONFIG_PCSC, if EAP-SIM is used)
--#CONFIG_EAP_SIM=y
--
--# EAP-PSK (experimental; this is _not_ needed for WPA-PSK)
--#CONFIG_EAP_PSK=y
--
--# EAP-PAX
--#CONFIG_EAP_PAX=y
--
--# LEAP
--CONFIG_EAP_LEAP=y
--
--# EAP-AKA (enable CONFIG_PCSC, if EAP-AKA is used)
--#CONFIG_EAP_AKA=y
--
--# EAP-AKA' (enable CONFIG_PCSC, if EAP-AKA' is used).
--# This requires CONFIG_EAP_AKA to be enabled, too.
--#CONFIG_EAP_AKA_PRIME=y
--
--# Enable USIM simulator (Milenage) for EAP-AKA
--#CONFIG_USIM_SIMULATOR=y
--
--# EAP-SAKE
--#CONFIG_EAP_SAKE=y
--
--# EAP-GPSK
--#CONFIG_EAP_GPSK=y
--# Include support for optional SHA256 cipher suite in EAP-GPSK
--#CONFIG_EAP_GPSK_SHA256=y
--
--# EAP-TNC and related Trusted Network Connect support (experimental)
--#CONFIG_EAP_TNC=y
--
--# Wi-Fi Protected Setup (WPS)
--CONFIG_WPS=y
--
--# EAP-IKEv2
--#CONFIG_EAP_IKEV2=y
--
--# PKCS#12 (PFX) support (used to read private key and certificate file from
--# a file that usually has extension .p12 or .pfx)
--CONFIG_PKCS12=y
--
--# Smartcard support (i.e., private key on a smartcard), e.g., with openssl
--# engine.
--CONFIG_SMARTCARD=y
--
--# PC/SC interface for smartcards (USIM, GSM SIM)
--# Enable this if EAP-SIM or EAP-AKA is included
--#CONFIG_PCSC=y
--
--# Development testing
--#CONFIG_EAPOL_TEST=y
--
--# Select control interface backend for external programs, e.g, wpa_cli:
--# unix = UNIX domain sockets (default for Linux/*BSD)
--# udp = UDP sockets using localhost (127.0.0.1)
--# named_pipe = Windows Named Pipe (default for Windows)
--# y = use default (backwards compatibility)
--# If this option is commented out, control interface is not included in the
--# build.
--CONFIG_CTRL_IFACE=y
--
--# Include support for GNU Readline and History Libraries in wpa_cli.
--# When building a wpa_cli binary for distribution, please note that these
--# libraries are licensed under GPL and as such, BSD license may not apply for
--# the resulting binary.
--#CONFIG_READLINE=y
--
--# Remove debugging code that is printing out debug message to stdout.
--# This can be used to reduce the size of the wpa_supplicant considerably
--# if debugging code is not needed. The size reduction can be around 35%
--# (e.g., 90 kB).
--#CONFIG_NO_STDOUT_DEBUG=y
--
--# Remove WPA support, e.g., for wired-only IEEE 802.1X supplicant, to save
--# 35-50 kB in code size.
--#CONFIG_NO_WPA=y
--
--# Remove WPA2 support. This allows WPA to be used, but removes WPA2 code to
--# save about 1 kB in code size when building only WPA-Personal (no EAP support)
--# or 6 kB if building for WPA-Enterprise.
--#CONFIG_NO_WPA2=y
--
--# Remove IEEE 802.11i/WPA-Personal ASCII passphrase support
--# This option can be used to reduce code size by removing support for
--# converting ASCII passphrases into PSK. If this functionality is removed, the
--# PSK can only be configured as the 64-octet hexstring (e.g., from
--# wpa_passphrase). This saves about 0.5 kB in code size.
--#CONFIG_NO_WPA_PASSPHRASE=y
--
--# Disable scan result processing (ap_mode=1) to save code size by about 1 kB.
--# This can be used if ap_scan=1 mode is never enabled.
--#CONFIG_NO_SCAN_PROCESSING=y
--
--# Select configuration backend:
--# file = text file (e.g., wpa_supplicant.conf; note: the configuration file
--# path is given on command line, not here; this option is just used to
--# select the backend that allows configuration files to be used)
--# winreg = Windows registry (see win_example.reg for an example)
--CONFIG_BACKEND=file
--
--# Remove configuration write functionality (i.e., to allow the configuration
--# file to be updated based on runtime configuration changes). The runtime
--# configuration can still be changed, the changes are just not going to be
--# persistent over restarts. This option can be used to reduce code size by
--# about 3.5 kB.
--#CONFIG_NO_CONFIG_WRITE=y
--
--# Remove support for configuration blobs to reduce code size by about 1.5 kB.
--#CONFIG_NO_CONFIG_BLOBS=y
--
--# Select program entry point implementation:
--# main = UNIX/POSIX like main() function (default)
--# main_winsvc = Windows service (read parameters from registry)
--# main_none = Very basic example (development use only)
--#CONFIG_MAIN=main
--
--# Select wrapper for operatins system and C library specific functions
--# unix = UNIX/POSIX like systems (default)
--# win32 = Windows systems
--# none = Empty template
--#CONFIG_OS=unix
--
--# Select event loop implementation
--# eloop = select() loop (default)
--# eloop_win = Windows events and WaitForMultipleObject() loop
--# eloop_none = Empty template
--#CONFIG_ELOOP=eloop
--
--# Select layer 2 packet implementation
--# linux = Linux packet socket (default)
--# pcap = libpcap/libdnet/WinPcap
--# freebsd = FreeBSD libpcap
--# winpcap = WinPcap with receive thread
--# ndis = Windows NDISUIO (note: requires CONFIG_USE_NDISUIO=y)
--# none = Empty template
--#CONFIG_L2_PACKET=linux
--
--# PeerKey handshake for Station to Station Link (IEEE 802.11e DLS)
--CONFIG_PEERKEY=y
--
--# IEEE 802.11w (management frame protection)
--# This version is an experimental implementation based on IEEE 802.11w/D1.0
--# draft and is subject to change since the standard has not yet been finalized.
--# Driver support is also needed for IEEE 802.11w.
--CONFIG_IEEE80211W=y
--
--# Select TLS implementation
--# openssl = OpenSSL (default)
--# gnutls = GnuTLS (needed for TLS/IA, see also CONFIG_GNUTLS_EXTRA)
--# internal = Internal TLSv1 implementation (experimental)
--# none = Empty template
--CONFIG_TLS=internal
--
--# Whether to enable TLS/IA support, which is required for EAP-TTLSv1.
--# You need CONFIG_TLS=gnutls for this to have any effect. Please note that
--# even though the core GnuTLS library is released under LGPL, this extra
--# library uses GPL and as such, the terms of GPL apply to the combination
--# of wpa_supplicant and GnuTLS if this option is enabled. BSD license may not
--# apply for distribution of the resulting binary.
--#CONFIG_GNUTLS_EXTRA=y
--
--# If CONFIG_TLS=internal is used, additional library and include paths are
--# needed for LibTomMath. Alternatively, an integrated, minimal version of
--# LibTomMath can be used. See beginning of libtommath.c for details on benefits
--# and drawbacks of this option.
--CONFIG_INTERNAL_LIBTOMMATH=y
--#ifndef CONFIG_INTERNAL_LIBTOMMATH
--#LTM_PATH=/usr/src/libtommath-0.39
--#CFLAGS += -I$(LTM_PATH)
--#LIBS += -L$(LTM_PATH)
--#LIBS_p += -L$(LTM_PATH)
--#endif
--# At the cost of about 4 kB of additional binary size, the internal LibTomMath
--# can be configured to include faster routines for exptmod, sqr, and div to
--# speed up DH and RSA calculation considerably
--CONFIG_INTERNAL_LIBTOMMATH_FAST=y
--
--# Include NDIS event processing through WMI into wpa_supplicant/wpasvc.
--# This is only for Windows builds and requires WMI-related header files and
--# WbemUuid.Lib from Platform SDK even when building with MinGW.
--#CONFIG_NDIS_EVENTS_INTEGRATED=y
--#PLATFORMSDKLIB="/opt/Program Files/Microsoft Platform SDK/Lib"
--
--# Add support for old DBus control interface
--# (fi.epitest.hostap.WPASupplicant)
--#CONFIG_CTRL_IFACE_DBUS=y
--
--# Add support for new DBus control interface
--# (fi.w1.hostap.wpa_supplicant1)
--#CONFIG_CTRL_IFACE_DBUS_NEW=y
--
--# Add introspection support for new DBus control interface
--#CONFIG_CTRL_IFACE_DBUS_INTRO=y
--
--# Add support for loading EAP methods dynamically as shared libraries.
--# When this option is enabled, each EAP method can be either included
--# statically (CONFIG_EAP_<method>=y) or dynamically (CONFIG_EAP_<method>=dyn).
--# Dynamic EAP methods are build as shared objects (eap_*.so) and they need to
--# be loaded in the beginning of the wpa_supplicant configuration file
--# (see load_dynamic_eap parameter in the example file) before being used in
--# the network blocks.
--#
--# Note that some shared parts of EAP methods are included in the main program
--# and in order to be able to use dynamic EAP methods using these parts, the
--# main program must have been build with the EAP method enabled (=y or =dyn).
--# This means that EAP-TLS/PEAP/TTLS/FAST cannot be added as dynamic libraries
--# unless at least one of them was included in the main build to force inclusion
--# of the shared code. Similarly, at least one of EAP-SIM/AKA must be included
--# in the main build to be able to load these methods dynamically.
--#
--# Please also note that using dynamic libraries will increase the total binary
--# size. Thus, it may not be the best option for targets that have limited
--# amount of memory/flash.
--#CONFIG_DYNAMIC_EAP_METHODS=y
--
--# IEEE Std 802.11r-2008 (Fast BSS Transition)
--#CONFIG_IEEE80211R=y
--
--# Add support for writing debug log to a file (/tmp/wpa_supplicant-log-#.txt)
--#CONFIG_DEBUG_FILE=y
--
--# Enable privilege separation (see README 'Privilege separation' for details)
--#CONFIG_PRIVSEP=y
--
--# Enable mitigation against certain attacks against TKIP by delaying Michael
--# MIC error reports by a random amount of time between 0 and 60 seconds
--#CONFIG_DELAYED_MIC_ERROR_REPORT=y
--
--# Enable tracing code for developer debugging
--# This tracks use of memory allocations and other registrations and reports
--# incorrect use with a backtrace of call (or allocation) location.
--#CONFIG_WPA_TRACE=y
--# For BSD, comment out these.
--#LIBS += -lexecinfo
--#LIBS_p += -lexecinfo
--#LIBS_c += -lexecinfo
--
--# Use libbfd to get more details for developer debugging
--# This enables use of libbfd to get more detailed symbols for the backtraces
--# generated by CONFIG_WPA_TRACE=y.
--#CONFIG_WPA_TRACE_BFD=y
--# For BSD, comment out these.
--#LIBS += -lbfd -liberty -lz
--#LIBS_p += -lbfd -liberty -lz
--#LIBS_c += -lbfd -liberty -lz
--
--CONFIG_NO_RANDOM_POOL=y
--NEED_80211_COMMON=y
--
--CONFIG_IBSS_RSN=y
--
--CONFIG_MESH=y
--CONFIG_SAE=y
--CONFIG_AP=y
-diff --git a/package/network/services/hostapd/files/wpa_supplicant-mini.config b/package/network/services/hostapd/files/wpa_supplicant-mini.config
-index a8d334d942e0618eb1224d093bb5047b1b40577a..c272153b3a9ee52e3dd6370c533fd0d06fac9e20 100644
---- a/package/network/services/hostapd/files/wpa_supplicant-mini.config
-+++ b/package/network/services/hostapd/files/wpa_supplicant-mini.config
-@@ -41,7 +41,7 @@
-
-
- # Driver interface for Host AP driver
--CONFIG_DRIVER_HOSTAP=y
-+#CONFIG_DRIVER_HOSTAP=y
-
- # Driver interface for Agere driver
- #CONFIG_DRIVER_HERMES=y
-diff --git a/package/network/services/hostapd/files/wpa_supplicant-p2p.config b/package/network/services/hostapd/files/wpa_supplicant-p2p.config
-index 1c307d0e697b99036cafaed8b923cea0523114c2..563dace352f36e471374d40e37deee171d69094f 100644
---- a/package/network/services/hostapd/files/wpa_supplicant-p2p.config
-+++ b/package/network/services/hostapd/files/wpa_supplicant-p2p.config
-@@ -41,7 +41,7 @@
-
-
- # Driver interface for Host AP driver
--CONFIG_DRIVER_HOSTAP=y
-+#CONFIG_DRIVER_HOSTAP=y
-
- # Driver interface for Agere driver
- #CONFIG_DRIVER_HERMES=y
-diff --git a/package/network/services/hostapd/files/wpa_supplicant.sh b/package/network/services/hostapd/files/wpa_supplicant.sh
-deleted file mode 100644
-index b6784843e8ea99763796d9bfe772b004468e7304..0000000000000000000000000000000000000000
---- a/package/network/services/hostapd/files/wpa_supplicant.sh
-+++ /dev/null
-@@ -1,194 +0,0 @@
--wpa_supplicant_setup_vif() {
-- local vif="$1"
-- local driver="$2"
-- local key="$key"
-- local options="$3"
-- local freq=""
-- local ht="$5"
-- local ap_scan=""
-- local scan_ssid="1"
-- [ -n "$4" ] && freq="frequency=$4"
--
-- config_get enc "$vif" encryption
-- config_get key "$vif" key
--
-- local net_cfg bridge
-- config_get bridge "$vif" bridge
-- [ -z "$bridge" ] && {
-- net_cfg="$(find_net_config "$vif")"
-- [ -z "$net_cfg" ] || bridge="$(bridge_interface "$net_cfg")"
-- config_set "$vif" bridge "$bridge"
-- }
--
-- local mode ifname wds modestr=""
-- config_get mode "$vif" mode
-- config_get ifname "$vif" ifname
-- config_get_bool wds "$vif" wds 0
-- [ -z "$bridge" ] || [ "$mode" = ap ] || [ "$mode" = sta -a $wds -eq 1 ] || {
-- echo "wpa_supplicant_setup_vif($ifname): Refusing to bridge $mode mode interface"
-- return 1
-- }
-- [ "$mode" = "adhoc" ] && {
-- modestr="mode=1"
-- scan_ssid="0"
-- ap_scan="ap_scan=2"
-- }
--
-- key_mgmt='NONE'
-- case "$enc" in
-- *none*) ;;
-- *wep*)
-- config_get key "$vif" key
-- key="${key:-1}"
-- case "$key" in
-- [1234])
-- for idx in 1 2 3 4; do
-- local zidx
-- zidx=$(($idx - 1))
-- config_get ckey "$vif" "key${idx}"
-- [ -n "$ckey" ] && \
-- append "wep_key${zidx}" "wep_key${zidx}=$(prepare_key_wep "$ckey")"
-- done
-- wep_tx_keyidx="wep_tx_keyidx=$((key - 1))"
-- ;;
-- *)
-- wep_key0="wep_key0=$(prepare_key_wep "$key")"
-- wep_tx_keyidx="wep_tx_keyidx=0"
-- ;;
-- esac
-- ;;
-- *psk*)
-- key_mgmt='WPA-PSK'
-- # if you want to use PSK with a non-nl80211 driver you
-- # have to use WPA-NONE and wext driver for wpa_s
-- [ "$mode" = "adhoc" -a "$driver" != "nl80211" ] && {
-- key_mgmt='WPA-NONE'
-- driver='wext'
-- }
-- if [ ${#key} -eq 64 ]; then
-- passphrase="psk=${key}"
-- else
-- passphrase="psk=\"${key}\""
-- fi
-- case "$enc" in
-- *psk2*)
-- proto='proto=RSN'
-- config_get ieee80211w "$vif" ieee80211w
-- ;;
-- *psk*)
-- proto='proto=WPA'
-- ;;
-- esac
-- ;;
-- *wpa*|*8021x*)
-- proto='proto=WPA2'
-- key_mgmt='WPA-EAP'
-- config_get ieee80211w "$vif" ieee80211w
-- config_get ca_cert "$vif" ca_cert
-- config_get eap_type "$vif" eap_type
-- ca_cert=${ca_cert:+"ca_cert=\"$ca_cert\""}
-- case "$eap_type" in
-- tls)
-- pairwise='pairwise=CCMP'
-- group='group=CCMP'
-- config_get identity "$vif" identity
-- config_get client_cert "$vif" client_cert
-- config_get priv_key "$vif" priv_key
-- config_get priv_key_pwd "$vif" priv_key_pwd
-- identity="identity=\"$identity\""
-- client_cert="client_cert=\"$client_cert\""
-- priv_key="private_key=\"$priv_key\""
-- priv_key_pwd="private_key_passwd=\"$priv_key_pwd\""
-- ;;
-- peap|ttls)
-- config_get auth "$vif" auth
-- config_get identity "$vif" identity
-- config_get password "$vif" password
-- phase2="phase2=\"auth=${auth:-MSCHAPV2}\""
-- identity="identity=\"$identity\""
-- password="${password:+password=\"$password\"}"
-- ;;
-- esac
-- eap_type="eap=$(echo $eap_type | tr 'a-z' 'A-Z')"
-- ;;
-- esac
--
-- case "$ieee80211w" in
-- [012])
-- ieee80211w="ieee80211w=$ieee80211w"
-- ;;
-- esac
--
-- local fixed_freq bssid1 beacon_int brates mrate
-- config_get ifname "$vif" ifname
-- config_get bridge "$vif" bridge
-- config_get ssid "$vif" ssid
-- config_get bssid "$vif" bssid
-- bssid1=${bssid:+"bssid=$bssid"}
-- beacon_int=${beacon_int:+"beacon_int=$beacon_int"}
--
-- local br brval brsub brstr
-- [ -n "$basic_rate_list" ] && {
-- for br in $basic_rate_list; do
-- brval="$(($br / 1000))"
-- brsub="$((($br / 100) % 10))"
-- [ "$brsub" -gt 0 ] && brval="$brval.$brsub"
-- [ -n "$brstr" ] && brstr="$brstr,"
-- brstr="$brstr$brval"
-- done
-- brates=${basic_rate_list:+"rates=$brstr"}
-- }
--
-- local mcval=""
-- [ -n "$mcast_rate" ] && {
-- mcval="$(($mcast_rate / 1000))"
-- mcsub="$(( ($mcast_rate / 100) % 10 ))"
-- [ "$mcsub" -gt 0 ] && mcval="$mcval.$mcsub"
-- mrate=${mcast_rate:+"mcast_rate=$mcval"}
-- }
--
-- local ht_str
-- [ -n "$ht" ] && ht_str="htmode=$ht"
--
-- rm -rf /var/run/wpa_supplicant-$ifname
-- cat > /var/run/wpa_supplicant-$ifname.conf <<EOF
--ctrl_interface=/var/run/wpa_supplicant-$ifname
--$ap_scan
--network={
-- $modestr
-- scan_ssid=$scan_ssid
-- ssid="$ssid"
-- $bssid1
-- key_mgmt=$key_mgmt
-- $proto
-- $freq
-- ${fixed:+"fixed_freq=1"}
-- $beacon_int
-- $brates
-- $mrate
-- $ht_str
-- $ieee80211w
-- $passphrase
-- $pairwise
-- $group
-- $eap_type
-- $ca_cert
-- $client_cert
-- $priv_key
-- $priv_key_pwd
-- $phase2
-- $identity
-- $password
-- $wep_key0
-- $wep_key1
-- $wep_key2
-- $wep_key3
-- $wep_tx_keyidx
--}
--EOF
-- if [ -n "$proto" -o "$key_mgmt" = "NONE" ]; then
-- wpa_supplicant ${bridge:+ -b $bridge} -B -P "/var/run/wifi-${ifname}.pid" -D ${driver:-wext} -i "$ifname" -c /var/run/wpa_supplicant-$ifname.conf $options
-- else
-- return 0
-- fi
--}
-diff --git a/package/network/services/hostapd/patches/001-4addr-fix-reconnecting-client-on-connection-lost.patch b/package/network/services/hostapd/patches/001-4addr-fix-reconnecting-client-on-connection-lost.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..5c8b6622c9a257bee024de6c9db9e3da38312b6f
---- /dev/null
-+++ b/package/network/services/hostapd/patches/001-4addr-fix-reconnecting-client-on-connection-lost.patch
-@@ -0,0 +1,25 @@
-+From: Matthias May <matthias.may@neratec.com>
-+Date: Tue, 5 Jul 2016 15:00:43 +0200
-+Subject: [PATCH] 4addr: fix reconnecting client on connection lost
-+
-+When a 4addr client suddenly looses its connection (no deauth/deassoc)
-+the AP still thinks it is connected.
-+If the client reconnects before the AP timeoutes the client, traffic
-+cannot flow.
-+
-+Fix this by making sure the WLAN_STA_WDS flag is unset in the sta->flags
-+when the client completes association.
-+
-+Signed-off-by: Matthias May <matthias.may@neratec.com>
-+---
-+
-+--- a/src/ap/ieee802_11.c
-++++ b/src/ap/ieee802_11.c
-+@@ -2826,6 +2826,7 @@ static void handle_assoc_cb(struct hosta
-+ new_assoc = 0;
-+ sta->flags |= WLAN_STA_ASSOC;
-+ sta->flags &= ~WLAN_STA_WNM_SLEEP_MODE;
-++ sta->flags &= ~WLAN_STA_WDS;
-+ if ((!hapd->conf->ieee802_1x && !hapd->conf->wpa && !hapd->conf->osen) ||
-+ sta->auth_alg == WLAN_AUTH_FT) {
-+ /*
-diff --git a/package/network/services/hostapd/patches/001-P2P-Validate-SSID-element-length-before-copying-it-C.patch b/package/network/services/hostapd/patches/001-P2P-Validate-SSID-element-length-before-copying-it-C.patch
-deleted file mode 100644
-index e408fbe3839e07637f526a99cd83e9e7558bc4d2..0000000000000000000000000000000000000000
---- a/package/network/services/hostapd/patches/001-P2P-Validate-SSID-element-length-before-copying-it-C.patch
-+++ /dev/null
-@@ -1,37 +0,0 @@
--From 9ed4eee345f85e3025c33c6e20aa25696e341ccd Mon Sep 17 00:00:00 2001
--From: Jouni Malinen <jouni@qca.qualcomm.com>
--Date: Tue, 7 Apr 2015 11:32:11 +0300
--Subject: [PATCH] P2P: Validate SSID element length before copying it
-- (CVE-2015-1863)
--
--This fixes a possible memcpy overflow for P2P dev->oper_ssid in
--p2p_add_device(). The length provided by the peer device (0..255 bytes)
--was used without proper bounds checking and that could have resulted in
--arbitrary data of up to 223 bytes being written beyond the end of the
--dev->oper_ssid[] array (of which about 150 bytes would be beyond the
--heap allocation) when processing a corrupted management frame for P2P
--peer discovery purposes.
--
--This could result in corrupted state in heap, unexpected program
--behavior due to corrupted P2P peer device information, denial of service
--due to process crash, exposure of memory contents during GO Negotiation,
--and potentially arbitrary code execution.
--
--Thanks to Google security team for reporting this issue and smart
--hardware research group of Alibaba security team for discovering it.
--
--Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
-----
-- src/p2p/p2p.c | 1 +
-- 1 file changed, 1 insertion(+)
--
----- a/src/p2p/p2p.c
--+++ b/src/p2p/p2p.c
--@@ -778,6 +778,7 @@ int p2p_add_device(struct p2p_data *p2p,
-- if (os_memcmp(addr, p2p_dev_addr, ETH_ALEN) != 0)
-- os_memcpy(dev->interface_addr, addr, ETH_ALEN);
-- if (msg.ssid &&
--+ msg.ssid[1] <= sizeof(dev->oper_ssid) &&
-- (msg.ssid[1] != P2P_WILDCARD_SSID_LEN ||
-- os_memcmp(msg.ssid + 2, P2P_WILDCARD_SSID, P2P_WILDCARD_SSID_LEN)
-- != 0)) {
-diff --git a/package/network/services/hostapd/patches/002-AP-WMM-Fix-integer-underflow-in-WMM-Action-frame-par.patch b/package/network/services/hostapd/patches/002-AP-WMM-Fix-integer-underflow-in-WMM-Action-frame-par.patch
-deleted file mode 100644
-index bc4d60fcc18c165e11e3a322bc064b6b18eaffed..0000000000000000000000000000000000000000
---- a/package/network/services/hostapd/patches/002-AP-WMM-Fix-integer-underflow-in-WMM-Action-frame-par.patch
-+++ /dev/null
-@@ -1,36 +0,0 @@
--From ef566a4d4f74022e1fdb0a2addfe81e6de9f4aae Mon Sep 17 00:00:00 2001
--From: Jouni Malinen <j@w1.fi>
--Date: Wed, 29 Apr 2015 02:21:53 +0300
--Subject: [PATCH] AP WMM: Fix integer underflow in WMM Action frame parser
--
--The length of the WMM Action frame was not properly validated and the
--length of the information elements (int left) could end up being
--negative. This would result in reading significantly past the stack
--buffer while parsing the IEs in ieee802_11_parse_elems() and while doing
--so, resulting in segmentation fault.
--
--This can result in an invalid frame being used for a denial of service
--attack (hostapd process killed) against an AP with a driver that uses
--hostapd for management frame processing (e.g., all mac80211-based
--drivers).
--
--Thanks to Kostya Kortchinsky of Google security team for discovering and
--reporting this issue.
--
--Signed-off-by: Jouni Malinen <j@w1.fi>
-----
-- src/ap/wmm.c | 3 +++
-- 1 file changed, 3 insertions(+)
--
----- a/src/ap/wmm.c
--+++ b/src/ap/wmm.c
--@@ -274,6 +274,9 @@ void hostapd_wmm_action(struct hostapd_d
-- return;
-- }
--
--+ if (left < 0)
--+ return; /* not a valid WMM Action frame */
--+
-- /* extract the tspec info element */
-- if (ieee802_11_parse_elems(pos, left, &elems, 1) == ParseFailed) {
-- hostapd_logger(hapd, mgmt->sa, HOSTAPD_MODULE_IEEE80211,
-diff --git a/package/network/services/hostapd/patches/002-mesh-Set-correct-secondary-channel-offset-if-HT40-is.patch b/package/network/services/hostapd/patches/002-mesh-Set-correct-secondary-channel-offset-if-HT40-is.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..243922002a856c1910bdccdaee62304d78f27868
---- /dev/null
-+++ b/package/network/services/hostapd/patches/002-mesh-Set-correct-secondary-channel-offset-if-HT40-is.patch
-@@ -0,0 +1,61 @@
-+From: Masashi Honma <masashi.honma@gmail.com>
-+Date: Tue, 26 Jul 2016 11:45:40 +0900
-+Subject: [PATCH] mesh: Set correct secondary channel offset if HT40 is
-+ disabled
-+
-+Previously, secondary channel offset could be non zero even though
-+disable_ht40=1. This patch fixes it.
-+
-+Signed-off-by: Masashi Honma <masashi.honma@gmail.com>
-+---
-+
-+--- a/wpa_supplicant/wpa_supplicant.c
-++++ b/wpa_supplicant/wpa_supplicant.c
-+@@ -1901,20 +1901,27 @@ void ibss_mesh_setup_freq(struct wpa_sup
-+ break;
-+ }
-+ }
-++#ifdef CONFIG_HT_OVERRIDES
-++ if (ssid->disable_ht40)
-++ ht40 = 0;
-++#endif /* CONFIG_HT_OVERRIDES */
-+
-+- /* Find secondary channel */
-+- for (i = 0; i < mode->num_channels; i++) {
-+- sec_chan = &mode->channels[i];
-+- if (sec_chan->chan == channel + ht40 * 4)
-+- break;
-+- sec_chan = NULL;
-+- }
-+- if (!sec_chan)
-+- return;
-++ if (ht40) {
-++ /* Find secondary channel */
-++ for (i = 0; i < mode->num_channels; i++) {
-++ sec_chan = &mode->channels[i];
-++ if (sec_chan->chan == channel + ht40 * 4)
-++ break;
-++ sec_chan = NULL;
-++ }
-++ if (!sec_chan)
-++ return;
-+
-+- /* Check secondary channel flags */
-+- if (sec_chan->flag & (HOSTAPD_CHAN_DISABLED | HOSTAPD_CHAN_NO_IR))
-+- return;
-++ /* Check secondary channel flags */
-++ if (sec_chan->flag &
-++ (HOSTAPD_CHAN_DISABLED | HOSTAPD_CHAN_NO_IR))
-++ return;
-++ }
-+
-+ freq->channel = pri_chan->chan;
-+
-+@@ -1930,6 +1937,7 @@ void ibss_mesh_setup_freq(struct wpa_sup
-+ freq->sec_channel_offset = 1;
-+ break;
-+ default:
-++ freq->sec_channel_offset = 0;
-+ break;
-+ }
-+
-diff --git a/package/network/services/hostapd/patches/003-WPS-Fix-HTTP-chunked-transfer-encoding-parser.patch b/package/network/services/hostapd/patches/003-WPS-Fix-HTTP-chunked-transfer-encoding-parser.patch
-deleted file mode 100644
-index 36b4ca2946990108d1d294cb15540a6bc3207e99..0000000000000000000000000000000000000000
---- a/package/network/services/hostapd/patches/003-WPS-Fix-HTTP-chunked-transfer-encoding-parser.patch
-+++ /dev/null
-@@ -1,49 +0,0 @@
--From 5acd23f4581da58683f3cf5e36cb71bbe4070bd7 Mon Sep 17 00:00:00 2001
--From: Jouni Malinen <j@w1.fi>
--Date: Tue, 28 Apr 2015 17:08:33 +0300
--Subject: [PATCH] WPS: Fix HTTP chunked transfer encoding parser
--
--strtoul() return value may end up overflowing the int h->chunk_size and
--resulting in a negative value to be stored as the chunk_size. This could
--result in the following memcpy operation using a very large length
--argument which would result in a buffer overflow and segmentation fault.
--
--This could have been used to cause a denial service by any device that
--has been authorized for network access (either wireless or wired). This
--would affect both the WPS UPnP functionality in a WPS AP (hostapd with
--upnp_iface parameter set in the configuration) and WPS ER
--(wpa_supplicant with WPS_ER_START control interface command used).
--
--Validate the parsed chunk length value to avoid this. In addition to
--rejecting negative values, we can also reject chunk size that would be
--larger than the maximum configured body length.
--
--Thanks to Kostya Kortchinsky of Google security team for discovering and
--reporting this issue.
--
--Signed-off-by: Jouni Malinen <j@w1.fi>
-----
-- src/wps/httpread.c | 7 +++++++
-- 1 file changed, 7 insertions(+)
--
--diff --git a/src/wps/httpread.c b/src/wps/httpread.c
--index 2f08f37..d2855e3 100644
----- a/src/wps/httpread.c
--+++ b/src/wps/httpread.c
--@@ -533,6 +533,13 @@ static void httpread_read_handler(int sd, void *eloop_ctx, void *sock_ctx)
-- if (!isxdigit(*cbp))
-- goto bad;
-- h->chunk_size = strtoul(cbp, NULL, 16);
--+ if (h->chunk_size < 0 ||
--+ h->chunk_size > h->max_bytes) {
--+ wpa_printf(MSG_DEBUG,
--+ "httpread: Invalid chunk size %d",
--+ h->chunk_size);
--+ goto bad;
--+ }
-- /* throw away chunk header
-- * so we have only real data
-- */
----
--1.9.1
--
-diff --git a/package/network/services/hostapd/patches/004-EAP-pwd-peer-Fix-payload-length-validation-for-Commi.patch b/package/network/services/hostapd/patches/004-EAP-pwd-peer-Fix-payload-length-validation-for-Commi.patch
-deleted file mode 100644
-index 91627fb7b7f6bf43b085290cbd135bba18325295..0000000000000000000000000000000000000000
---- a/package/network/services/hostapd/patches/004-EAP-pwd-peer-Fix-payload-length-validation-for-Commi.patch
-+++ /dev/null
-@@ -1,73 +0,0 @@
--From dd2f043c9c43d156494e33d7ce22db96e6ef42c7 Mon Sep 17 00:00:00 2001
--From: Jouni Malinen <j@w1.fi>
--Date: Fri, 1 May 2015 16:37:45 +0300
--Subject: [PATCH 1/5] EAP-pwd peer: Fix payload length validation for Commit
-- and Confirm
--
--The length of the received Commit and Confirm message payloads was not
--checked before reading them. This could result in a buffer read
--overflow when processing an invalid message.
--
--Fix this by verifying that the payload is of expected length before
--processing it. In addition, enforce correct state transition sequence to
--make sure there is no unexpected behavior if receiving a Commit/Confirm
--message before the previous exchanges have been completed.
--
--Thanks to Kostya Kortchinsky of Google security team for discovering and
--reporting this issue.
--
--Signed-off-by: Jouni Malinen <j@w1.fi>
-----
-- src/eap_peer/eap_pwd.c | 29 +++++++++++++++++++++++++++++
-- 1 file changed, 29 insertions(+)
--
--diff --git a/src/eap_peer/eap_pwd.c b/src/eap_peer/eap_pwd.c
--index f2b0926..a629437 100644
----- a/src/eap_peer/eap_pwd.c
--+++ b/src/eap_peer/eap_pwd.c
--@@ -355,6 +355,23 @@ eap_pwd_perform_commit_exchange(struct eap_sm *sm, struct eap_pwd_data *data,
-- BIGNUM *mask = NULL, *x = NULL, *y = NULL, *cofactor = NULL;
-- u16 offset;
-- u8 *ptr, *scalar = NULL, *element = NULL;
--+ size_t prime_len, order_len;
--+
--+ if (data->state != PWD_Commit_Req) {
--+ ret->ignore = TRUE;
--+ goto fin;
--+ }
--+
--+ prime_len = BN_num_bytes(data->grp->prime);
--+ order_len = BN_num_bytes(data->grp->order);
--+
--+ if (payload_len != 2 * prime_len + order_len) {
--+ wpa_printf(MSG_INFO,
--+ "EAP-pwd: Unexpected Commit payload length %u (expected %u)",
--+ (unsigned int) payload_len,
--+ (unsigned int) (2 * prime_len + order_len));
--+ goto fin;
--+ }
--
-- if (((data->private_value = BN_new()) == NULL) ||
-- ((data->my_element = EC_POINT_new(data->grp->group)) == NULL) ||
--@@ -554,6 +571,18 @@ eap_pwd_perform_confirm_exchange(struct eap_sm *sm, struct eap_pwd_data *data,
-- u8 conf[SHA256_MAC_LEN], *cruft = NULL, *ptr;
-- int offset;
--
--+ if (data->state != PWD_Confirm_Req) {
--+ ret->ignore = TRUE;
--+ goto fin;
--+ }
--+
--+ if (payload_len != SHA256_MAC_LEN) {
--+ wpa_printf(MSG_INFO,
--+ "EAP-pwd: Unexpected Confirm payload length %u (expected %u)",
--+ (unsigned int) payload_len, SHA256_MAC_LEN);
--+ goto fin;
--+ }
--+
-- /*
-- * first build up the ciphersuite which is group | random_function |
-- * prf
----
--1.9.1
--
-diff --git a/package/network/services/hostapd/patches/005-EAP-pwd-server-Fix-payload-length-validation-for-Com.patch b/package/network/services/hostapd/patches/005-EAP-pwd-server-Fix-payload-length-validation-for-Com.patch
-deleted file mode 100644
-index 5dca20b2771b855ac724ce0b0bf4bee2e377f7bf..0000000000000000000000000000000000000000
---- a/package/network/services/hostapd/patches/005-EAP-pwd-server-Fix-payload-length-validation-for-Com.patch
-+++ /dev/null
-@@ -1,66 +0,0 @@
--From e28a58be26184c2a23f80b410e0997ef1bd5d578 Mon Sep 17 00:00:00 2001
--From: Jouni Malinen <j@w1.fi>
--Date: Fri, 1 May 2015 16:40:44 +0300
--Subject: [PATCH 2/5] EAP-pwd server: Fix payload length validation for Commit
-- and Confirm
--
--The length of the received Commit and Confirm message payloads was not
--checked before reading them. This could result in a buffer read
--overflow when processing an invalid message.
--
--Fix this by verifying that the payload is of expected length before
--processing it. In addition, enforce correct state transition sequence to
--make sure there is no unexpected behavior if receiving a Commit/Confirm
--message before the previous exchanges have been completed.
--
--Thanks to Kostya Kortchinsky of Google security team for discovering and
--reporting this issue.
--
--Signed-off-by: Jouni Malinen <j@w1.fi>
-----
-- src/eap_server/eap_server_pwd.c | 19 +++++++++++++++++++
-- 1 file changed, 19 insertions(+)
--
--diff --git a/src/eap_server/eap_server_pwd.c b/src/eap_server/eap_server_pwd.c
--index 66bd5d2..3189105 100644
----- a/src/eap_server/eap_server_pwd.c
--+++ b/src/eap_server/eap_server_pwd.c
--@@ -656,9 +656,21 @@ eap_pwd_process_commit_resp(struct eap_sm *sm, struct eap_pwd_data *data,
-- BIGNUM *x = NULL, *y = NULL, *cofactor = NULL;
-- EC_POINT *K = NULL, *point = NULL;
-- int res = 0;
--+ size_t prime_len, order_len;
--
-- wpa_printf(MSG_DEBUG, "EAP-pwd: Received commit response");
--
--+ prime_len = BN_num_bytes(data->grp->prime);
--+ order_len = BN_num_bytes(data->grp->order);
--+
--+ if (payload_len != 2 * prime_len + order_len) {
--+ wpa_printf(MSG_INFO,
--+ "EAP-pwd: Unexpected Commit payload length %u (expected %u)",
--+ (unsigned int) payload_len,
--+ (unsigned int) (2 * prime_len + order_len));
--+ goto fin;
--+ }
--+
-- if (((data->peer_scalar = BN_new()) == NULL) ||
-- ((data->k = BN_new()) == NULL) ||
-- ((cofactor = BN_new()) == NULL) ||
--@@ -774,6 +786,13 @@ eap_pwd_process_confirm_resp(struct eap_sm *sm, struct eap_pwd_data *data,
-- u8 conf[SHA256_MAC_LEN], *cruft = NULL, *ptr;
-- int offset;
--
--+ if (payload_len != SHA256_MAC_LEN) {
--+ wpa_printf(MSG_INFO,
--+ "EAP-pwd: Unexpected Confirm payload length %u (expected %u)",
--+ (unsigned int) payload_len, SHA256_MAC_LEN);
--+ goto fin;
--+ }
--+
-- /* build up the ciphersuite: group | random_function | prf */
-- grp = htons(data->group_num);
-- ptr = (u8 *) &cs;
----
--1.9.1
--
-diff --git a/package/network/services/hostapd/patches/006-EAP-pwd-peer-Fix-Total-Length-parsing-for-fragment-r.patch b/package/network/services/hostapd/patches/006-EAP-pwd-peer-Fix-Total-Length-parsing-for-fragment-r.patch
-deleted file mode 100644
-index 4d2f9d8aefebd43813ba55e5f1152cd2120323ca..0000000000000000000000000000000000000000
---- a/package/network/services/hostapd/patches/006-EAP-pwd-peer-Fix-Total-Length-parsing-for-fragment-r.patch
-+++ /dev/null
-@@ -1,52 +0,0 @@
--From 477c74395acd0123340457ba6f15ab345d42016e Mon Sep 17 00:00:00 2001
--From: Jouni Malinen <j@w1.fi>
--Date: Sat, 2 May 2015 19:23:04 +0300
--Subject: [PATCH 3/5] EAP-pwd peer: Fix Total-Length parsing for fragment
-- reassembly
--
--The remaining number of bytes in the message could be smaller than the
--Total-Length field size, so the length needs to be explicitly checked
--prior to reading the field and decrementing the len variable. This could
--have resulted in the remaining length becoming negative and interpreted
--as a huge positive integer.
--
--In addition, check that there is no already started fragment in progress
--before allocating a new buffer for reassembling fragments. This avoid a
--potential memory leak when processing invalid message.
--
--Signed-off-by: Jouni Malinen <j@w1.fi>
-----
-- src/eap_peer/eap_pwd.c | 12 ++++++++++++
-- 1 file changed, 12 insertions(+)
--
--diff --git a/src/eap_peer/eap_pwd.c b/src/eap_peer/eap_pwd.c
--index a629437..1d2079b 100644
----- a/src/eap_peer/eap_pwd.c
--+++ b/src/eap_peer/eap_pwd.c
--@@ -866,11 +866,23 @@ eap_pwd_process(struct eap_sm *sm, void *priv, struct eap_method_ret *ret,
-- * if it's the first fragment there'll be a length field
-- */
-- if (EAP_PWD_GET_LENGTH_BIT(lm_exch)) {
--+ if (len < 2) {
--+ wpa_printf(MSG_DEBUG,
--+ "EAP-pwd: Frame too short to contain Total-Length field");
--+ ret->ignore = TRUE;
--+ return NULL;
--+ }
-- tot_len = WPA_GET_BE16(pos);
-- wpa_printf(MSG_DEBUG, "EAP-pwd: Incoming fragments whose "
-- "total length = %d", tot_len);
-- if (tot_len > 15000)
-- return NULL;
--+ if (data->inbuf) {
--+ wpa_printf(MSG_DEBUG,
--+ "EAP-pwd: Unexpected new fragment start when previous fragment is still in use");
--+ ret->ignore = TRUE;
--+ return NULL;
--+ }
-- data->inbuf = wpabuf_alloc(tot_len);
-- if (data->inbuf == NULL) {
-- wpa_printf(MSG_INFO, "Out of memory to buffer "
----
--1.9.1
--
-diff --git a/package/network/services/hostapd/patches/007-EAP-pwd-server-Fix-Total-Length-parsing-for-fragment.patch b/package/network/services/hostapd/patches/007-EAP-pwd-server-Fix-Total-Length-parsing-for-fragment.patch
-deleted file mode 100644
-index 7edef099eb59e2dc92fed9ca10fd0479a965c51c..0000000000000000000000000000000000000000
---- a/package/network/services/hostapd/patches/007-EAP-pwd-server-Fix-Total-Length-parsing-for-fragment.patch
-+++ /dev/null
-@@ -1,50 +0,0 @@
--From 3035cc2894e08319b905bd6561e8bddc8c2db9fa Mon Sep 17 00:00:00 2001
--From: Jouni Malinen <j@w1.fi>
--Date: Sat, 2 May 2015 19:26:06 +0300
--Subject: [PATCH 4/5] EAP-pwd server: Fix Total-Length parsing for fragment
-- reassembly
--
--The remaining number of bytes in the message could be smaller than the
--Total-Length field size, so the length needs to be explicitly checked
--prior to reading the field and decrementing the len variable. This could
--have resulted in the remaining length becoming negative and interpreted
--as a huge positive integer.
--
--In addition, check that there is no already started fragment in progress
--before allocating a new buffer for reassembling fragments. This avoid a
--potential memory leak when processing invalid message.
--
--Signed-off-by: Jouni Malinen <j@w1.fi>
-----
-- src/eap_server/eap_server_pwd.c | 10 ++++++++++
-- 1 file changed, 10 insertions(+)
--
--diff --git a/src/eap_server/eap_server_pwd.c b/src/eap_server/eap_server_pwd.c
--index 3189105..2bfc3c2 100644
----- a/src/eap_server/eap_server_pwd.c
--+++ b/src/eap_server/eap_server_pwd.c
--@@ -942,11 +942,21 @@ static void eap_pwd_process(struct eap_sm *sm, void *priv,
-- * the first fragment has a total length
-- */
-- if (EAP_PWD_GET_LENGTH_BIT(lm_exch)) {
--+ if (len < 2) {
--+ wpa_printf(MSG_DEBUG,
--+ "EAP-pwd: Frame too short to contain Total-Length field");
--+ return;
--+ }
-- tot_len = WPA_GET_BE16(pos);
-- wpa_printf(MSG_DEBUG, "EAP-pwd: Incoming fragments, total "
-- "length = %d", tot_len);
-- if (tot_len > 15000)
-- return;
--+ if (data->inbuf) {
--+ wpa_printf(MSG_DEBUG,
--+ "EAP-pwd: Unexpected new fragment start when previous fragment is still in use");
--+ return;
--+ }
-- data->inbuf = wpabuf_alloc(tot_len);
-- if (data->inbuf == NULL) {
-- wpa_printf(MSG_INFO, "EAP-pwd: Out of memory to "
----
--1.9.1
--
-diff --git a/package/network/services/hostapd/patches/008-EAP-pwd-peer-Fix-asymmetric-fragmentation-behavior.patch b/package/network/services/hostapd/patches/008-EAP-pwd-peer-Fix-asymmetric-fragmentation-behavior.patch
-deleted file mode 100644
-index a601323f14da8a98f08c6ee02367ac74890059f3..0000000000000000000000000000000000000000
---- a/package/network/services/hostapd/patches/008-EAP-pwd-peer-Fix-asymmetric-fragmentation-behavior.patch
-+++ /dev/null
-@@ -1,32 +0,0 @@
--From 28a069a545b06b99eb55ad53f63f2c99e65a98f6 Mon Sep 17 00:00:00 2001
--From: Jouni Malinen <j@w1.fi>
--Date: Sat, 2 May 2015 19:26:28 +0300
--Subject: [PATCH 5/5] EAP-pwd peer: Fix asymmetric fragmentation behavior
--
--The L (Length) and M (More) flags needs to be cleared before deciding
--whether the locally generated response requires fragmentation. This
--fixes an issue where these flags from the server could have been invalid
--for the following message. In some cases, this could have resulted in
--triggering the wpabuf security check that would terminate the process
--due to invalid buffer allocation.
--
--Signed-off-by: Jouni Malinen <j@w1.fi>
-----
-- src/eap_peer/eap_pwd.c | 1 +
-- 1 file changed, 1 insertion(+)
--
--diff --git a/src/eap_peer/eap_pwd.c b/src/eap_peer/eap_pwd.c
--index 1d2079b..e58b13a 100644
----- a/src/eap_peer/eap_pwd.c
--+++ b/src/eap_peer/eap_pwd.c
--@@ -968,6 +968,7 @@ eap_pwd_process(struct eap_sm *sm, void *priv, struct eap_method_ret *ret,
-- /*
-- * we have output! Do we need to fragment it?
-- */
--+ lm_exch = EAP_PWD_GET_EXCHANGE(lm_exch);
-- len = wpabuf_len(data->outbuf);
-- if ((len + EAP_PWD_HDR_SIZE) > data->mtu) {
-- resp = eap_msg_alloc(EAP_VENDOR_IETF, EAP_TYPE_PWD, data->mtu,
----
--1.9.1
--
-diff --git a/package/network/services/hostapd/patches/009-NFC-Fix-payload-length-validation-in-NDEF-record-par.patch b/package/network/services/hostapd/patches/009-NFC-Fix-payload-length-validation-in-NDEF-record-par.patch
-deleted file mode 100644
-index dd3462465ea4ff460c5be5a10379da9b72973007..0000000000000000000000000000000000000000
---- a/package/network/services/hostapd/patches/009-NFC-Fix-payload-length-validation-in-NDEF-record-par.patch
-+++ /dev/null
-@@ -1,61 +0,0 @@
--From df9079e72760ceb7ebe7fb11538200c516bdd886 Mon Sep 17 00:00:00 2001
--From: Jouni Malinen <j@w1.fi>
--Date: Tue, 7 Jul 2015 21:57:28 +0300
--Subject: [PATCH] NFC: Fix payload length validation in NDEF record parser
--
--It was possible for the 32-bit record->total_length value to end up
--wrapping around due to integer overflow if the longer form of payload
--length field is used and record->payload_length gets a value close to
--2^32. This could result in ndef_parse_record() accepting a too large
--payload length value and the record type filter reading up to about 20
--bytes beyond the end of the buffer and potentially killing the process.
--This could also result in an attempt to allocate close to 2^32 bytes of
--heap memory and if that were to succeed, a buffer read overflow of the
--same length which would most likely result in the process termination.
--In case of record->total_length ending up getting the value 0, there
--would be no buffer read overflow, but record parsing would result in an
--infinite loop in ndef_parse_records().
--
--Any of these error cases could potentially be used for denial of service
--attacks over NFC by using a malformed NDEF record on an NFC Tag or
--sending them during NFC connection handover if the application providing
--the NDEF message to hostapd/wpa_supplicant did no validation of the
--received records. While such validation is likely done in the NFC stack
--that needs to parse the NFC messages before further processing,
--hostapd/wpa_supplicant better be prepared for any data being included
--here.
--
--Fix this by validating record->payload_length value in a way that
--detects integer overflow. (CID 122668)
--
--Signed-off-by: Jouni Malinen <j@w1.fi>
-----
-- src/wps/ndef.c | 5 ++++-
-- 1 file changed, 4 insertions(+), 1 deletion(-)
--
--diff --git a/src/wps/ndef.c b/src/wps/ndef.c
--index 5604b0a..50d018f 100644
----- a/src/wps/ndef.c
--+++ b/src/wps/ndef.c
--@@ -48,6 +48,8 @@ static int ndef_parse_record(const u8 *data, u32 size,
-- if (size < 6)
-- return -1;
-- record->payload_length = ntohl(*(u32 *)pos);
--+ if (record->payload_length > size - 6)
--+ return -1;
-- pos += sizeof(u32);
-- }
--
--@@ -68,7 +70,8 @@ static int ndef_parse_record(const u8 *data, u32 size,
-- pos += record->payload_length;
--
-- record->total_length = pos - data;
--- if (record->total_length > size)
--+ if (record->total_length > size ||
--+ record->total_length < record->payload_length)
-- return -1;
-- return 0;
-- }
----
--1.9.1
--
-diff --git a/package/network/services/hostapd/patches/010-WNM-Ignore-Key-Data-in-WNM-Sleep-Mode-Response-frame.patch b/package/network/services/hostapd/patches/010-WNM-Ignore-Key-Data-in-WNM-Sleep-Mode-Response-frame.patch
-deleted file mode 100644
-index 00e5b7c771df4c8aeec39aafc2b893297667038d..0000000000000000000000000000000000000000
---- a/package/network/services/hostapd/patches/010-WNM-Ignore-Key-Data-in-WNM-Sleep-Mode-Response-frame.patch
-+++ /dev/null
-@@ -1,32 +0,0 @@
--From 6b12d93d2c7428a34bfd4b3813ba339ed57b698a Mon Sep 17 00:00:00 2001
--From: Jouni Malinen <j@w1.fi>
--Date: Sun, 25 Oct 2015 15:45:50 +0200
--Subject: [PATCH] WNM: Ignore Key Data in WNM Sleep Mode Response frame if no
-- PMF in use
--
--WNM Sleep Mode Response frame is used to update GTK/IGTK only if PMF is
--enabled. Verify that PMF is in use before using this field on station
--side to avoid accepting unauthenticated key updates. (CVE-2015-5310)
--
--Signed-off-by: Jouni Malinen <j@w1.fi>
-----
-- wpa_supplicant/wnm_sta.c | 6 ++++++
-- 1 file changed, 6 insertions(+)
--
--diff --git a/wpa_supplicant/wnm_sta.c b/wpa_supplicant/wnm_sta.c
--index 954de67..7d79499 100644
----- a/wpa_supplicant/wnm_sta.c
--+++ b/wpa_supplicant/wnm_sta.c
--@@ -187,6 +187,12 @@ static void wnm_sleep_mode_exit_success(struct wpa_supplicant *wpa_s,
-- end = ptr + key_len_total;
-- wpa_hexdump_key(MSG_DEBUG, "WNM: Key Data", ptr, key_len_total);
--
--+ if (key_len_total && !wpa_sm_pmf_enabled(wpa_s->wpa)) {
--+ wpa_msg(wpa_s, MSG_INFO,
--+ "WNM: Ignore Key Data in WNM-Sleep Mode Response - PMF not enabled");
--+ return;
--+ }
--+
-- while (ptr + 1 < end) {
-- if (ptr + 2 + ptr[1] > end) {
-- wpa_printf(MSG_DEBUG, "WNM: Invalid Key Data element "
-diff --git a/package/network/services/hostapd/patches/011-EAP-pwd-peer-Fix-last-fragment-length-validation.patch b/package/network/services/hostapd/patches/011-EAP-pwd-peer-Fix-last-fragment-length-validation.patch
-deleted file mode 100644
-index 82c26398b69d4c7b32c4851fdba43630af172c28..0000000000000000000000000000000000000000
---- a/package/network/services/hostapd/patches/011-EAP-pwd-peer-Fix-last-fragment-length-validation.patch
-+++ /dev/null
-@@ -1,54 +0,0 @@
--From 8057821706784608b828e769ccefbced95591e50 Mon Sep 17 00:00:00 2001
--From: Jouni Malinen <j@w1.fi>
--Date: Sun, 1 Nov 2015 18:18:17 +0200
--Subject: [PATCH] EAP-pwd peer: Fix last fragment length validation
--
--All but the last fragment had their length checked against the remaining
--room in the reassembly buffer. This allowed a suitably constructed last
--fragment frame to try to add extra data that would go beyond the buffer.
--The length validation code in wpabuf_put_data() prevents an actual
--buffer write overflow from occurring, but this results in process
--termination. (CVE-2015-5315)
--
--Signed-off-by: Jouni Malinen <j@w1.fi>
-----
-- src/eap_peer/eap_pwd.c | 7 +++----
-- 1 file changed, 3 insertions(+), 4 deletions(-)
--
--diff --git a/src/eap_peer/eap_pwd.c b/src/eap_peer/eap_pwd.c
--index 1f78544..75ceef1 100644
----- a/src/eap_peer/eap_pwd.c
--+++ b/src/eap_peer/eap_pwd.c
--@@ -903,7 +903,7 @@ eap_pwd_process(struct eap_sm *sm, void *priv, struct eap_method_ret *ret,
-- /*
-- * buffer and ACK the fragment
-- */
--- if (EAP_PWD_GET_MORE_BIT(lm_exch)) {
--+ if (EAP_PWD_GET_MORE_BIT(lm_exch) || data->in_frag_pos) {
-- data->in_frag_pos += len;
-- if (data->in_frag_pos > wpabuf_size(data->inbuf)) {
-- wpa_printf(MSG_INFO, "EAP-pwd: Buffer overflow attack "
--@@ -916,7 +916,8 @@ eap_pwd_process(struct eap_sm *sm, void *priv, struct eap_method_ret *ret,
-- return NULL;
-- }
-- wpabuf_put_data(data->inbuf, pos, len);
---
--+ }
--+ if (EAP_PWD_GET_MORE_BIT(lm_exch)) {
-- resp = eap_msg_alloc(EAP_VENDOR_IETF, EAP_TYPE_PWD,
-- EAP_PWD_HDR_SIZE,
-- EAP_CODE_RESPONSE, eap_get_id(reqData));
--@@ -930,10 +931,8 @@ eap_pwd_process(struct eap_sm *sm, void *priv, struct eap_method_ret *ret,
-- * we're buffering and this is the last fragment
-- */
-- if (data->in_frag_pos) {
--- wpabuf_put_data(data->inbuf, pos, len);
-- wpa_printf(MSG_DEBUG, "EAP-pwd: Last fragment, %d bytes",
-- (int) len);
--- data->in_frag_pos += len;
-- pos = wpabuf_head_u8(data->inbuf);
-- len = data->in_frag_pos;
-- }
----
--1.9.1
--
-diff --git a/package/network/services/hostapd/patches/012-EAP-pwd-server-Fix-last-fragment-length-validation.patch b/package/network/services/hostapd/patches/012-EAP-pwd-server-Fix-last-fragment-length-validation.patch
-deleted file mode 100644
-index bfc4c74e95cad7dae1afe5a315b9e4ff5ab5b920..0000000000000000000000000000000000000000
---- a/package/network/services/hostapd/patches/012-EAP-pwd-server-Fix-last-fragment-length-validation.patch
-+++ /dev/null
-@@ -1,51 +0,0 @@
--From bef802ece03f9ae9d52a21f0cf4f1bc2c5a1f8aa Mon Sep 17 00:00:00 2001
--From: Jouni Malinen <j@w1.fi>
--Date: Sun, 1 Nov 2015 18:24:16 +0200
--Subject: [PATCH] EAP-pwd server: Fix last fragment length validation
--
--All but the last fragment had their length checked against the remaining
--room in the reassembly buffer. This allowed a suitably constructed last
--fragment frame to try to add extra data that would go beyond the buffer.
--The length validation code in wpabuf_put_data() prevents an actual
--buffer write overflow from occurring, but this results in process
--termination. (CVE-2015-5314)
--
--Signed-off-by: Jouni Malinen <j@w1.fi>
-----
-- src/eap_server/eap_server_pwd.c | 6 +++---
-- 1 file changed, 3 insertions(+), 3 deletions(-)
--
--diff --git a/src/eap_server/eap_server_pwd.c b/src/eap_server/eap_server_pwd.c
--index cb83ff7..9f787ab 100644
----- a/src/eap_server/eap_server_pwd.c
--+++ b/src/eap_server/eap_server_pwd.c
--@@ -970,7 +970,7 @@ static void eap_pwd_process(struct eap_sm *sm, void *priv,
-- /*
-- * the first and all intermediate fragments have the M bit set
-- */
--- if (EAP_PWD_GET_MORE_BIT(lm_exch)) {
--+ if (EAP_PWD_GET_MORE_BIT(lm_exch) || data->in_frag_pos) {
-- if ((data->in_frag_pos + len) > wpabuf_size(data->inbuf)) {
-- wpa_printf(MSG_DEBUG, "EAP-pwd: Buffer overflow "
-- "attack detected! (%d+%d > %d)",
--@@ -981,6 +981,8 @@ static void eap_pwd_process(struct eap_sm *sm, void *priv,
-- }
-- wpabuf_put_data(data->inbuf, pos, len);
-- data->in_frag_pos += len;
--+ }
--+ if (EAP_PWD_GET_MORE_BIT(lm_exch)) {
-- wpa_printf(MSG_DEBUG, "EAP-pwd: Got a %d byte fragment",
-- (int) len);
-- return;
--@@ -990,8 +992,6 @@ static void eap_pwd_process(struct eap_sm *sm, void *priv,
-- * buffering fragments so that's how we know it's the last)
-- */
-- if (data->in_frag_pos) {
--- wpabuf_put_data(data->inbuf, pos, len);
--- data->in_frag_pos += len;
-- pos = wpabuf_head_u8(data->inbuf);
-- len = data->in_frag_pos;
-- wpa_printf(MSG_DEBUG, "EAP-pwd: Last fragment, %d bytes",
----
--1.9.1
--
-diff --git a/package/network/services/hostapd/patches/013-EAP-pwd-peer-Fix-error-path-for-unexpected-Confirm-m.patch b/package/network/services/hostapd/patches/013-EAP-pwd-peer-Fix-error-path-for-unexpected-Confirm-m.patch
-deleted file mode 100644
-index 3088f6a6dcda38dd4d579f020607237780324dc4..0000000000000000000000000000000000000000
---- a/package/network/services/hostapd/patches/013-EAP-pwd-peer-Fix-error-path-for-unexpected-Confirm-m.patch
-+++ /dev/null
-@@ -1,34 +0,0 @@
--From 95577884ca4fa76be91344ff7a8d5d1e6dc3da61 Mon Sep 17 00:00:00 2001
--From: Jouni Malinen <j@w1.fi>
--Date: Sun, 1 Nov 2015 19:35:44 +0200
--Subject: [PATCH] EAP-pwd peer: Fix error path for unexpected Confirm message
--
--If the Confirm message is received from the server before the Identity
--exchange has been completed, the group has not yet been determined and
--data->grp is NULL. The error path in eap_pwd_perform_confirm_exchange()
--did not take this corner case into account and could end up
--dereferencing a NULL pointer and terminating the process if invalid
--message sequence is received. (CVE-2015-5316)
--
--Signed-off-by: Jouni Malinen <j@w1.fi>
-----
-- src/eap_peer/eap_pwd.c | 3 ++-
-- 1 file changed, 2 insertions(+), 1 deletion(-)
--
--diff --git a/src/eap_peer/eap_pwd.c b/src/eap_peer/eap_pwd.c
--index 75ceef1..892b590 100644
----- a/src/eap_peer/eap_pwd.c
--+++ b/src/eap_peer/eap_pwd.c
--@@ -774,7 +774,8 @@ eap_pwd_perform_confirm_exchange(struct eap_sm *sm, struct eap_pwd_data *data,
-- wpabuf_put_data(data->outbuf, conf, SHA256_MAC_LEN);
--
-- fin:
--- bin_clear_free(cruft, BN_num_bytes(data->grp->prime));
--+ if (data->grp)
--+ bin_clear_free(cruft, BN_num_bytes(data->grp->prime));
-- BN_clear_free(x);
-- BN_clear_free(y);
-- if (data->outbuf == NULL) {
----
--1.9.1
--
-diff --git a/package/network/services/hostapd/patches/014-nl80211-Try-running-without-mgmt-frame-subscription-.patch b/package/network/services/hostapd/patches/014-nl80211-Try-running-without-mgmt-frame-subscription-.patch
-deleted file mode 100644
-index 25ba87d8d140ee614253c1ef75921313130c88b2..0000000000000000000000000000000000000000
---- a/package/network/services/hostapd/patches/014-nl80211-Try-running-without-mgmt-frame-subscription-.patch
-+++ /dev/null
-@@ -1,48 +0,0 @@
--From f4830bed661f4adff51f50a0d37c64ceb748e780 Mon Sep 17 00:00:00 2001
--From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
--Date: Mon, 25 Apr 2016 17:10:47 +0200
--Subject: [PATCH] nl80211: Try running without mgmt frame subscription (driver
-- AP SME)
--MIME-Version: 1.0
--Content-Type: text/plain; charset=UTF-8
--Content-Transfer-Encoding: 8bit
--
--One of supported code paths already allows this scenario. It is used if
--driver doesn't report NL80211_ATTR_DEVICE_AP_SME and doesn't support
--monitor interface. In such situation:
--1) We don't quit if subscribing for WLAN_FC_STYPE_PROBE_REQ fails
--2) We don't try subscribing for WLAN_FC_STYPE_ACTION
--3) We fallback to AP SME mode after failing to create monitor interface
--4) We don't quit if subscribing for WLAN_FC_STYPE_PROBE_REQ fails
--Above scenario is used, e.g., with brcmfmac. As you can see - thanks to
--events provided by cfg80211 - it's not really required to receive Probe
--Request or action frames.
--
--However, the previous implementation did not allow using hostapd with
--drivers that:
--1) Report NL80211_ATTR_DEVICE_AP_SME
--2) Don't support subscribing for PROBE_REQ and/or ACTION frames
--In case of using such a driver hostapd will cancel setup after failing
--to subscribe for WLAN_FC_STYPE_ACTION. I noticed it after setting flag
--WIPHY_FLAG_HAVE_AP_SME in brcmfmac driver for my experiments.
--
--This patch allows working with such drivers with just a small warning
--printed as debug message.
--
--Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
-----
-- src/drivers/driver_nl80211.c | 3 ++-
-- 1 file changed, 2 insertions(+), 1 deletion(-)
--
----- a/src/drivers/driver_nl80211.c
--+++ b/src/drivers/driver_nl80211.c
--@@ -4108,7 +4108,8 @@ static int nl80211_setup_ap(struct i802_
--
-- if (drv->device_ap_sme && !drv->use_monitor)
-- if (nl80211_mgmt_subscribe_ap_dev_sme(bss))
--- return -1;
--+ wpa_printf(MSG_DEBUG,
--+ "nl80211: Failed to subscribe for mgmt frames from SME driver - trying to run without it");
--
-- if (!drv->device_ap_sme && drv->use_monitor &&
-- nl80211_create_monitor_interface(drv) &&
-diff --git a/package/network/services/hostapd/patches/100-mesh_mode_fix.patch b/package/network/services/hostapd/patches/100-mesh_mode_fix.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..ceb4c53afacfb1dd5430a487147e73b3de4f7239
---- /dev/null
-+++ b/package/network/services/hostapd/patches/100-mesh_mode_fix.patch
-@@ -0,0 +1,12 @@
-+--- a/src/drivers/driver_nl80211.c
-++++ b/src/drivers/driver_nl80211.c
-+@@ -2332,7 +2332,8 @@ wpa_driver_nl80211_finish_drv_init(struc
-+
-+ if (drv->hostapd || bss->static_ap)
-+ nlmode = NL80211_IFTYPE_AP;
-+- else if (bss->if_dynamic)
-++ else if (bss->if_dynamic ||
-++ nl80211_get_ifmode(bss) == NL80211_IFTYPE_MESH_POINT)
-+ nlmode = nl80211_get_ifmode(bss);
-+ else
-+ nlmode = NL80211_IFTYPE_STATION;
-diff --git a/package/network/services/hostapd/patches/110-bool_fix.patch b/package/network/services/hostapd/patches/110-bool_fix.patch
-deleted file mode 100644
-index 865c014ee311d3d9ae73575d211d8c8904b0e237..0000000000000000000000000000000000000000
---- a/package/network/services/hostapd/patches/110-bool_fix.patch
-+++ /dev/null
-@@ -1,14 +0,0 @@
----- a/src/ap/ieee802_1x.c
--+++ b/src/ap/ieee802_1x.c
--@@ -2332,9 +2332,9 @@ void ieee802_1x_notify_pre_auth(struct e
-- }
--
--
---static const char * bool_txt(Boolean bool)
--+static const char * bool_txt(Boolean bool_val)
-- {
--- return bool ? "TRUE" : "FALSE";
--+ return bool_val ? "TRUE" : "FALSE";
-- }
--
--
-diff --git a/package/network/services/hostapd/patches/110-fix_parse_das_client.patch b/package/network/services/hostapd/patches/110-fix_parse_das_client.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..67fb899f30a6f9dbd04b89da28a3ed9fd6263fa6
---- /dev/null
-+++ b/package/network/services/hostapd/patches/110-fix_parse_das_client.patch
-@@ -0,0 +1,10 @@
-+--- a/hostapd/config_file.c
-++++ b/hostapd/config_file.c
-+@@ -645,6 +645,7 @@ static int hostapd_parse_das_client(stru
-+ if (secret == NULL)
-+ return -1;
-+
-++ *secret = 0;
-+ secret++;
-+
-+ if (hostapd_parse_ip_addr(val, &bss->radius_das_client_addr))
-diff --git a/package/network/services/hostapd/patches/120-daemonize_fix.patch b/package/network/services/hostapd/patches/120-daemonize_fix.patch
-index 032e2072a35770628f96831ab3b6c4bbebdb7cf2..0389406a98a11a9eb4d5df64a30896e57dea103b 100644
---- a/package/network/services/hostapd/patches/120-daemonize_fix.patch
-+++ b/package/network/services/hostapd/patches/120-daemonize_fix.patch
-@@ -8,7 +8,7 @@
-
- #ifdef ANDROID
- #include <sys/capability.h>
--@@ -155,59 +156,46 @@ int os_gmtime(os_time_t t, struct os_tm
-+@@ -179,59 +180,46 @@ int os_gmtime(os_time_t t, struct os_tm
- return 0;
- }
-
-@@ -60,13 +60,13 @@
- + if (chdir("/") < 0)
- return -1;
- - }
---
-+
- - return 0;
- -}
- -#else /* __APPLE__ */
- -#define os_daemon daemon
- -#endif /* __APPLE__ */
--
-+-
- -
- -int os_daemonize(const char *pid_file)
- -{
-diff --git a/package/network/services/hostapd/patches/130-no_eapol_fix.patch b/package/network/services/hostapd/patches/130-no_eapol_fix.patch
-index d23b47b03c7b652cd7fa7b5ca3937633638aac25..5aee3d07f16b1f5665fab1b2a31794c32e18cbac 100644
---- a/package/network/services/hostapd/patches/130-no_eapol_fix.patch
-+++ b/package/network/services/hostapd/patches/130-no_eapol_fix.patch
-@@ -1,6 +1,6 @@
- --- a/wpa_supplicant/wpa_supplicant.c
- +++ b/wpa_supplicant/wpa_supplicant.c
--@@ -252,9 +252,10 @@ void wpa_supplicant_cancel_auth_timeout(
-+@@ -257,9 +257,10 @@ void wpa_supplicant_cancel_auth_timeout(
- */
- void wpa_supplicant_initiate_eapol(struct wpa_supplicant *wpa_s)
- {
-diff --git a/package/network/services/hostapd/patches/140-disable_bridge_packet_workaround.patch b/package/network/services/hostapd/patches/140-disable_bridge_packet_workaround.patch
-index 6337d8d737bfa3c327d46b8843cbbe72efe4c14d..fdd5da9bf5e99cad1a998f80f435ac26097274cd 100644
---- a/package/network/services/hostapd/patches/140-disable_bridge_packet_workaround.patch
-+++ b/package/network/services/hostapd/patches/140-disable_bridge_packet_workaround.patch
-@@ -1,6 +1,6 @@
- --- a/src/l2_packet/l2_packet_linux.c
- +++ b/src/l2_packet/l2_packet_linux.c
--@@ -307,8 +307,7 @@ struct l2_packet_data * l2_packet_init_b
-+@@ -337,8 +337,7 @@ struct l2_packet_data * l2_packet_init_b
-
- l2 = l2_packet_init(br_ifname, own_addr, protocol, rx_callback,
- rx_callback_ctx, l2_hdr);
-@@ -8,5 +8,5 @@
- - return NULL;
- + return l2;
-
-+ #ifndef CONFIG_NO_LINUX_PACKET_SOCKET_WAR
- /*
-- * The Linux packet socket behavior has changed over the years and there
-diff --git a/package/network/services/hostapd/patches/150-nl80211-Report-disassociated-STA-lost-peer-for-the-c.patch b/package/network/services/hostapd/patches/150-nl80211-Report-disassociated-STA-lost-peer-for-the-c.patch
-deleted file mode 100644
-index 66c682fbd39c4cad25590534236da3261743ab70..0000000000000000000000000000000000000000
---- a/package/network/services/hostapd/patches/150-nl80211-Report-disassociated-STA-lost-peer-for-the-c.patch
-+++ /dev/null
-@@ -1,67 +0,0 @@
--From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <zajec5@gmail.com>
--Date: Mon, 11 Jan 2016 19:18:06 +0100
--Subject: [PATCH] nl80211: Report disassociated STA / lost peer for the correct
-- BSS
--MIME-Version: 1.0
--Content-Type: text/plain; charset=UTF-8
--Content-Transfer-Encoding: 8bit
--
--We shouldn't use drv->ctx as it always points to the first BSS. When
--using FullMAC driver with multi-BSS support it resulted in incorrect
--treating nl80211 events. I noticed with with brcmfmac and BCM43602.
--
--Before my change I was getting "disassociated" on a wrong interface:
--wlan0-1: STA 78:d6:f0:00:11:22 IEEE 802.11: associated
--wlan0-1: STA 78:d6:f0:00:11:22 WPA: pairwise key handshake completed (RSN)
--wlan0: STA 78:d6:f0:00:11:22 IEEE 802.11: disassociated
--
--With this patch it works as expected:
--wlan0-1: STA 78:d6:f0:00:11:22 IEEE 802.11: associated
--wlan0-1: STA 78:d6:f0:00:11:22 WPA: pairwise key handshake completed (RSN)
--wlan0-1: STA 78:d6:f0:00:11:22 IEEE 802.11: disassociated
--
--This doesn't apply to hostapd dealing with SoftMAC drivers when handling
--AP SME & MLME is done it hostapd not the firmware.
--
--Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
-----
-- src/drivers/driver_nl80211_event.c | 7 ++++---
-- 1 file changed, 4 insertions(+), 3 deletions(-)
--
----- a/src/drivers/driver_nl80211_event.c
--+++ b/src/drivers/driver_nl80211_event.c
--@@ -1154,6 +1154,7 @@ static void nl80211_new_station_event(st
--
--
-- static void nl80211_del_station_event(struct wpa_driver_nl80211_data *drv,
--+ struct i802_bss *bss,
-- struct nlattr **tb)
-- {
-- u8 *addr;
--@@ -1166,7 +1167,7 @@ static void nl80211_del_station_event(st
-- MAC2STR(addr));
--
-- if (is_ap_interface(drv->nlmode) && drv->device_ap_sme) {
--- drv_event_disassoc(drv->ctx, addr);
--+ drv_event_disassoc(bss->ctx, addr);
-- return;
-- }
--
--@@ -1175,7 +1176,7 @@ static void nl80211_del_station_event(st
--
-- os_memset(&data, 0, sizeof(data));
-- os_memcpy(data.ibss_peer_lost.peer, addr, ETH_ALEN);
--- wpa_supplicant_event(drv->ctx, EVENT_IBSS_PEER_LOST, &data);
--+ wpa_supplicant_event(bss->ctx, EVENT_IBSS_PEER_LOST, &data);
-- }
--
--
--@@ -1939,7 +1940,7 @@ static void do_process_drv_event(struct
-- nl80211_new_station_event(drv, bss, tb);
-- break;
-- case NL80211_CMD_DEL_STATION:
--- nl80211_del_station_event(drv, tb);
--+ nl80211_del_station_event(drv, bss, tb);
-- break;
-- case NL80211_CMD_SET_REKEY_OFFLOAD:
-- nl80211_rekey_offload_event(drv, tb);
-diff --git a/package/network/services/hostapd/patches/200-multicall.patch b/package/network/services/hostapd/patches/200-multicall.patch
-index de4a3a8e7f1ac310bdbf49b84a212b2c2d024c70..40bd7336ec225df892858b2d4a45cd6a3f0debb1 100644
---- a/package/network/services/hostapd/patches/200-multicall.patch
-+++ b/package/network/services/hostapd/patches/200-multicall.patch
-@@ -1,15 +1,25 @@
- --- a/hostapd/Makefile
- +++ b/hostapd/Makefile
--@@ -17,6 +17,7 @@ export BINDIR ?= /usr/local/bin/
-- # CFLAGS += -DUSE_KERNEL_HEADERS -I/usr/src/linux/include
-+@@ -28,6 +28,7 @@ CFLAGS += -I$(abspath ../src/utils)
-+ export BINDIR ?= /usr/local/bin/
-
- -include .config
- +-include $(if $(MULTICALL), ../wpa_supplicant/.config)
-
-- ifdef CONFIG_TESTING_OPTIONS
-- CFLAGS += -DCONFIG_TESTING_OPTIONS
--@@ -242,10 +243,14 @@ ifdef CONFIG_IEEE80211AC
-- CFLAGS += -DCONFIG_IEEE80211AC
-+ ifndef CONFIG_NO_GITVER
-+ # Add VERSION_STR postfix for builds from a git repository
-+@@ -190,7 +191,8 @@ endif
-+
-+ ifdef CONFIG_NO_VLAN
-+ CFLAGS += -DCONFIG_NO_VLAN
-+-else
-++endif
-++ifneq ($(findstring CONFIG_NO_VLAN,$(CFLAGS)), CONFIG_NO_VLAN)
-+ OBJS += ../src/ap/vlan_init.o
-+ OBJS += ../src/ap/vlan_ifconfig.o
-+ OBJS += ../src/ap/vlan.o
-+@@ -315,10 +317,14 @@ CFLAGS += -DCONFIG_MBO
-+ OBJS += ../src/ap/mbo_ap.o
- endif
-
- +ifndef MULTICALL
-@@ -26,7 +36,7 @@
- LIBS += $(DRV_AP_LIBS)
-
- ifdef CONFIG_L2_PACKET
--@@ -941,6 +946,12 @@ install: $(addprefix $(DESTDIR)$(BINDIR)
-+@@ -1051,6 +1057,12 @@ install: $(addprefix $(DESTDIR)$(BINDIR)
-
- BCHECK=../src/drivers/build.hostapd
-
-@@ -39,30 +49,40 @@
- hostapd: $(BCHECK) $(OBJS)
- $(Q)$(CC) $(LDFLAGS) -o hostapd $(OBJS) $(LIBS)
- @$(E) " LD " $@
--@@ -980,6 +991,12 @@ HOBJS += ../src/crypto/aes-internal.o
-+@@ -1092,6 +1104,12 @@ HOBJS += ../src/crypto/aes-internal.o
- HOBJS += ../src/crypto/aes-internal-enc.o
- endif
-
- +dump_cflags:
--+ @echo -n $(CFLAGS) " "
-++ @printf "%s " "$(CFLAGS)"
- +
- +dump_ldflags:
--+ @echo -n $(LDFLAGS) $(LIBS) $(EXTRALIBS) " "
-++ @printf "%s " "$(LDFLAGS) $(LIBS) $(EXTRALIBS)"
- +
- nt_password_hash: $(NOBJS)
- $(Q)$(CC) $(LDFLAGS) -o nt_password_hash $(NOBJS) $(LIBS_n)
- @$(E) " LD " $@
- --- a/wpa_supplicant/Makefile
- +++ b/wpa_supplicant/Makefile
--@@ -15,6 +15,7 @@ CFLAGS += -I$(abspath ../src)
-+@@ -27,6 +27,7 @@ CFLAGS += -I$(abspath ../src)
- CFLAGS += -I$(abspath ../src/utils)
-
- -include .config
- +-include $(if $(MULTICALL),../hostapd/.config)
-
-- ifdef CONFIG_TESTING_OPTIONS
-- CFLAGS += -DCONFIG_TESTING_OPTIONS
--@@ -773,6 +774,10 @@ ifdef CONFIG_DYNAMIC_EAP_METHODS
-+ ifndef CONFIG_NO_GITVER
-+ # Add VERSION_STR postfix for builds from a git repository
-+@@ -312,7 +313,9 @@ endif
-+ ifdef CONFIG_IBSS_RSN
-+ NEED_RSN_AUTHENTICATOR=y
-+ CFLAGS += -DCONFIG_IBSS_RSN
-++ifndef MULTICALL
-+ CFLAGS += -DCONFIG_NO_VLAN
-++endif
-+ OBJS += ibss_rsn.o
-+ endif
-+
-+@@ -803,6 +806,10 @@ ifdef CONFIG_DYNAMIC_EAP_METHODS
- CFLAGS += -DCONFIG_DYNAMIC_EAP_METHODS
- LIBS += -ldl -rdynamic
- endif
-@@ -73,7 +93,7 @@
- endif
-
- ifdef CONFIG_MACSEC
--@@ -793,9 +798,11 @@ NEED_EAP_COMMON=y
-+@@ -823,9 +830,11 @@ NEED_EAP_COMMON=y
- NEED_RSN_AUTHENTICATOR=y
- CFLAGS += -DCONFIG_AP
- OBJS += ap.o
-@@ -85,7 +105,7 @@
- OBJS += ../src/ap/hostapd.o
- OBJS += ../src/ap/wpa_auth_glue.o
- OBJS += ../src/ap/utils.o
--@@ -858,10 +865,18 @@ endif
-+@@ -898,10 +907,18 @@ endif
- ifdef CONFIG_HS20
- OBJS += ../src/ap/hs20.o
- endif
-@@ -104,7 +124,7 @@
- NEED_AES_WRAP=y
- OBJS += ../src/ap/wpa_auth.o
- OBJS += ../src/ap/wpa_auth_ie.o
--@@ -1603,6 +1618,12 @@ wpa_priv: $(BCHECK) $(OBJS_priv)
-+@@ -1680,6 +1697,12 @@ wpa_priv: $(BCHECK) $(OBJS_priv)
-
- $(OBJS_c) $(OBJS_t) $(OBJS_t2) $(OBJS) $(BCHECK) $(EXTRA_progs): .config
-
-@@ -117,22 +137,22 @@
- wpa_supplicant: $(BCHECK) $(OBJS) $(EXTRA_progs)
- $(Q)$(LDO) $(LDFLAGS) -o wpa_supplicant $(OBJS) $(LIBS) $(EXTRALIBS)
- @$(E) " LD " $@
--@@ -1694,6 +1715,12 @@ endif
-- $(Q)sed -e 's|\@BINDIR\@|$(BINDIR)|g' $< >$@
-+@@ -1782,6 +1805,12 @@ endif
-+ -e 's|\@DBUS_INTERFACE\@|$(DBUS_INTERFACE)|g' $< >$@
- @$(E) " sed" $<
-
- +dump_cflags:
--+ @echo -n $(CFLAGS) " "
-++ @printf "%s " "$(CFLAGS)"
- +
- +dump_ldflags:
--+ @echo -n $(LDFLAGS) $(LIBS) $(EXTRALIBS) " "
-++ @printf "%s " "$(LDFLAGS) $(LIBS) $(EXTRALIBS)"
- +
- wpa_supplicant.exe: wpa_supplicant
- mv -f $< $@
- wpa_cli.exe: wpa_cli
- --- a/src/drivers/driver.h
- +++ b/src/drivers/driver.h
--@@ -4581,8 +4581,8 @@ union wpa_event_data {
-+@@ -4794,8 +4794,8 @@ union wpa_event_data {
- * Driver wrapper code should call this function whenever an event is received
- * from the driver.
- */
-@@ -141,11 +161,20 @@
- +extern void (*wpa_supplicant_event)(void *ctx, enum wpa_event_type event,
- + union wpa_event_data *data);
-
-+ /**
-+ * wpa_supplicant_event_global - Report a driver event for wpa_supplicant
-+@@ -4807,7 +4807,7 @@ void wpa_supplicant_event(void *ctx, enu
-+ * Same as wpa_supplicant_event(), but we search for the interface in
-+ * wpa_global.
-+ */
-+-void wpa_supplicant_event_global(void *ctx, enum wpa_event_type event,
-++extern void (*wpa_supplicant_event_global)(void *ctx, enum wpa_event_type event,
-+ union wpa_event_data *data);
-
- /*
- --- a/src/ap/drv_callbacks.c
- +++ b/src/ap/drv_callbacks.c
--@@ -1075,8 +1075,8 @@ static void hostapd_event_dfs_cac_starte
-+@@ -1157,8 +1157,8 @@ static void hostapd_event_dfs_cac_starte
- #endif /* NEED_AP_MLME */
-
-
-@@ -156,9 +185,18 @@
- {
- struct hostapd_data *hapd = ctx;
- #ifndef CONFIG_NO_STDOUT_DEBUG
-+@@ -1367,7 +1367,7 @@ void wpa_supplicant_event(void *ctx, enu
-+ }
-+
-+
-+-void wpa_supplicant_event_global(void *ctx, enum wpa_event_type event,
-++void hostapd_wpa_event_global(void *ctx, enum wpa_event_type event,
-+ union wpa_event_data *data)
-+ {
-+ struct hapd_interfaces *interfaces = ctx;
- --- a/wpa_supplicant/wpa_priv.c
- +++ b/wpa_supplicant/wpa_priv.c
--@@ -819,8 +819,8 @@ static void wpa_priv_send_ft_response(st
-+@@ -940,8 +940,8 @@ static void wpa_priv_send_ft_response(st
- }
-
-
-@@ -169,17 +207,27 @@
- {
- struct wpa_priv_interface *iface = ctx;
-
--@@ -961,6 +961,7 @@ int main(int argc, char *argv[])
-+@@ -1010,7 +1010,7 @@ void wpa_supplicant_event(void *ctx, enu
-+ }
-+
-+
-+-void wpa_supplicant_event_global(void *ctx, enum wpa_event_type event,
-++void supplicant_event_global(void *ctx, enum wpa_event_type event,
-+ union wpa_event_data *data)
-+ {
-+ struct wpa_priv_global *global = ctx;
-+@@ -1122,6 +1122,8 @@ int main(int argc, char *argv[])
- if (os_program_init())
- return -1;
-
- + wpa_supplicant_event = supplicant_event;
-++ wpa_supplicant_event_global = supplicant_event_global;
- wpa_priv_fd_workaround();
-
-- for (;;) {
-+ os_memset(&global, 0, sizeof(global));
- --- a/wpa_supplicant/events.c
- +++ b/wpa_supplicant/events.c
--@@ -3138,8 +3138,8 @@ static void wpa_supplicant_event_assoc_a
-+@@ -3384,8 +3384,8 @@ static void wpa_supplicant_event_assoc_a
- }
-
-
-@@ -189,88 +237,125 @@
- + union wpa_event_data *data)
- {
- struct wpa_supplicant *wpa_s = ctx;
-+ int resched;
-+@@ -4051,7 +4051,7 @@ void wpa_supplicant_event(void *ctx, enu
-+ #endif /* CONFIG_AP */
-+ break;
-+ case EVENT_ACS_CHANNEL_SELECTED:
-+-#ifdef CONFIG_ACS
-++#if defined(CONFIG_ACS) && defined(CONFIG_AP)
-+ if (!wpa_s->ap_iface)
-+ break;
-+ hostapd_acs_channel_selected(wpa_s->ap_iface->bss[0],
-+@@ -4065,7 +4065,7 @@ void wpa_supplicant_event(void *ctx, enu
-+ }
-+
-
-+-void wpa_supplicant_event_global(void *ctx, enum wpa_event_type event,
-++void supplicant_event_global(void *ctx, enum wpa_event_type event,
-+ union wpa_event_data *data)
-+ {
-+ struct wpa_supplicant *wpa_s;
- --- a/wpa_supplicant/wpa_supplicant.c
- +++ b/wpa_supplicant/wpa_supplicant.c
--@@ -4300,6 +4300,9 @@ static void wpa_supplicant_deinit_iface(
-- os_free(wpa_s);
-+@@ -4990,7 +4990,6 @@ struct wpa_interface * wpa_supplicant_ma
-+ return NULL;
- }
-
-+-
-+ /**
-+ * wpa_supplicant_match_existing - Match existing interfaces
-+ * @global: Pointer to global data from wpa_supplicant_init()
-+@@ -5027,6 +5026,11 @@ static int wpa_supplicant_match_existing
-+
-+ #endif /* CONFIG_MATCH_IFACE */
-+
- +extern void supplicant_event(void *ctx, enum wpa_event_type event,
- + union wpa_event_data *data);
- +
-++extern void supplicant_event_global(void *ctx, enum wpa_event_type event,
-++ union wpa_event_data *data);
-
- /**
- * wpa_supplicant_add_iface - Add a new network interface
--@@ -4526,6 +4529,7 @@ struct wpa_global * wpa_supplicant_init(
-+@@ -5282,6 +5286,8 @@ struct wpa_global * wpa_supplicant_init(
- #ifndef CONFIG_NO_WPA_MSG
- wpa_msg_register_ifname_cb(wpa_supplicant_msg_ifname_cb);
- #endif /* CONFIG_NO_WPA_MSG */
- + wpa_supplicant_event = supplicant_event;
-++ wpa_supplicant_event_global = supplicant_event_global;
-
- if (params->wpa_debug_file_path)
- wpa_debug_open_file(params->wpa_debug_file_path);
- --- a/hostapd/main.c
- +++ b/hostapd/main.c
--@@ -511,6 +511,9 @@ static int hostapd_get_ctrl_iface_group(
-- return 0;
-+@@ -583,6 +583,11 @@ fail:
-+ return -1;
- }
-
- +void hostapd_wpa_event(void *ctx, enum wpa_event_type event,
- + union wpa_event_data *data);
- +
-++void hostapd_wpa_event_global(void *ctx, enum wpa_event_type event,
-++ union wpa_event_data *data);
-
- #ifdef CONFIG_WPS
- static int gen_uuid(const char *txt_addr)
--@@ -562,6 +565,7 @@ int main(int argc, char *argv[])
-- interfaces.global_iface_name = NULL;
-+@@ -660,6 +665,8 @@ int main(int argc, char *argv[])
- interfaces.global_ctrl_sock = -1;
-+ dl_list_init(&interfaces.global_ctrl_dst);
-
- + wpa_supplicant_event = hostapd_wpa_event;
-++ wpa_supplicant_event_global = hostapd_wpa_event_global;
- for (;;) {
-- c = getopt(argc, argv, "b:Bde:f:hKP:Ttu:vg:G:");
-+ c = getopt(argc, argv, "b:Bde:f:hi:KP:STtu:vg:G:");
- if (c < 0)
- --- a/src/drivers/drivers.c
- +++ b/src/drivers/drivers.c
--@@ -10,6 +10,9 @@
-+@@ -10,6 +10,11 @@
- #include "utils/common.h"
- #include "driver.h"
-
- +void (*wpa_supplicant_event)(void *ctx, enum wpa_event_type event,
- + union wpa_event_data *data);
-++void (*wpa_supplicant_event_global)(void *ctx, enum wpa_event_type event,
-++ union wpa_event_data *data);
- +
- #ifdef CONFIG_DRIVER_WEXT
- extern struct wpa_driver_ops wpa_driver_wext_ops; /* driver_wext.c */
- #endif /* CONFIG_DRIVER_WEXT */
- --- a/wpa_supplicant/eapol_test.c
- +++ b/wpa_supplicant/eapol_test.c
--@@ -28,8 +28,12 @@
-+@@ -29,7 +29,12 @@
- #include "ctrl_iface.h"
- #include "pcsc_funcs.h"
- #include "wpas_glue.h"
- +#include "drivers/driver.h"
-
--
- +void (*wpa_supplicant_event)(void *ctx, enum wpa_event_type event,
- + union wpa_event_data *data);
--+
-- struct wpa_driver_ops *wpa_drivers[] = { NULL };
-++void (*wpa_supplicant_event_global)(void *ctx, enum wpa_event_type event,
-++ union wpa_event_data *data);
-
-+ const struct wpa_driver_ops *const wpa_drivers[] = { NULL };
-
--@@ -1203,6 +1207,8 @@ static void usage(void)
-+@@ -1295,6 +1300,10 @@ static void usage(void)
- "option several times.\n");
- }
-
- +extern void supplicant_event(void *ctx, enum wpa_event_type event,
- + union wpa_event_data *data);
-++extern void supplicant_event_global(void *ctx, enum wpa_event_type event,
-++ union wpa_event_data *data);
-
- int main(int argc, char *argv[])
- {
--@@ -1221,6 +1227,7 @@ int main(int argc, char *argv[])
-+@@ -1315,6 +1324,8 @@ int main(int argc, char *argv[])
- if (os_program_init())
- return -1;
-
- + wpa_supplicant_event = supplicant_event;
-++ wpa_supplicant_event_global = supplicant_event_global;
- hostapd_logger_register_cb(hostapd_logger_cb);
-
- os_memset(&eapol_test, 0, sizeof(eapol_test));
-diff --git a/package/network/services/hostapd/patches/300-noscan.patch b/package/network/services/hostapd/patches/300-noscan.patch
-index 57d8fe27bf681638237e0e8452ec7fbdebe6d036..21d631603b1f4e0af8dc11c3a249fc7d247021f3 100644
---- a/package/network/services/hostapd/patches/300-noscan.patch
-+++ b/package/network/services/hostapd/patches/300-noscan.patch
-@@ -1,6 +1,6 @@
- --- a/hostapd/config_file.c
- +++ b/hostapd/config_file.c
--@@ -2771,6 +2771,10 @@ static int hostapd_config_fill(struct ho
-+@@ -2862,6 +2862,10 @@ static int hostapd_config_fill(struct ho
- }
- #endif /* CONFIG_IEEE80211W */
- #ifdef CONFIG_IEEE80211N
-@@ -13,7 +13,7 @@
- } else if (os_strcmp(buf, "ht_capab") == 0) {
- --- a/src/ap/ap_config.h
- +++ b/src/ap/ap_config.h
--@@ -619,6 +619,8 @@ struct hostapd_config {
-+@@ -655,6 +655,8 @@ struct hostapd_config {
-
- int ht_op_mode_fixed;
- u16 ht_capab;
-@@ -21,21 +21,22 @@
- + int no_ht_coex;
- int ieee80211n;
- int secondary_channel;
-- int require_ht;
-+ int no_pri_sec_switch;
- --- a/src/ap/hw_features.c
- +++ b/src/ap/hw_features.c
--@@ -461,7 +461,7 @@ static int ieee80211n_check_40mhz(struct
-- struct wpa_driver_scan_params params;
-+@@ -474,7 +474,8 @@ static int ieee80211n_check_40mhz(struct
- int ret;
-
--- if (!iface->conf->secondary_channel)
--+ if (!iface->conf->secondary_channel || iface->conf->noscan)
-- return 0; /* HT40 not used */
-+ /* Check that HT40 is used and PRI / SEC switch is allowed */
-+- if (!iface->conf->secondary_channel || iface->conf->no_pri_sec_switch)
-++ if (!iface->conf->secondary_channel || iface->conf->no_pri_sec_switch ||
-++ iface->conf->noscan)
-+ return 0;
-
- hostapd_set_state(iface, HAPD_IFACE_HT_SCAN);
- --- a/src/ap/ieee802_11_ht.c
- +++ b/src/ap/ieee802_11_ht.c
--@@ -221,6 +221,9 @@ void hostapd_2040_coex_action(struct hos
-+@@ -244,6 +244,9 @@ void hostapd_2040_coex_action(struct hos
- if (!(iface->conf->ht_capab & HT_CAP_INFO_SUPP_CHANNEL_WIDTH_SET))
- return;
-
-@@ -45,7 +46,7 @@
- if (len < IEEE80211_HDRLEN + 2 + sizeof(*bc_ie))
- return;
-
--@@ -346,6 +349,9 @@ void ht40_intolerant_add(struct hostapd_
-+@@ -368,6 +371,9 @@ void ht40_intolerant_add(struct hostapd_
- if (iface->current_mode->mode != HOSTAPD_MODE_IEEE80211G)
- return;
-
-diff --git a/package/network/services/hostapd/patches/310-rescan_immediately.patch b/package/network/services/hostapd/patches/310-rescan_immediately.patch
-index 7be8c32e3b17a183238177a5cb9601449382d224..3f46cc4ac1d2ea3a3450b1c70375bc7c37a1ec41 100644
---- a/package/network/services/hostapd/patches/310-rescan_immediately.patch
-+++ b/package/network/services/hostapd/patches/310-rescan_immediately.patch
-@@ -1,6 +1,6 @@
- --- a/wpa_supplicant/wpa_supplicant.c
- +++ b/wpa_supplicant/wpa_supplicant.c
--@@ -3249,7 +3249,7 @@ wpa_supplicant_alloc(struct wpa_supplica
-+@@ -3556,7 +3556,7 @@ wpa_supplicant_alloc(struct wpa_supplica
- if (wpa_s == NULL)
- return NULL;
- wpa_s->scan_req = INITIAL_SCAN_REQ;
-@@ -8,4 +8,4 @@
- + wpa_s->scan_interval = 1;
- wpa_s->new_connection = 1;
- wpa_s->parent = parent ? parent : wpa_s;
-- wpa_s->sched_scanning = 0;
-+ wpa_s->p2pdev = wpa_s->parent;
-diff --git a/package/network/services/hostapd/patches/320-optional_rfkill.patch b/package/network/services/hostapd/patches/320-optional_rfkill.patch
-index 75b4b07f82115e226fd2f29f2ed19682ed1346f3..cf2a2c108b0c58597c4a10ccd9c7be242a6ae649 100644
---- a/package/network/services/hostapd/patches/320-optional_rfkill.patch
-+++ b/package/network/services/hostapd/patches/320-optional_rfkill.patch
-@@ -1,14 +1,14 @@
- --- a/src/drivers/drivers.mak
- +++ b/src/drivers/drivers.mak
--@@ -34,7 +34,6 @@ NEED_SME=y
-+@@ -36,7 +36,6 @@ NEED_SME=y
- NEED_AP_MLME=y
- NEED_NETLINK=y
- NEED_LINUX_IOCTL=y
- -NEED_RFKILL=y
-+ NEED_RADIOTAP=y
-
- ifdef CONFIG_LIBNL32
-- DRV_LIBS += -lnl-3
--@@ -116,7 +115,6 @@ DRV_WPA_CFLAGS += -DCONFIG_DRIVER_WEXT
-+@@ -123,7 +122,6 @@ DRV_WPA_CFLAGS += -DCONFIG_DRIVER_WEXT
- CONFIG_WIRELESS_EXTENSION=y
- NEED_NETLINK=y
- NEED_LINUX_IOCTL=y
-@@ -16,7 +16,7 @@
- endif
-
- ifdef CONFIG_DRIVER_NDIS
--@@ -142,7 +140,6 @@ endif
-+@@ -149,7 +147,6 @@ endif
- ifdef CONFIG_WIRELESS_EXTENSION
- DRV_WPA_CFLAGS += -DCONFIG_WIRELESS_EXTENSION
- DRV_WPA_OBJS += ../src/drivers/driver_wext.o
-@@ -24,14 +24,14 @@
- endif
-
- ifdef NEED_NETLINK
--@@ -155,6 +152,7 @@ endif
-+@@ -162,6 +159,7 @@ endif
-
- ifdef NEED_RFKILL
- DRV_OBJS += ../src/drivers/rfkill.o
- +DRV_WPA_CFLAGS += -DCONFIG_RFKILL
- endif
-
-- ifdef CONFIG_VLAN_NETLINK
-+ ifdef NEED_RADIOTAP
- --- a/src/drivers/rfkill.h
- +++ b/src/drivers/rfkill.h
- @@ -18,8 +18,24 @@ struct rfkill_config {
-diff --git a/package/network/services/hostapd/patches/330-nl80211_fix_set_freq.patch b/package/network/services/hostapd/patches/330-nl80211_fix_set_freq.patch
-index dd90877e90a2af68aa811e137fc7ccc89b01eff4..ca4601247b9c093a986e543d188726380301263e 100644
---- a/package/network/services/hostapd/patches/330-nl80211_fix_set_freq.patch
-+++ b/package/network/services/hostapd/patches/330-nl80211_fix_set_freq.patch
-@@ -1,6 +1,6 @@
- --- a/src/drivers/driver_nl80211.c
- +++ b/src/drivers/driver_nl80211.c
--@@ -3616,7 +3616,7 @@ static int nl80211_set_channel(struct i8
-+@@ -3795,7 +3795,7 @@ static int nl80211_set_channel(struct i8
- freq->freq, freq->ht_enabled, freq->vht_enabled,
- freq->bandwidth, freq->center_freq1, freq->center_freq2);
-
-diff --git a/package/network/services/hostapd/patches/340-reload_freq_change.patch b/package/network/services/hostapd/patches/340-reload_freq_change.patch
-index 91b61964ddf618b245da12dfa11ade4747d66e56..086ade9cedec664ee566764f8f09bd2fd730ba53 100644
---- a/package/network/services/hostapd/patches/340-reload_freq_change.patch
-+++ b/package/network/services/hostapd/patches/340-reload_freq_change.patch
-@@ -1,6 +1,6 @@
- --- a/src/ap/hostapd.c
- +++ b/src/ap/hostapd.c
--@@ -76,6 +76,16 @@ static void hostapd_reload_bss(struct ho
-+@@ -80,6 +80,16 @@ static void hostapd_reload_bss(struct ho
- #endif /* CONFIG_NO_RADIUS */
-
- ssid = &hapd->conf->ssid;
-@@ -17,7 +17,7 @@
- if (!ssid->wpa_psk_set && ssid->wpa_psk && !ssid->wpa_psk->next &&
- ssid->wpa_passphrase_set && ssid->wpa_passphrase) {
- /*
--@@ -175,21 +185,12 @@ int hostapd_reload_config(struct hostapd
-+@@ -179,21 +189,12 @@ int hostapd_reload_config(struct hostapd
- oldconf = hapd->iconf;
- iface->conf = newconf;
-
-diff --git a/package/network/services/hostapd/patches/350-nl80211_del_beacon_bss.patch b/package/network/services/hostapd/patches/350-nl80211_del_beacon_bss.patch
-index a14fa03527525c03c07875db44fffdba557b0593..247f154e3059aaf25df321b496ff255b50b8ddf4 100644
---- a/package/network/services/hostapd/patches/350-nl80211_del_beacon_bss.patch
-+++ b/package/network/services/hostapd/patches/350-nl80211_del_beacon_bss.patch
-@@ -1,6 +1,6 @@
- --- a/src/drivers/driver_nl80211.c
- +++ b/src/drivers/driver_nl80211.c
--@@ -2254,13 +2254,18 @@ wpa_driver_nl80211_finish_drv_init(struc
-+@@ -2394,13 +2394,18 @@ wpa_driver_nl80211_finish_drv_init(struc
- }
-
-
-@@ -22,7 +22,7 @@
- return send_and_recv_msgs(drv, msg, NULL, NULL);
- }
-
--@@ -2311,7 +2316,7 @@ static void wpa_driver_nl80211_deinit(st
-+@@ -2452,7 +2457,7 @@ static void wpa_driver_nl80211_deinit(st
- nl80211_remove_monitor_interface(drv);
-
- if (is_ap_interface(drv->nlmode))
-@@ -31,7 +31,7 @@
-
- if (drv->eapol_sock >= 0) {
- eloop_unregister_read_sock(drv->eapol_sock);
--@@ -4140,8 +4145,7 @@ static void nl80211_teardown_ap(struct i
-+@@ -4385,8 +4390,7 @@ static void nl80211_teardown_ap(struct i
- nl80211_remove_monitor_interface(drv);
- else
- nl80211_mgmt_unsubscribe(bss, "AP teardown");
-@@ -41,7 +41,7 @@
- }
-
-
--@@ -6066,8 +6070,6 @@ static int wpa_driver_nl80211_if_remove(
-+@@ -6387,8 +6391,6 @@ static int wpa_driver_nl80211_if_remove(
- } else {
- wpa_printf(MSG_DEBUG, "nl80211: First BSS - reassign context");
- nl80211_teardown_ap(bss);
-@@ -50,7 +50,7 @@
- nl80211_destroy_bss(bss);
- if (!bss->added_if)
- i802_set_iface_flags(bss, 0);
--@@ -6389,8 +6391,7 @@ static int wpa_driver_nl80211_deinit_ap(
-+@@ -6750,8 +6752,7 @@ static int wpa_driver_nl80211_deinit_ap(
- struct wpa_driver_nl80211_data *drv = bss->drv;
- if (!is_ap_interface(drv->nlmode))
- return -1;
-@@ -60,7 +60,7 @@
-
- /*
- * If the P2P GO interface was dynamically added, then it is
--@@ -6409,8 +6410,7 @@ static int wpa_driver_nl80211_stop_ap(vo
-+@@ -6770,8 +6771,7 @@ static int wpa_driver_nl80211_stop_ap(vo
- struct wpa_driver_nl80211_data *drv = bss->drv;
- if (!is_ap_interface(drv->nlmode))
- return -1;
-diff --git a/package/network/services/hostapd/patches/360-ctrl_iface_reload.patch b/package/network/services/hostapd/patches/360-ctrl_iface_reload.patch
-index 06b005ea3ac8e3a43d610c2719b4d53a6ceacd73..1e405cbf0edcda8604080f9c00f0eeb35c106218 100644
---- a/package/network/services/hostapd/patches/360-ctrl_iface_reload.patch
-+++ b/package/network/services/hostapd/patches/360-ctrl_iface_reload.patch
-@@ -1,22 +1,22 @@
- --- a/hostapd/ctrl_iface.c
- +++ b/hostapd/ctrl_iface.c
--@@ -45,6 +45,7 @@
-- #include "wps/wps.h"
-+@@ -54,6 +54,7 @@
-+ #include "fst/fst_ctrl_iface.h"
- #include "config_file.h"
- #include "ctrl_iface.h"
- +#include "config_file.h"
-
-
-- struct wpa_ctrl_dst {
--@@ -55,6 +56,7 @@ struct wpa_ctrl_dst {
-- int errors;
-- };
-+ #define HOSTAPD_CLI_DUP_VALUE_MAX_LEN 256
-+@@ -72,6 +73,7 @@ static void hostapd_ctrl_iface_send(stru
-+ enum wpa_msg_type type,
-+ const char *buf, size_t len);
-
- +static char *reload_opts = NULL;
-
-- static void hostapd_ctrl_iface_send(struct hostapd_data *hapd, int level,
-- const char *buf, size_t len);
--@@ -164,6 +166,61 @@ static int hostapd_ctrl_iface_new_sta(st
-+ static int hostapd_ctrl_iface_attach(struct hostapd_data *hapd,
-+ struct sockaddr_storage *from,
-+@@ -123,6 +125,61 @@ static int hostapd_ctrl_iface_new_sta(st
- return 0;
- }
-
-@@ -78,7 +78,7 @@
-
- #ifdef CONFIG_IEEE80211W
- #ifdef NEED_AP_MLME
--@@ -2086,6 +2143,8 @@ static void hostapd_ctrl_iface_receive(i
-+@@ -2483,6 +2540,8 @@ static int hostapd_ctrl_iface_receive_pr
- } else if (os_strncmp(buf, "VENDOR ", 7) == 0) {
- reply_len = hostapd_ctrl_iface_vendor(hapd, buf + 7, reply,
- reply_size);
-@@ -89,7 +89,7 @@
- #ifdef RADIUS_SERVER
- --- a/src/ap/ctrl_iface_ap.c
- +++ b/src/ap/ctrl_iface_ap.c
--@@ -541,5 +541,11 @@ int hostapd_parse_csa_settings(const cha
-+@@ -593,7 +593,13 @@ int hostapd_parse_csa_settings(const cha
-
- int hostapd_ctrl_iface_stop_ap(struct hostapd_data *hapd)
- {
-@@ -102,3 +102,5 @@
- +
- + return 0;
- }
-+
-+
-diff --git a/package/network/services/hostapd/patches/370-ap_sta_support.patch b/package/network/services/hostapd/patches/370-ap_sta_support.patch
-index ea235e67780366b28dd8e811367d7cb45f2397de..a77d4c92e6d7fa7711338c82aba27b7e44248afe 100644
---- a/package/network/services/hostapd/patches/370-ap_sta_support.patch
-+++ b/package/network/services/hostapd/patches/370-ap_sta_support.patch
-@@ -1,6 +1,6 @@
- --- a/wpa_supplicant/wpa_supplicant_i.h
- +++ b/wpa_supplicant/wpa_supplicant_i.h
--@@ -110,6 +110,11 @@ struct wpa_interface {
-+@@ -100,6 +100,11 @@ struct wpa_interface {
- const char *ifname;
-
- /**
-@@ -12,8 +12,8 @@
- * bridge_ifname - Optional bridge interface name
- *
- * If the driver interface (ifname) is included in a Linux bridge
--@@ -442,6 +447,8 @@ struct wpa_supplicant {
-- #endif /* CONFIG_CTRL_IFACE_DBUS_NEW */
-+@@ -484,6 +489,8 @@ struct wpa_supplicant {
-+ #endif /* CONFIG_CTRL_IFACE_BINDER */
- char bridge_ifname[16];
-
- + struct wpa_ctrl *hostapd;
-@@ -23,7 +23,7 @@
-
- --- a/wpa_supplicant/Makefile
- +++ b/wpa_supplicant/Makefile
--@@ -14,6 +14,10 @@ CFLAGS += $(EXTRA_CFLAGS)
-+@@ -26,6 +26,10 @@ CFLAGS += $(EXTRA_CFLAGS)
- CFLAGS += -I$(abspath ../src)
- CFLAGS += -I$(abspath ../src/utils)
-
-@@ -34,7 +34,7 @@
- -include .config
- -include $(if $(MULTICALL),../hostapd/.config)
-
--@@ -84,6 +88,8 @@ OBJS_c += ../src/utils/wpa_debug.o
-+@@ -113,6 +117,8 @@ OBJS_c += ../src/utils/wpa_debug.o
- OBJS_c += ../src/utils/common.o
- OBJS += wmm_ac.o
-
-@@ -45,7 +45,7 @@
- CONFIG_OS=win32
- --- a/wpa_supplicant/wpa_supplicant.c
- +++ b/wpa_supplicant/wpa_supplicant.c
--@@ -107,6 +107,55 @@ const char *wpa_supplicant_full_license5
-+@@ -112,6 +112,55 @@ const char *const wpa_supplicant_full_li
- "\n";
- #endif /* CONFIG_NO_STDOUT_DEBUG */
-
-@@ -73,7 +73,7 @@
- + int ret;
- +
- + if (!bss)
--+ return;
-++ return -1;
- +
- + if (bss->ht_param & HT_INFO_HT_PARAM_STA_CHNL_WIDTH) {
- + int sec = bss->ht_param & HT_INFO_HT_PARAM_SECONDARY_CHNL_OFF_MASK;
-@@ -101,7 +101,7 @@
- /* Configure default/group WEP keys for static WEP */
- int wpa_set_wep_keys(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid)
- {
--@@ -743,8 +792,12 @@ void wpa_supplicant_set_state(struct wpa
-+@@ -812,8 +861,12 @@ void wpa_supplicant_set_state(struct wpa
- wpas_p2p_completed(wpa_s);
-
- sme_sched_obss_scan(wpa_s, 1);
-@@ -114,7 +114,7 @@
- wpa_s->new_connection = 1;
- wpa_drv_set_operstate(wpa_s, 0);
- #ifndef IEEE8021X_EAPOL
--@@ -4038,6 +4091,20 @@ static int wpa_supplicant_init_iface(str
-+@@ -4646,6 +4699,20 @@ static int wpa_supplicant_init_iface(str
- sizeof(wpa_s->bridge_ifname));
- }
-
-@@ -135,7 +135,7 @@
- /* RSNA Supplicant Key Management - INITIALIZE */
- eapol_sm_notify_portEnabled(wpa_s->eapol, FALSE);
- eapol_sm_notify_portValid(wpa_s->eapol, FALSE);
--@@ -4280,6 +4347,11 @@ static void wpa_supplicant_deinit_iface(
-+@@ -4937,6 +5004,11 @@ static void wpa_supplicant_deinit_iface(
- if (terminate)
- wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_TERMINATING);
-
-@@ -157,7 +157,7 @@
- #include "drivers/driver.h"
- #include "wpa_supplicant_i.h"
- #include "config.h"
--@@ -277,6 +278,10 @@ static void calculate_update_time(const
-+@@ -287,6 +288,10 @@ static void calculate_update_time(const
- static void wpa_bss_copy_res(struct wpa_bss *dst, struct wpa_scan_res *src,
- struct os_reltime *fetch_time)
- {
-@@ -168,7 +168,7 @@
- dst->flags = src->flags;
- os_memcpy(dst->bssid, src->bssid, ETH_ALEN);
- dst->freq = src->freq;
--@@ -289,6 +294,15 @@ static void wpa_bss_copy_res(struct wpa_
-+@@ -299,6 +304,15 @@ static void wpa_bss_copy_res(struct wpa_
- dst->est_throughput = src->est_throughput;
- dst->snr = src->snr;
-
-@@ -186,7 +186,7 @@
-
- --- a/wpa_supplicant/main.c
- +++ b/wpa_supplicant/main.c
--@@ -33,7 +33,7 @@ static void usage(void)
-+@@ -34,7 +34,7 @@ static void usage(void)
- "vW] [-P<pid file>] "
- "[-g<global ctrl>] \\\n"
- " [-G<group>] \\\n"
-@@ -195,24 +195,24 @@
- "[-p<driver_param>] \\\n"
- " [-b<br_ifname>] [-e<entropy file>]"
- #ifdef CONFIG_DEBUG_FILE
--@@ -84,6 +84,7 @@ static void usage(void)
-- #endif /* CONFIG_DEBUG_LINUX_TRACING */
-- printf(" -t = include timestamp in debug messages\n"
-+@@ -74,6 +74,7 @@ static void usage(void)
-+ " -g = global ctrl_interface\n"
-+ " -G = global ctrl_interface group\n"
- " -h = show this help text\n"
--+ " -H = connect to a hostapd instance to manage state changes\n"
-- " -L = show license (BSD)\n"
-- " -o = override driver parameter for new interfaces\n"
-- " -O = override ctrl_interface parameter for new interfaces\n"
--@@ -175,7 +176,7 @@ int main(int argc, char *argv[])
-++ " -H = connect to a hostapd instance to manage state changes\n"
-+ " -i = interface name\n"
-+ " -I = additional configuration file\n"
-+ " -K = include keys (passwords, etc.) in debug output\n"
-+@@ -201,7 +202,7 @@ int main(int argc, char *argv[])
-
- for (;;) {
- c = getopt(argc, argv,
--- "b:Bc:C:D:de:f:g:G:hi:I:KLm:No:O:p:P:qsTtuvW");
--+ "b:Bc:C:D:de:f:g:G:hH:i:I:KLm:No:O:p:P:qsTtuvW");
-+- "b:Bc:C:D:de:f:g:G:hi:I:KLMm:No:O:p:P:qsTtuvW");
-++ "b:Bc:C:D:de:f:g:G:hH:i:I:KLMm:No:O:p:P:qsTtuvW");
- if (c < 0)
- break;
- switch (c) {
--@@ -222,6 +223,9 @@ int main(int argc, char *argv[])
-+@@ -248,6 +249,9 @@ int main(int argc, char *argv[])
- usage();
- exitcode = 0;
- goto out;
-@@ -224,11 +224,11 @@
- break;
- --- a/wpa_supplicant/bss.h
- +++ b/wpa_supplicant/bss.h
--@@ -72,6 +72,10 @@ struct wpa_bss {
-- u8 ssid[32];
-+@@ -79,6 +79,10 @@ struct wpa_bss {
-+ u8 ssid[SSID_MAX_LEN];
- /** Length of SSID */
- size_t ssid_len;
--+ /** HT caapbilities */
-++ /** HT capabilities */
- + u16 ht_capab;
- + /* Five octets of HT Operation Information */
- + u8 ht_param;
-diff --git a/package/network/services/hostapd/patches/380-disable_ctrl_iface_mib.patch b/package/network/services/hostapd/patches/380-disable_ctrl_iface_mib.patch
-index 3a41b8219ea83136b76ad59b0bf79b566d1e7b35..9e815e96a13b2978f4a75e0131e420150dbc7d00 100644
---- a/package/network/services/hostapd/patches/380-disable_ctrl_iface_mib.patch
-+++ b/package/network/services/hostapd/patches/380-disable_ctrl_iface_mib.patch
-@@ -1,18 +1,18 @@
- --- a/hostapd/Makefile
- +++ b/hostapd/Makefile
--@@ -168,6 +168,9 @@ endif
-+@@ -212,6 +212,9 @@ endif
- ifdef CONFIG_NO_CTRL_IFACE
- CFLAGS += -DCONFIG_NO_CTRL_IFACE
- else
- +ifdef CONFIG_CTRL_IFACE_MIB
- +CFLAGS += -DCONFIG_CTRL_IFACE_MIB
- +endif
-- OBJS += ctrl_iface.o
-- OBJS += ../src/ap/ctrl_iface_ap.o
-- endif
-+ ifeq ($(CONFIG_CTRL_IFACE), udp)
-+ CFLAGS += -DCONFIG_CTRL_IFACE_UDP
-+ else
- --- a/hostapd/ctrl_iface.c
- +++ b/hostapd/ctrl_iface.c
--@@ -1953,6 +1953,7 @@ static void hostapd_ctrl_iface_receive(i
-+@@ -2342,6 +2342,7 @@ static int hostapd_ctrl_iface_receive_pr
- reply_size);
- } else if (os_strcmp(buf, "STATUS-DRIVER") == 0) {
- reply_len = hostapd_drv_status(hapd, reply, reply_size);
-@@ -20,18 +20,18 @@
- } else if (os_strcmp(buf, "MIB") == 0) {
- reply_len = ieee802_11_get_mib(hapd, reply, reply_size);
- if (reply_len >= 0) {
--@@ -1994,6 +1995,7 @@ static void hostapd_ctrl_iface_receive(i
-+@@ -2383,6 +2384,7 @@ static int hostapd_ctrl_iface_receive_pr
- } else if (os_strncmp(buf, "STA-NEXT ", 9) == 0) {
- reply_len = hostapd_ctrl_iface_sta_next(hapd, buf + 9, reply,
- reply_size);
- +#endif
- } else if (os_strcmp(buf, "ATTACH") == 0) {
-- if (hostapd_ctrl_iface_attach(hapd, &from, fromlen))
-+ if (hostapd_ctrl_iface_attach(hapd, from, fromlen))
- reply_len = -1;
- --- a/wpa_supplicant/Makefile
- +++ b/wpa_supplicant/Makefile
--@@ -837,6 +837,9 @@ ifdef CONFIG_WNM
-- OBJS += ../src/ap/wnm_ap.o
-+@@ -874,6 +874,9 @@ ifdef CONFIG_MBO
-+ OBJS += ../src/ap/mbo_ap.o
- endif
- ifdef CONFIG_CTRL_IFACE
- +ifdef CONFIG_CTRL_IFACE_MIB
-@@ -42,7 +42,7 @@
-
- --- a/wpa_supplicant/ctrl_iface.c
- +++ b/wpa_supplicant/ctrl_iface.c
--@@ -1795,7 +1795,7 @@ static int wpa_supplicant_ctrl_iface_sta
-+@@ -1895,7 +1895,7 @@ static int wpa_supplicant_ctrl_iface_sta
- pos += ret;
- }
-
-@@ -51,7 +51,7 @@
- if (wpa_s->ap_iface) {
- pos += ap_ctrl_iface_wpa_get_status(wpa_s, pos,
- end - pos,
--@@ -7896,6 +7896,7 @@ char * wpa_supplicant_ctrl_iface_process
-+@@ -8687,6 +8687,7 @@ char * wpa_supplicant_ctrl_iface_process
- reply_len = -1;
- } else if (os_strncmp(buf, "NOTE ", 5) == 0) {
- wpa_printf(MSG_INFO, "NOTE: %s", buf + 5);
-@@ -59,7 +59,7 @@
- } else if (os_strcmp(buf, "MIB") == 0) {
- reply_len = wpa_sm_get_mib(wpa_s->wpa, reply, reply_size);
- if (reply_len >= 0) {
--@@ -7903,6 +7904,7 @@ char * wpa_supplicant_ctrl_iface_process
-+@@ -8694,6 +8695,7 @@ char * wpa_supplicant_ctrl_iface_process
- reply + reply_len,
- reply_size - reply_len);
- }
-@@ -67,7 +67,7 @@
- } else if (os_strncmp(buf, "STATUS", 6) == 0) {
- reply_len = wpa_supplicant_ctrl_iface_status(
- wpa_s, buf + 6, reply, reply_size);
--@@ -8353,6 +8355,7 @@ char * wpa_supplicant_ctrl_iface_process
-+@@ -9164,6 +9166,7 @@ char * wpa_supplicant_ctrl_iface_process
- reply_len = wpa_supplicant_ctrl_iface_bss(
- wpa_s, buf + 4, reply, reply_size);
- #ifdef CONFIG_AP
-@@ -75,7 +75,7 @@
- } else if (os_strcmp(buf, "STA-FIRST") == 0) {
- reply_len = ap_ctrl_iface_sta_first(wpa_s, reply, reply_size);
- } else if (os_strncmp(buf, "STA ", 4) == 0) {
--@@ -8361,12 +8364,15 @@ char * wpa_supplicant_ctrl_iface_process
-+@@ -9172,12 +9175,15 @@ char * wpa_supplicant_ctrl_iface_process
- } else if (os_strncmp(buf, "STA-NEXT ", 9) == 0) {
- reply_len = ap_ctrl_iface_sta_next(wpa_s, buf + 9, reply,
- reply_size);
-@@ -93,15 +93,15 @@
- reply_len = -1;
- --- a/src/ap/ctrl_iface_ap.c
- +++ b/src/ap/ctrl_iface_ap.c
--@@ -22,6 +22,7 @@
-- #include "ctrl_iface_ap.h"
-+@@ -24,6 +24,7 @@
- #include "ap_drv_ops.h"
-+ #include "mbo_ap.h"
-
- +#ifdef CONFIG_CTRL_IFACE_MIB
-
- static int hostapd_get_sta_tx_rx(struct hostapd_data *hapd,
- struct sta_info *sta,
--@@ -224,6 +225,7 @@ int hostapd_ctrl_iface_sta_next(struct h
-+@@ -249,6 +250,7 @@ int hostapd_ctrl_iface_sta_next(struct h
- return hostapd_ctrl_iface_sta_mib(hapd, sta->next, buf, buflen);
- }
-
-@@ -111,33 +111,33 @@
- static int p2p_manager_disconnect(struct hostapd_data *hapd, u16 stype,
- --- a/src/ap/ieee802_1x.c
- +++ b/src/ap/ieee802_1x.c
--@@ -2337,6 +2337,7 @@ static const char * bool_txt(Boolean boo
-- return bool_val ? "TRUE" : "FALSE";
-+@@ -2441,6 +2441,7 @@ static const char * bool_txt(Boolean val
-+ return val ? "TRUE" : "FALSE";
- }
-
- +#ifdef CONFIG_CTRL_IFACE_MIB
-
- int ieee802_1x_get_mib(struct hostapd_data *hapd, char *buf, size_t buflen)
- {
--@@ -2512,6 +2513,7 @@ int ieee802_1x_get_mib_sta(struct hostap
-+@@ -2616,6 +2617,7 @@ int ieee802_1x_get_mib_sta(struct hostap
- return len;
- }
-
- +#endif
-
-- static void ieee802_1x_finished(struct hostapd_data *hapd,
-- struct sta_info *sta, int success,
-+ #ifdef CONFIG_HS20
-+ static void ieee802_1x_wnm_notif_send(void *eloop_ctx, void *timeout_ctx)
- --- a/src/ap/wpa_auth.c
- +++ b/src/ap/wpa_auth.c
--@@ -2999,6 +2999,7 @@ static const char * wpa_bool_txt(int boo
-- return bool ? "TRUE" : "FALSE";
-+@@ -3069,6 +3069,7 @@ static const char * wpa_bool_txt(int val
-+ return val ? "TRUE" : "FALSE";
- }
-
- +#ifdef CONFIG_CTRL_IFACE_MIB
-
- #define RSN_SUITE "%02x-%02x-%02x-%d"
- #define RSN_SUITE_ARG(s) \
--@@ -3143,7 +3144,7 @@ int wpa_get_mib_sta(struct wpa_state_mac
-+@@ -3213,7 +3214,7 @@ int wpa_get_mib_sta(struct wpa_state_mac
-
- return len;
- }
-@@ -148,7 +148,7 @@
- {
- --- a/src/rsn_supp/wpa.c
- +++ b/src/rsn_supp/wpa.c
--@@ -2032,6 +2032,8 @@ static u32 wpa_key_mgmt_suite(struct wpa
-+@@ -2108,6 +2108,8 @@ static u32 wpa_key_mgmt_suite(struct wpa
- }
-
-
-@@ -157,7 +157,7 @@
- #define RSN_SUITE "%02x-%02x-%02x-%d"
- #define RSN_SUITE_ARG(s) \
- ((s) >> 24) & 0xff, ((s) >> 16) & 0xff, ((s) >> 8) & 0xff, (s) & 0xff
--@@ -2115,6 +2117,7 @@ int wpa_sm_get_mib(struct wpa_sm *sm, ch
-+@@ -2191,6 +2193,7 @@ int wpa_sm_get_mib(struct wpa_sm *sm, ch
-
- return (int) len;
- }
-@@ -167,7 +167,7 @@
-
- --- a/wpa_supplicant/ap.c
- +++ b/wpa_supplicant/ap.c
--@@ -1015,7 +1015,7 @@ int wpas_ap_wps_nfc_report_handover(stru
-+@@ -1114,7 +1114,7 @@ int wpas_ap_wps_nfc_report_handover(stru
- #endif /* CONFIG_WPS */
-
-
-diff --git a/package/network/services/hostapd/patches/390-wpa_ie_cap_workaround.patch b/package/network/services/hostapd/patches/390-wpa_ie_cap_workaround.patch
-index 1065a7f125bd0dce8fbd5090afc71f73d2295f16..c9e7bf4209fcde62dd965cd12754e6876067ed01 100644
---- a/package/network/services/hostapd/patches/390-wpa_ie_cap_workaround.patch
-+++ b/package/network/services/hostapd/patches/390-wpa_ie_cap_workaround.patch
-@@ -1,6 +1,6 @@
- --- a/src/common/wpa_common.c
- +++ b/src/common/wpa_common.c
--@@ -1228,6 +1228,31 @@ u32 wpa_akm_to_suite(int akm)
-+@@ -1244,6 +1244,31 @@ u32 wpa_akm_to_suite(int akm)
- }
-
-
-@@ -32,7 +32,7 @@
- int wpa_compare_rsn_ie(int ft_initial_assoc,
- const u8 *ie1, size_t ie1len,
- const u8 *ie2, size_t ie2len)
--@@ -1235,8 +1260,19 @@ int wpa_compare_rsn_ie(int ft_initial_as
-+@@ -1251,8 +1276,19 @@ int wpa_compare_rsn_ie(int ft_initial_as
- if (ie1 == NULL || ie2 == NULL)
- return -1;
-
-diff --git a/package/network/services/hostapd/patches/400-wps_single_auth_enc_type.patch b/package/network/services/hostapd/patches/400-wps_single_auth_enc_type.patch
-index 083af5b4508e968af5628ad959283dcef24ba41a..f5872cd5979e48aa0f918635af0852f2c1acb027 100644
---- a/package/network/services/hostapd/patches/400-wps_single_auth_enc_type.patch
-+++ b/package/network/services/hostapd/patches/400-wps_single_auth_enc_type.patch
-@@ -1,25 +1,22 @@
- --- a/src/ap/wps_hostapd.c
- +++ b/src/ap/wps_hostapd.c
--@@ -1052,11 +1052,9 @@ int hostapd_init_wps(struct hostapd_data
--
-- if (conf->rsn_pairwise & (WPA_CIPHER_CCMP | WPA_CIPHER_GCMP))
-+@@ -352,8 +352,7 @@ static int hapd_wps_reconfig_in_memory(s
-+ bss->wpa_pairwise |= WPA_CIPHER_GCMP;
-+ else
-+ bss->wpa_pairwise |= WPA_CIPHER_CCMP;
-+- }
-+- if (cred->encr_type & WPS_ENCR_TKIP)
-++ } else if (cred->encr_type & WPS_ENCR_TKIP)
-+ bss->wpa_pairwise |= WPA_CIPHER_TKIP;
-+ bss->rsn_pairwise = bss->wpa_pairwise;
-+ bss->wpa_group = wpa_select_ap_group_cipher(bss->wpa,
-+@@ -1073,8 +1072,7 @@ int hostapd_init_wps(struct hostapd_data
-+ if (conf->rsn_pairwise & (WPA_CIPHER_CCMP | WPA_CIPHER_GCMP)) {
- wps->encr_types |= WPS_ENCR_AES;
--- if (conf->rsn_pairwise & WPA_CIPHER_TKIP)
--+ else if (conf->rsn_pairwise & WPA_CIPHER_TKIP)
-+ wps->encr_types_rsn |= WPS_ENCR_AES;
-+- }
-+- if (conf->rsn_pairwise & WPA_CIPHER_TKIP) {
-++ } else if (conf->rsn_pairwise & WPA_CIPHER_TKIP) {
- wps->encr_types |= WPS_ENCR_TKIP;
--- }
---
--- if (conf->wpa & WPA_PROTO_WPA) {
--+ } else if (conf->wpa & WPA_PROTO_WPA) {
-- if (conf->wpa_key_mgmt & WPA_KEY_MGMT_PSK)
-- wps->auth_types |= WPS_AUTH_WPAPSK;
-- if (conf->wpa_key_mgmt & WPA_KEY_MGMT_IEEE8021X)
--@@ -1064,7 +1062,7 @@ int hostapd_init_wps(struct hostapd_data
--
-- if (conf->wpa_pairwise & WPA_CIPHER_CCMP)
-- wps->encr_types |= WPS_ENCR_AES;
--- if (conf->wpa_pairwise & WPA_CIPHER_TKIP)
--+ else if (conf->wpa_pairwise & WPA_CIPHER_TKIP)
-- wps->encr_types |= WPS_ENCR_TKIP;
-- }
--
-+ wps->encr_types_rsn |= WPS_ENCR_TKIP;
-+ }
-diff --git a/package/network/services/hostapd/patches/410-limit_debug_messages.patch b/package/network/services/hostapd/patches/410-limit_debug_messages.patch
-index da887321c6e96fb42f58e613c77f6501279df2b6..a48b6962ee3e420f4abc79e772b9bcb049559dee 100644
---- a/package/network/services/hostapd/patches/410-limit_debug_messages.patch
-+++ b/package/network/services/hostapd/patches/410-limit_debug_messages.patch
-@@ -64,7 +64,7 @@
- #ifdef CONFIG_DEBUG_FILE
- static char *last_path = NULL;
- #endif /* CONFIG_DEBUG_FILE */
--@@ -602,7 +576,7 @@ void wpa_msg_register_ifname_cb(wpa_msg_
-+@@ -604,7 +578,7 @@ void wpa_msg_register_ifname_cb(wpa_msg_
- }
-
-
-@@ -73,7 +73,7 @@
- {
- va_list ap;
- char *buf;
--@@ -640,7 +614,7 @@ void wpa_msg(void *ctx, int level, const
-+@@ -642,7 +616,7 @@ void wpa_msg(void *ctx, int level, const
- }
-
-
-@@ -183,7 +183,7 @@
-
- /*
- * wpa_dbg() behaves like wpa_msg(), but it can be removed from build to reduce
--@@ -181,7 +222,12 @@ void wpa_hexdump_ascii_key(int level, co
-+@@ -182,7 +223,12 @@ void wpa_hexdump_ascii_key(int level, co
- *
- * Note: New line '\n' is added to the end of the text when printing to stdout.
- */
-@@ -197,7 +197,7 @@
-
- /**
- * wpa_msg_ctrl - Conditional printf for ctrl_iface monitors
--@@ -195,8 +241,13 @@ void wpa_msg(void *ctx, int level, const
-+@@ -196,8 +242,13 @@ void wpa_msg(void *ctx, int level, const
- * attached ctrl_iface monitors. In other words, it can be used for frequent
- * events that do not need to be sent to syslog.
- */
-diff --git a/package/network/services/hostapd/patches/420-indicate-features.patch b/package/network/services/hostapd/patches/420-indicate-features.patch
-index 64c92df6bb58d07fb7f1d004b4ddc371e212291d..335e71eb519851305f813b4aa95ca5239b7e46f9 100644
---- a/package/network/services/hostapd/patches/420-indicate-features.patch
-+++ b/package/network/services/hostapd/patches/420-indicate-features.patch
-@@ -8,16 +8,16 @@
- #include "crypto/random.h"
- #include "crypto/tls.h"
- #include "common/version.h"
--@@ -567,7 +568,7 @@ int main(int argc, char *argv[])
--
-+@@ -668,7 +669,7 @@ int main(int argc, char *argv[])
- wpa_supplicant_event = hostapd_wpa_event;
-+ wpa_supplicant_event_global = hostapd_wpa_event_global;
- for (;;) {
--- c = getopt(argc, argv, "b:Bde:f:hKP:Ttu:vg:G:");
--+ c = getopt(argc, argv, "b:Bde:f:hKP:Ttu:g:G:v::");
-+- c = getopt(argc, argv, "b:Bde:f:hi:KP:STtu:vg:G:");
-++ c = getopt(argc, argv, "b:Bde:f:hi:KP:STtu:g:G:v::");
- if (c < 0)
- break;
- switch (c) {
--@@ -604,6 +605,8 @@ int main(int argc, char *argv[])
-+@@ -705,6 +706,8 @@ int main(int argc, char *argv[])
- break;
- #endif /* CONFIG_DEBUG_LINUX_TRACING */
- case 'v':
-@@ -33,19 +33,19 @@
-
- #include "common.h"
- +#include "build_features.h"
-+ #include "fst/fst.h"
- #include "wpa_supplicant_i.h"
- #include "driver_i.h"
-- #include "p2p_supplicant.h"
--@@ -176,7 +177,7 @@ int main(int argc, char *argv[])
-+@@ -202,7 +203,7 @@ int main(int argc, char *argv[])
-
- for (;;) {
- c = getopt(argc, argv,
--- "b:Bc:C:D:de:f:g:G:hH:i:I:KLm:No:O:p:P:qsTtuvW");
--+ "b:Bc:C:D:de:f:g:G:hH:i:I:KLm:No:O:p:P:qsTtuv::W");
-+- "b:Bc:C:D:de:f:g:G:hH:i:I:KLMm:No:O:p:P:qsTtuvW");
-++ "b:Bc:C:D:de:f:g:G:hH:i:I:KLMm:No:O:p:P:qsTtuv::W");
- if (c < 0)
- break;
- switch (c) {
--@@ -279,8 +280,12 @@ int main(int argc, char *argv[])
-+@@ -305,8 +306,12 @@ int main(int argc, char *argv[])
- break;
- #endif /* CONFIG_DBUS */
- case 'v':
-diff --git a/package/network/services/hostapd/patches/430-hostapd_cli_ifdef.patch b/package/network/services/hostapd/patches/430-hostapd_cli_ifdef.patch
-index 85d2e1603bfb56eb8f9b62c8ea602020c3170883..d07b747c3d299dd1561251fcfd5a89a41214edb5 100644
---- a/package/network/services/hostapd/patches/430-hostapd_cli_ifdef.patch
-+++ b/package/network/services/hostapd/patches/430-hostapd_cli_ifdef.patch
-@@ -1,6 +1,6 @@
- --- a/hostapd/hostapd_cli.c
- +++ b/hostapd/hostapd_cli.c
--@@ -67,7 +67,6 @@ static const char *commands_help =
-+@@ -69,7 +69,6 @@ static const char *const commands_help =
- #ifdef CONFIG_IEEE80211W
- " sa_query <addr> send SA Query to a station\n"
- #endif /* CONFIG_IEEE80211W */
-@@ -8,7 +8,7 @@
- " wps_pin <uuid> <pin> [timeout] [addr] add WPS Enrollee PIN\n"
- " wps_check_pin <PIN> verify PIN checksum\n"
- " wps_pbc indicate button pushed to initiate PBC\n"
--@@ -80,7 +79,6 @@ static const char *commands_help =
-+@@ -82,7 +81,6 @@ static const char *const commands_help =
- " wps_ap_pin <cmd> [params..] enable/disable AP PIN\n"
- " wps_config <SSID> <auth> <encr> <key> configure AP\n"
- " wps_get_status show current WPS status\n"
-@@ -16,7 +16,7 @@
- " get_config show current configuration\n"
- " help show this usage help\n"
- " interface [ifname] show interfaces/select interface\n"
--@@ -353,7 +351,6 @@ static int hostapd_cli_cmd_sa_query(stru
-+@@ -418,7 +416,6 @@ static int hostapd_cli_cmd_sa_query(stru
- #endif /* CONFIG_IEEE80211W */
-
-
-@@ -24,7 +24,7 @@
- static int hostapd_cli_cmd_wps_pin(struct wpa_ctrl *ctrl, int argc,
- char *argv[])
- {
--@@ -579,7 +576,6 @@ static int hostapd_cli_cmd_wps_config(st
-+@@ -644,7 +641,6 @@ static int hostapd_cli_cmd_wps_config(st
- ssid_hex, argv[1]);
- return wpa_ctrl_command(ctrl, buf);
- }
-@@ -32,7 +32,7 @@
-
-
- static int hostapd_cli_cmd_disassoc_imminent(struct wpa_ctrl *ctrl, int argc,
--@@ -1027,7 +1023,6 @@ static struct hostapd_cli_cmd hostapd_cl
-+@@ -1236,7 +1232,6 @@ static const struct hostapd_cli_cmd host
- #ifdef CONFIG_IEEE80211W
- { "sa_query", hostapd_cli_cmd_sa_query },
- #endif /* CONFIG_IEEE80211W */
-@@ -40,7 +40,7 @@
- { "wps_pin", hostapd_cli_cmd_wps_pin },
- { "wps_check_pin", hostapd_cli_cmd_wps_check_pin },
- { "wps_pbc", hostapd_cli_cmd_wps_pbc },
--@@ -1041,7 +1036,6 @@ static struct hostapd_cli_cmd hostapd_cl
-+@@ -1250,7 +1245,6 @@ static const struct hostapd_cli_cmd host
- { "wps_ap_pin", hostapd_cli_cmd_wps_ap_pin },
- { "wps_config", hostapd_cli_cmd_wps_config },
- { "wps_get_status", hostapd_cli_cmd_wps_get_status },
-diff --git a/package/network/services/hostapd/patches/431-wpa_cli_ifdef.patch b/package/network/services/hostapd/patches/431-wpa_cli_ifdef.patch
-index 874ff4bccc0b152ce5a2f2b9e3a0ba1097128126..256f6b5977323b00215927a0051738eda376eef7 100644
---- a/package/network/services/hostapd/patches/431-wpa_cli_ifdef.patch
-+++ b/package/network/services/hostapd/patches/431-wpa_cli_ifdef.patch
-@@ -1,13 +1,12 @@
- --- a/wpa_supplicant/wpa_cli.c
- +++ b/wpa_supplicant/wpa_cli.c
--@@ -26,6 +26,10 @@
-+@@ -25,6 +25,9 @@
-+ #include <cutils/properties.h>
- #endif /* ANDROID */
-
--
- +#ifndef CONFIG_P2P
- +#define CONFIG_P2P
- +#endif
--+
-- static const char *wpa_cli_version =
-+
-+ static const char *const wpa_cli_version =
- "wpa_cli v" VERSION_STR "\n"
-- "Copyright (c) 2004-2015, Jouni Malinen <j@w1.fi> and contributors";
-diff --git a/package/network/services/hostapd/patches/432-missing-typedef.patch b/package/network/services/hostapd/patches/432-missing-typedef.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..7a100f1a0d25e4e1e63524025dcd36d532122843
---- /dev/null
-+++ b/package/network/services/hostapd/patches/432-missing-typedef.patch
-@@ -0,0 +1,10 @@
-+--- a/src/drivers/linux_wext.h
-++++ b/src/drivers/linux_wext.h
-+@@ -26,6 +26,7 @@ typedef int32_t __s32;
-+ typedef uint16_t __u16;
-+ typedef int16_t __s16;
-+ typedef uint8_t __u8;
-++typedef int8_t __s8;
-+ #ifndef __user
-+ #define __user
-+ #endif /* __user */
-diff --git a/package/network/services/hostapd/patches/440-max_num_sta_probe.patch b/package/network/services/hostapd/patches/440-max_num_sta_probe.patch
-deleted file mode 100644
-index 74aef26d64fb82fad3826b64024e9500f2353542..0000000000000000000000000000000000000000
---- a/package/network/services/hostapd/patches/440-max_num_sta_probe.patch
-+++ /dev/null
-@@ -1,13 +0,0 @@
----- a/src/ap/beacon.c
--+++ b/src/ap/beacon.c
--@@ -664,6 +664,10 @@ void handle_probe_req(struct hostapd_dat
-- return;
-- }
--
--+ if (!sta && hapd->num_sta >= hapd->conf->max_num_sta)
--+ wpa_printf(MSG_MSGDUMP, "Probe Request from " MACSTR " ignored,"
--+ " too many connected stations.", MAC2STR(mgmt->sa));
--+
-- #ifdef CONFIG_INTERWORKING
-- if (hapd->conf->interworking &&
-- elems.interworking && elems.interworking_len >= 1) {
-diff --git a/package/network/services/hostapd/patches/450-scan_wait.patch b/package/network/services/hostapd/patches/450-scan_wait.patch
-index 87ebd4552f4d22dfcb2c3bd9947e6c2f16e9e115..78cf3064fa6fbf5abf89d5c7388e8a99e8ba988e 100644
---- a/package/network/services/hostapd/patches/450-scan_wait.patch
-+++ b/package/network/services/hostapd/patches/450-scan_wait.patch
-@@ -1,6 +1,6 @@
- --- a/hostapd/main.c
- +++ b/hostapd/main.c
--@@ -36,6 +36,8 @@ struct hapd_global {
-+@@ -37,6 +37,8 @@ struct hapd_global {
- };
-
- static struct hapd_global global;
-@@ -9,7 +9,7 @@
-
-
- #ifndef CONFIG_NO_HOSTAPD_LOGGER
--@@ -142,6 +144,14 @@ static void hostapd_logger_cb(void *ctx,
-+@@ -143,6 +145,14 @@ static void hostapd_logger_cb(void *ctx,
- }
- #endif /* CONFIG_NO_HOSTAPD_LOGGER */
-
-@@ -24,7 +24,7 @@
-
- /**
- * hostapd_driver_init - Preparate driver interface
--@@ -160,6 +170,8 @@ static int hostapd_driver_init(struct ho
-+@@ -161,6 +171,8 @@ static int hostapd_driver_init(struct ho
- return -1;
- }
-
-@@ -33,7 +33,7 @@
- /* Initialize the driver interface */
- if (!(b[0] | b[1] | b[2] | b[3] | b[4] | b[5]))
- b = NULL;
--@@ -381,8 +393,6 @@ static void hostapd_global_deinit(const
-+@@ -401,8 +413,6 @@ static void hostapd_global_deinit(const
- #endif /* CONFIG_NATIVE_WINDOWS */
-
- eap_server_unregister_methods();
-@@ -42,19 +42,26 @@
- }
-
-
--@@ -408,11 +418,6 @@ static int hostapd_global_run(struct hap
-+@@ -428,18 +438,6 @@ static int hostapd_global_run(struct hap
- }
- #endif /* EAP_SERVER_TNC */
-
--- if (daemonize && os_daemonize(pid_file)) {
--- wpa_printf(MSG_ERROR, "daemon: %s", strerror(errno));
--- return -1;
-+- if (daemonize) {
-+- if (os_daemonize(pid_file)) {
-+- wpa_printf(MSG_ERROR, "daemon: %s", strerror(errno));
-+- return -1;
-+- }
-+- if (eloop_sock_requeue()) {
-+- wpa_printf(MSG_ERROR, "eloop_sock_requeue: %s",
-+- strerror(errno));
-+- return -1;
-+- }
- - }
- -
- eloop_run();
-
- return 0;
--@@ -542,8 +547,7 @@ int main(int argc, char *argv[])
-+@@ -638,8 +636,7 @@ int main(int argc, char *argv[])
- struct hapd_interfaces interfaces;
- int ret = 1;
- size_t i, j;
-diff --git a/package/network/services/hostapd/patches/460-wpa_supplicant-add-new-config-params-to-be-used-with.patch b/package/network/services/hostapd/patches/460-wpa_supplicant-add-new-config-params-to-be-used-with.patch
-index 217e7015010848fd441003776afcbae04038d02d..6a5866e17c0305e92c9ca20f7b09768d60dfafab 100644
---- a/package/network/services/hostapd/patches/460-wpa_supplicant-add-new-config-params-to-be-used-with.patch
-+++ b/package/network/services/hostapd/patches/460-wpa_supplicant-add-new-config-params-to-be-used-with.patch
-@@ -18,15 +18,15 @@ Signed-hostap: Antonio Quartulli <ordex@autistici.org>
-
- #define WPA_SUPPLICANT_DRIVER_VERSION 4
-
--+#include "drivers/nl80211_copy.h"
-++#include "ap/sta_info.h"
- #include "common/defs.h"
-+ #include "common/ieee802_11_defs.h"
- #include "utils/list.h"
--
--@@ -538,6 +539,9 @@ struct wpa_driver_associate_params {
-+@@ -587,6 +588,9 @@ struct wpa_driver_associate_params {
- * responsible for selecting with which BSS to associate. */
- const u8 *bssid;
-
--+ unsigned char rates[NL80211_MAX_SUPP_RATES];
-++ unsigned char rates[WLAN_SUPP_RATES_MAX];
- + int mcast_rate;
- +
- /**
-@@ -34,15 +34,15 @@ Signed-hostap: Antonio Quartulli <ordex@autistici.org>
- *
- --- a/wpa_supplicant/config.c
- +++ b/wpa_supplicant/config.c
--@@ -15,6 +15,7 @@
-- #include "rsn_supp/wpa.h"
-+@@ -16,6 +16,7 @@
- #include "eap_peer/eap.h"
- #include "p2p/p2p.h"
--+#include "drivers/nl80211_copy.h"
-+ #include "fst/fst.h"
-++#include "ap/sta_info.h"
- #include "config.h"
-
-
--@@ -1722,6 +1723,97 @@ static char * wpa_config_write_mesh_basi
-+@@ -1816,6 +1817,97 @@ static char * wpa_config_write_mesh_basi
- #endif /* CONFIG_MESH */
-
-
-@@ -88,7 +88,7 @@ Signed-hostap: Antonio Quartulli <ordex@autistici.org>
- + pos = (char *)value;
- + r = strtok_r(pos, ",", &sptr);
- + i = 0;
--+ while (pos && i < NL80211_MAX_SUPP_RATES) {
-++ while (pos && i < WLAN_SUPP_RATES_MAX) {
- + rate = 0.0;
- + if (r)
- + rate = strtod(r, &end);
-@@ -113,11 +113,11 @@ Signed-hostap: Antonio Quartulli <ordex@autistici.org>
- + if (ssid->rates[0] <= 0)
- + return NULL;
- +
--+ value = os_malloc(6 * NL80211_MAX_SUPP_RATES + 1);
-++ value = os_malloc(6 * WLAN_SUPP_RATES_MAX + 1);
- + if (value == NULL)
- + return NULL;
- + pos = value;
--+ for (i = 0; i < NL80211_MAX_SUPP_RATES - 1; i++) {
-++ for (i = 0; i < WLAN_SUPP_RATES_MAX - 1; i++) {
- + res = os_snprintf(pos, 6, "%.1f,", (double)ssid->rates[i] / 2);
- + if (res < 0) {
- + os_free(value);
-@@ -126,13 +126,13 @@ Signed-hostap: Antonio Quartulli <ordex@autistici.org>
- + pos += res;
- + }
- + res = os_snprintf(pos, 6, "%.1f",
--+ (double)ssid->rates[NL80211_MAX_SUPP_RATES - 1] / 2);
-++ (double)ssid->rates[WLAN_SUPP_RATES_MAX - 1] / 2);
- + if (res < 0) {
- + os_free(value);
- + return NULL;
- + }
- +
--+ value[6 * NL80211_MAX_SUPP_RATES] = '\0';
-++ value[6 * WLAN_SUPP_RATES_MAX] = '\0';
- + return value;
- +}
- +#endif /* NO_CONFIG_WRITE */
-@@ -140,7 +140,7 @@ Signed-hostap: Antonio Quartulli <ordex@autistici.org>
- /* Helper macros for network block parser */
-
- #ifdef OFFSET
--@@ -1947,6 +2039,9 @@ static const struct parse_data ssid_fiel
-+@@ -2047,6 +2139,9 @@ static const struct parse_data ssid_fiel
- { INT(ap_max_inactivity) },
- { INT(dtim_period) },
- { INT(beacon_int) },
-@@ -152,19 +152,22 @@ Signed-hostap: Antonio Quartulli <ordex@autistici.org>
- #endif /* CONFIG_MACSEC */
- --- a/wpa_supplicant/config_ssid.h
- +++ b/wpa_supplicant/config_ssid.h
--@@ -12,6 +12,7 @@
-+@@ -10,8 +10,10 @@
-+ #define CONFIG_SSID_H
-+
- #include "common/defs.h"
-++#include "ap/sta_info.h"
- #include "utils/list.h"
- #include "eap_peer/eap_config.h"
- +#include "drivers/nl80211_copy.h"
-
-- #define MAX_SSID_LEN 32
-
--@@ -675,6 +676,9 @@ struct wpa_ssid {
-+ #define DEFAULT_EAP_WORKAROUND ((unsigned int) -1)
-+@@ -711,6 +713,9 @@ struct wpa_ssid {
- */
- void *parent_cred;
-
--+ unsigned char rates[NL80211_MAX_SUPP_RATES];
-++ unsigned char rates[WLAN_SUPP_RATES_MAX];
- + double mcast_rate;
- +
- #ifdef CONFIG_MACSEC
-@@ -172,13 +175,13 @@ Signed-hostap: Antonio Quartulli <ordex@autistici.org>
- * macsec_policy - Determines the policy for MACsec secure session
- --- a/wpa_supplicant/wpa_supplicant.c
- +++ b/wpa_supplicant/wpa_supplicant.c
--@@ -2266,6 +2266,13 @@ static void wpas_start_assoc_cb(struct w
-+@@ -2518,6 +2518,13 @@ static void wpas_start_assoc_cb(struct w
- params.beacon_int = ssid->beacon_int;
- else
- params.beacon_int = wpa_s->conf->beacon_int;
- + params.fixed_freq = ssid->fixed_freq;
- + i = 0;
--+ while (i < NL80211_MAX_SUPP_RATES) {
-++ while (i < WLAN_SUPP_RATES_MAX) {
- + params.rates[i] = ssid->rates[i];
- + i++;
- + }
-diff --git a/package/network/services/hostapd/patches/461-driver_nl80211-use-new-parameters-during-ibss-join.patch b/package/network/services/hostapd/patches/461-driver_nl80211-use-new-parameters-during-ibss-join.patch
-index 730cc316503965639f87111b43be49ea3ee66f79..459bdb944ae2d5f6820594b261ccfc77b52ab5d3 100644
---- a/package/network/services/hostapd/patches/461-driver_nl80211-use-new-parameters-during-ibss-join.patch
-+++ b/package/network/services/hostapd/patches/461-driver_nl80211-use-new-parameters-during-ibss-join.patch
-@@ -10,7 +10,7 @@ Signed-hostap: Antonio Quartulli <ordex@autistici.org>
-
- --- a/src/drivers/driver_nl80211.c
- +++ b/src/drivers/driver_nl80211.c
--@@ -4398,7 +4398,7 @@ static int wpa_driver_nl80211_ibss(struc
-+@@ -4644,7 +4644,7 @@ static int wpa_driver_nl80211_ibss(struc
- struct wpa_driver_associate_params *params)
- {
- struct nl_msg *msg;
-@@ -19,7 +19,7 @@ Signed-hostap: Antonio Quartulli <ordex@autistici.org>
- int count = 0;
-
- wpa_printf(MSG_DEBUG, "nl80211: Join IBSS (ifindex=%d)", drv->ifindex);
--@@ -4425,6 +4425,37 @@ retry:
-+@@ -4671,6 +4671,37 @@ retry:
- nl80211_put_beacon_int(msg, params->beacon_int))
- goto fail;
-
-diff --git a/package/network/services/hostapd/patches/462-wpa_s-support-htmode-param.patch b/package/network/services/hostapd/patches/462-wpa_s-support-htmode-param.patch
-index 30bb2dc14c44d7ee85df46b9f203f8ca2e26557d..80fe49ccb20f0e9caf5e690fe18f3c31fe351a8e 100644
---- a/package/network/services/hostapd/patches/462-wpa_s-support-htmode-param.patch
-+++ b/package/network/services/hostapd/patches/462-wpa_s-support-htmode-param.patch
-@@ -16,9 +16,9 @@ Signed-off-by: Antonio Quartulli <ordex@autistici.org>
-
- --- a/src/drivers/driver.h
- +++ b/src/drivers/driver.h
--@@ -541,6 +541,8 @@ struct wpa_driver_associate_params {
-+@@ -590,6 +590,8 @@ struct wpa_driver_associate_params {
-
-- unsigned char rates[NL80211_MAX_SUPP_RATES];
-+ unsigned char rates[WLAN_SUPP_RATES_MAX];
- int mcast_rate;
- + int ht_set;
- + unsigned int htmode;
-@@ -27,7 +27,7 @@ Signed-off-by: Antonio Quartulli <ordex@autistici.org>
- * bssid_hint - BSSID of a proposed AP
- --- a/src/drivers/driver_nl80211.c
- +++ b/src/drivers/driver_nl80211.c
--@@ -4456,6 +4456,22 @@ retry:
-+@@ -4702,6 +4702,22 @@ retry:
- nla_put_u32(msg, NL80211_ATTR_MCAST_RATE, params->mcast_rate);
- }
-
-@@ -52,7 +52,7 @@ Signed-off-by: Antonio Quartulli <ordex@autistici.org>
- goto fail;
- --- a/wpa_supplicant/config.c
- +++ b/wpa_supplicant/config.c
--@@ -1754,6 +1754,71 @@ static char * wpa_config_write_mcast_rat
-+@@ -1848,6 +1848,71 @@ static char * wpa_config_write_mcast_rat
- }
- #endif /* NO_CONFIG_WRITE */
-
-@@ -124,7 +124,7 @@ Signed-off-by: Antonio Quartulli <ordex@autistici.org>
- static int wpa_config_parse_rates(const struct parse_data *data,
- struct wpa_ssid *ssid, int line,
- const char *value)
--@@ -2042,6 +2107,7 @@ static const struct parse_data ssid_fiel
-+@@ -2142,6 +2207,7 @@ static const struct parse_data ssid_fiel
- { INT_RANGE(fixed_freq, 0, 1) },
- { FUNC(rates) },
- { FUNC(mcast_rate) },
-@@ -134,9 +134,9 @@ Signed-off-by: Antonio Quartulli <ordex@autistici.org>
- #endif /* CONFIG_MACSEC */
- --- a/wpa_supplicant/config_ssid.h
- +++ b/wpa_supplicant/config_ssid.h
--@@ -678,6 +678,8 @@ struct wpa_ssid {
-+@@ -715,6 +715,8 @@ struct wpa_ssid {
-
-- unsigned char rates[NL80211_MAX_SUPP_RATES];
-+ unsigned char rates[WLAN_SUPP_RATES_MAX];
- double mcast_rate;
- + int ht_set;
- + unsigned int htmode;
-@@ -145,7 +145,7 @@ Signed-off-by: Antonio Quartulli <ordex@autistici.org>
- /**
- --- a/wpa_supplicant/wpa_supplicant.c
- +++ b/wpa_supplicant/wpa_supplicant.c
--@@ -2273,6 +2273,8 @@ static void wpas_start_assoc_cb(struct w
-+@@ -2525,6 +2525,8 @@ static void wpas_start_assoc_cb(struct w
- i++;
- }
- params.mcast_rate = ssid->mcast_rate;
-diff --git a/package/network/services/hostapd/patches/470-survey_data_fallback.patch b/package/network/services/hostapd/patches/470-survey_data_fallback.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..4e40a87558949483954950f72d30ac30a17877e9
---- /dev/null
-+++ b/package/network/services/hostapd/patches/470-survey_data_fallback.patch
-@@ -0,0 +1,45 @@
-+--- a/src/ap/acs.c
-++++ b/src/ap/acs.c
-+@@ -292,18 +292,12 @@ static void acs_fail(struct hostapd_ifac
-+ static long double
-+ acs_survey_interference_factor(struct freq_survey *survey, s8 min_nf)
-+ {
-+- long double factor, busy, total;
-++ long double factor, busy = 0, total;
-+
-+ if (survey->filled & SURVEY_HAS_CHAN_TIME_BUSY)
-+ busy = survey->channel_time_busy;
-+ else if (survey->filled & SURVEY_HAS_CHAN_TIME_RX)
-+ busy = survey->channel_time_rx;
-+- else {
-+- /* This shouldn't really happen as survey data is checked in
-+- * acs_sanity_check() */
-+- wpa_printf(MSG_ERROR, "ACS: Survey data missing");
-+- return 0;
-+- }
-+
-+ total = survey->channel_time;
-+
-+@@ -395,20 +389,19 @@ static int acs_usable_vht80_chan(struct
-+ static int acs_survey_is_sufficient(struct freq_survey *survey)
-+ {
-+ if (!(survey->filled & SURVEY_HAS_NF)) {
-++ survey->nf = -95;
-+ wpa_printf(MSG_INFO, "ACS: Survey is missing noise floor");
-+- return 0;
-+ }
-+
-+ if (!(survey->filled & SURVEY_HAS_CHAN_TIME)) {
-++ survey->channel_time = 0;
-+ wpa_printf(MSG_INFO, "ACS: Survey is missing channel time");
-+- return 0;
-+ }
-+
-+ if (!(survey->filled & SURVEY_HAS_CHAN_TIME_BUSY) &&
-+ !(survey->filled & SURVEY_HAS_CHAN_TIME_RX)) {
-+ wpa_printf(MSG_INFO,
-+ "ACS: Survey is missing RX and busy time (at least one is required)");
-+- return 0;
-+ }
-+
-+ return 1;
-diff --git a/package/network/services/hostapd/patches/470-wait-for-nullfunc-longer.patch b/package/network/services/hostapd/patches/470-wait-for-nullfunc-longer.patch
-deleted file mode 100644
-index e6bbdddc50cc293f4feb0d91abbca597e02902dc..0000000000000000000000000000000000000000
---- a/package/network/services/hostapd/patches/470-wait-for-nullfunc-longer.patch
-+++ /dev/null
-@@ -1,11 +0,0 @@
----- a/src/ap/sta_info.h
--+++ b/src/ap/sta_info.h
--@@ -179,7 +179,7 @@ struct sta_info {
-- * AP_DISASSOC_DELAY seconds. Similarly, the station will be deauthenticated
-- * after AP_DEAUTH_DELAY seconds has passed after disassociation. */
-- #define AP_MAX_INACTIVITY (5 * 60)
---#define AP_DISASSOC_DELAY (1)
--+#define AP_DISASSOC_DELAY (3)
-- #define AP_DEAUTH_DELAY (1)
-- /* Number of seconds to keep STA entry with Authenticated flag after it has
-- * been disassociated. */
-diff --git a/package/network/services/hostapd/patches/600-ubus_support.patch b/package/network/services/hostapd/patches/600-ubus_support.patch
-index df2eac873c306728b05c8b96e2a464592944d181..feacdf2c08b07d5eba7c99efe629e64dd93f2c00 100644
---- a/package/network/services/hostapd/patches/600-ubus_support.patch
-+++ b/package/network/services/hostapd/patches/600-ubus_support.patch
-@@ -1,6 +1,6 @@
- --- a/hostapd/Makefile
- +++ b/hostapd/Makefile
--@@ -121,6 +121,11 @@ OBJS += ../src/common/hw_features_common
-+@@ -157,6 +157,11 @@ OBJS += ../src/common/hw_features_common
-
- OBJS += ../src/eapol_auth/eapol_auth_sm.o
-
-@@ -22,7 +22,7 @@
-
- struct wpa_ctrl_dst;
- struct radius_server_data;
--@@ -103,6 +104,7 @@ struct hostapd_data {
-+@@ -118,6 +119,7 @@ struct hostapd_data {
- struct hostapd_iface *iface;
- struct hostapd_config *iconf;
- struct hostapd_bss_config *conf;
-@@ -30,7 +30,7 @@
- int interface_added; /* virtual interface added for this BSS */
- unsigned int started:1;
- unsigned int disabled:1;
--@@ -286,6 +288,8 @@ struct hostapd_iface {
-+@@ -323,6 +325,8 @@ struct hostapd_iface {
- struct hostapd_config *conf;
- char phy[16]; /* Name of the PHY (radio) */
-
-@@ -41,10 +41,10 @@
- HAPD_IFACE_DISABLED,
- --- /dev/null
- +++ b/src/ap/ubus.c
--@@ -0,0 +1,511 @@
-+@@ -0,0 +1,536 @@
- +/*
- + * hostapd / ubus support
--+ * Copyright (c) 2013, Felix Fietkau <nbd@openwrt.org>
-++ * Copyright (c) 2013, Felix Fietkau <nbd@nbd.name>
- + *
- + * This software may be distributed under the terms of the BSD license.
- + * See README for more details.
-@@ -58,6 +58,8 @@
- +#include "wps_hostapd.h"
- +#include "sta_info.h"
- +#include "ubus.h"
-++#include "ap_drv_ops.h"
-++#include "beacon.h"
- +
- +static struct ubus_context *ctx;
- +static struct blob_buf b;
-@@ -417,6 +419,10 @@
- +{
- + struct blob_attr *tb[__VENDOR_ELEMENTS_MAX];
- + struct hostapd_data *hapd = get_hapd_from_object(obj);
-++ struct hostapd_bss_config *bss = hapd->conf;
-++ struct wpabuf *elems;
-++ const char *pos;
-++ size_t len;
- +
- + blobmsg_parse(ve_policy, __VENDOR_ELEMENTS_MAX, tb,
- + blob_data(msg), blob_len(msg));
-@@ -424,10 +430,29 @@
- + if (!tb[VENDOR_ELEMENTS])
- + return UBUS_STATUS_INVALID_ARGUMENT;
- +
--+ const char *vendor_elements = blobmsg_data(tb[VENDOR_ELEMENTS]);
--+ if (hostapd_set_iface(hapd->iconf, hapd->conf, "vendor_elements",
--+ vendor_elements) != 0)
--+ return UBUS_STATUS_NOT_SUPPORTED;
-++ pos = blobmsg_data(tb[VENDOR_ELEMENTS]);
-++ len = os_strlen(pos);
-++ if (len & 0x01)
-++ return UBUS_STATUS_INVALID_ARGUMENT;
-++
-++ len /= 2;
-++ if (len == 0) {
-++ wpabuf_free(bss->vendor_elements);
-++ bss->vendor_elements = NULL;
-++ return 0;
-++ }
-++
-++ elems = wpabuf_alloc(len);
-++ if (elems == NULL)
-++ return 1;
-++
-++ if (hexstr2bin(pos, wpabuf_put(elems, len), len)) {
-++ wpabuf_free(elems);
-++ return UBUS_STATUS_INVALID_ARGUMENT;
-++ }
-++
-++ wpabuf_free(bss->vendor_elements);
-++ bss->vendor_elements = elems;
- +
- + /* update beacons if vendor elements were set successfully */
- + if (ieee802_11_update_beacons(hapd->iface) != 0)
-@@ -558,7 +583,7 @@
- @@ -0,0 +1,78 @@
- +/*
- + * hostapd / ubus support
--+ * Copyright (c) 2013, Felix Fietkau <nbd@openwrt.org>
-++ * Copyright (c) 2013, Felix Fietkau <nbd@nbd.name>
- + *
- + * This software may be distributed under the terms of the BSD license.
- + * See README for more details.
-@@ -636,7 +661,7 @@
- +#endif
- --- a/src/ap/hostapd.c
- +++ b/src/ap/hostapd.c
--@@ -277,6 +277,7 @@ static void hostapd_free_hapd_data(struc
-+@@ -284,6 +284,7 @@ static void hostapd_free_hapd_data(struc
- hapd->started = 0;
-
- wpa_printf(MSG_DEBUG, "%s(%s)", __func__, hapd->conf->iface);
-@@ -644,7 +669,7 @@
- iapp_deinit(hapd->iapp);
- hapd->iapp = NULL;
- accounting_deinit(hapd);
--@@ -1098,6 +1099,8 @@ static int hostapd_setup_bss(struct host
-+@@ -1139,6 +1140,8 @@ static int hostapd_setup_bss(struct host
- if (hapd->driver && hapd->driver->set_operstate)
- hapd->driver->set_operstate(hapd->drv_priv, 1);
-
-@@ -653,7 +678,7 @@
- return 0;
- }
-
--@@ -1384,6 +1387,7 @@ int hostapd_setup_interface_complete(str
-+@@ -1664,6 +1667,7 @@ static int hostapd_setup_interface_compl
- if (err)
- goto fail;
-
-@@ -661,15 +686,15 @@
- wpa_printf(MSG_DEBUG, "Completing interface initialization");
- if (iface->conf->channel) {
- #ifdef NEED_AP_MLME
--@@ -1544,6 +1548,7 @@ dfs_offload:
-+@@ -1844,6 +1848,7 @@ dfs_offload:
-
- fail:
- wpa_printf(MSG_ERROR, "Interface initialization failed");
- + hostapd_ubus_free_iface(iface);
- hostapd_set_state(iface, HAPD_IFACE_DISABLED);
- wpa_msg(hapd->msg_ctx, MSG_INFO, AP_EVENT_DISABLED);
-- if (iface->interfaces && iface->interfaces->terminate_on_error)
--@@ -1873,6 +1878,7 @@ void hostapd_interface_deinit_free(struc
-+ #ifdef CONFIG_FST
-+@@ -2277,6 +2282,7 @@ void hostapd_interface_deinit_free(struc
- (unsigned int) iface->conf->num_bss);
- driver = iface->bss[0]->driver;
- drv_priv = iface->bss[0]->drv_priv;
-@@ -679,7 +704,7 @@
- __func__, driver, drv_priv);
- --- a/src/ap/ieee802_11.c
- +++ b/src/ap/ieee802_11.c
--@@ -881,7 +881,8 @@ int auth_sae_init_committed(struct hosta
-+@@ -980,7 +980,8 @@ int auth_sae_init_committed(struct hosta
-
-
- static void handle_auth(struct hostapd_data *hapd,
-@@ -689,7 +714,7 @@
- {
- u16 auth_alg, auth_transaction, status_code;
- u16 resp = WLAN_STATUS_SUCCESS;
--@@ -897,6 +898,11 @@ static void handle_auth(struct hostapd_d
-+@@ -996,6 +997,11 @@ static void handle_auth(struct hostapd_d
- char *identity = NULL;
- char *radius_cui = NULL;
- u16 seq_ctrl;
-@@ -699,9 +724,9 @@
- + .frame_info = fi,
- + };
-
-- if (len < IEEE80211_HDRLEN + sizeof(mgmt->u.auth)) {
-- wpa_printf(MSG_INFO, "handle_auth - too short payload (len=%lu)",
--@@ -983,6 +989,14 @@ static void handle_auth(struct hostapd_d
-+ os_memset(&vlan_id, 0, sizeof(vlan_id));
-+
-+@@ -1149,6 +1155,14 @@ static void handle_auth(struct hostapd_d
- resp = WLAN_STATUS_UNSPECIFIED_FAILURE;
- goto fail;
- }
-@@ -716,7 +741,7 @@
- if (res == HOSTAPD_ACL_PENDING) {
- wpa_printf(MSG_DEBUG, "Authentication frame from " MACSTR
- " waiting for an external authentication",
--@@ -1694,13 +1708,18 @@ static void send_assoc_resp(struct hosta
-+@@ -2033,13 +2047,18 @@ static u16 send_assoc_resp(struct hostap
-
- static void handle_assoc(struct hostapd_data *hapd,
- const struct ieee80211_mgmt *mgmt, size_t len,
-@@ -724,7 +749,7 @@
- + int reassoc, struct hostapd_frame_info *fi)
- {
- u16 capab_info, listen_interval, seq_ctrl, fc;
-- u16 resp = WLAN_STATUS_SUCCESS;
-+ u16 resp = WLAN_STATUS_SUCCESS, reply_res;
- const u8 *pos;
- int left, i;
- struct sta_info *sta;
-@@ -736,9 +761,9 @@
-
- if (len < IEEE80211_HDRLEN + (reassoc ? sizeof(mgmt->u.reassoc_req) :
- sizeof(mgmt->u.assoc_req))) {
--@@ -1820,6 +1839,13 @@ static void handle_assoc(struct hostapd_
-- goto fail;
-+@@ -2159,6 +2178,13 @@ static void handle_assoc(struct hostapd_
- }
-+ #endif /* CONFIG_MBO */
-
- + if (hostapd_ubus_handle_event(hapd, &req)) {
- + wpa_printf(MSG_DEBUG, "Station " MACSTR " assoc rejected by ubus handler.\n",
-@@ -747,10 +772,10 @@
- + goto fail;
- + }
- +
-- sta->capability = capab_info;
-- sta->listen_interval = listen_interval;
--
--@@ -2236,7 +2262,7 @@ int ieee802_11_mgmt(struct hostapd_data
-+ /*
-+ * sta->capability is used in check_assoc_ies() for RRM enabled
-+ * capability element.
-+@@ -2639,7 +2665,7 @@ int ieee802_11_mgmt(struct hostapd_data
-
-
- if (stype == WLAN_FC_STYPE_PROBE_REQ) {
-@@ -759,7 +784,7 @@
- return 1;
- }
-
--@@ -2251,17 +2277,17 @@ int ieee802_11_mgmt(struct hostapd_data
-+@@ -2657,17 +2683,17 @@ int ieee802_11_mgmt(struct hostapd_data
- switch (stype) {
- case WLAN_FC_STYPE_AUTH:
- wpa_printf(MSG_DEBUG, "mgmt::auth");
-@@ -782,7 +807,7 @@
- case WLAN_FC_STYPE_DISASSOC:
- --- a/src/ap/beacon.c
- +++ b/src/ap/beacon.c
--@@ -542,7 +542,7 @@ static enum ssid_match_result ssid_match
-+@@ -675,7 +675,7 @@ sta_track_seen_on(struct hostapd_iface *
-
- void handle_probe_req(struct hostapd_data *hapd,
- const struct ieee80211_mgmt *mgmt, size_t len,
-@@ -791,22 +816,23 @@
- {
- u8 *resp;
- struct ieee802_11_elems elems;
--@@ -550,8 +550,14 @@ void handle_probe_req(struct hostapd_dat
-- size_t ie_len;
-- struct sta_info *sta = NULL;
-+@@ -684,9 +684,15 @@ void handle_probe_req(struct hostapd_dat
- size_t i, resp_len;
--+ int ssi_signal = fi->ssi_signal;
- int noack;
- enum ssid_match_result res;
-++ int ssi_signal = fi->ssi_signal;
-+ int ret;
-+ u16 csa_offs[2];
-+ size_t csa_offs_len;
- + struct hostapd_ubus_request req = {
- + .type = HOSTAPD_UBUS_PROBE_REQ,
- + .mgmt_frame = mgmt,
- + .frame_info = fi,
- + };
-
-- ie = mgmt->u.probe_req.variable;
-- if (len < IEEE80211_HDRLEN + sizeof(mgmt->u.probe_req))
--@@ -710,6 +716,12 @@ void handle_probe_req(struct hostapd_dat
-+ if (len < IEEE80211_HDRLEN)
-+ return;
-+@@ -838,6 +844,12 @@ void handle_probe_req(struct hostapd_dat
- }
- #endif /* CONFIG_P2P */
-
-@@ -832,7 +858,7 @@
- int ieee802_11_update_beacons(struct hostapd_iface *iface);
- --- a/src/ap/drv_callbacks.c
- +++ b/src/ap/drv_callbacks.c
--@@ -49,6 +49,10 @@ int hostapd_notif_assoc(struct hostapd_d
-+@@ -52,6 +52,10 @@ int hostapd_notif_assoc(struct hostapd_d
- u16 reason = WLAN_REASON_UNSPECIFIED;
- u16 status = WLAN_STATUS_SUCCESS;
- const u8 *p2p_dev_addr = NULL;
-@@ -843,9 +869,9 @@
-
- if (addr == NULL) {
- /*
--@@ -113,6 +117,12 @@ int hostapd_notif_assoc(struct hostapd_d
-+@@ -124,6 +128,12 @@ int hostapd_notif_assoc(struct hostapd_d
-+ goto fail;
- }
-- sta->flags &= ~(WLAN_STA_WPS | WLAN_STA_MAYBE_WPS | WLAN_STA_WPS2);
-
- + if (hostapd_ubus_handle_event(hapd, &req)) {
- + wpa_printf(MSG_DEBUG, "Station " MACSTR " assoc rejected by ubus handler.\n",
-diff --git a/package/network/utils/iw/Makefile b/package/network/utils/iw/Makefile
-index ad82081570395bfba8d60428996194d834f73321..d17cbca0df391a287fb9d80a3d9c1ca1355c1774 100644
---- a/package/network/utils/iw/Makefile
-+++ b/package/network/utils/iw/Makefile
-@@ -12,10 +12,10 @@ PKG_VERSION:=4.3
- PKG_RELEASE:=1
-
- PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
--PKG_SOURCE_URL:=https://www.kernel.org/pub/software/network/iw
-+PKG_SOURCE_URL:=@KERNEL/software/network/iw
- PKG_MD5SUM:=7adec72e91ebdd9c55429fa34a23a6f5
-
--PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
-+PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
- PKG_LICENSE:=GPL-2.0
-
- include $(INCLUDE_DIR)/package.mk
-diff --git a/package/network/utils/iw/patches/001-nl80211_h_sync.patch b/package/network/utils/iw/patches/001-nl80211_h_sync.patch
-index 7de225859b71c2bb7627503b676aa7f2a122ccd9..e5ea8f7c8ad8eeb73f793ad6c536bb31d76d6868 100644
---- a/package/network/utils/iw/patches/001-nl80211_h_sync.patch
-+++ b/package/network/utils/iw/patches/001-nl80211_h_sync.patch
-@@ -8,7 +8,17 @@
- *
- * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
--@@ -328,7 +329,15 @@
-+@@ -321,14 +322,24 @@
-+ * @NL80211_CMD_GET_SCAN: get scan results
-+ * @NL80211_CMD_TRIGGER_SCAN: trigger a new scan with the given parameters
-+ * %NL80211_ATTR_TX_NO_CCK_RATE is used to decide whether to send the
-+- * probe requests at CCK rate or not.
-++ * probe requests at CCK rate or not. %NL80211_ATTR_MAC can be used to
-++ * specify a BSSID to scan for; if not included, the wildcard BSSID will
-++ * be used.
-+ * @NL80211_CMD_NEW_SCAN_RESULTS: scan notification (as a reply to
-+ * NL80211_CMD_GET_SCAN and on the "scan" multicast group)
-+ * @NL80211_CMD_SCAN_ABORTED: scan was aborted, for unspecified reasons,
- * partial scan results may be available
- *
- * @NL80211_CMD_START_SCHED_SCAN: start a scheduled scan at certain
-@@ -25,7 +35,82 @@
- * Like with normal scans, if SSIDs (%NL80211_ATTR_SCAN_SSIDS)
- * are passed, they are used in the probe requests. For
- * broadcast, a broadcast SSID must be passed (ie. an empty
--@@ -1761,6 +1770,22 @@ enum nl80211_commands {
-+@@ -418,7 +429,11 @@
-+ * @NL80211_CMD_ASSOCIATE: association request and notification; like
-+ * NL80211_CMD_AUTHENTICATE but for Association and Reassociation
-+ * (similar to MLME-ASSOCIATE.request, MLME-REASSOCIATE.request,
-+- * MLME-ASSOCIATE.confirm or MLME-REASSOCIATE.confirm primitives).
-++ * MLME-ASSOCIATE.confirm or MLME-REASSOCIATE.confirm primitives). The
-++ * %NL80211_ATTR_PREV_BSSID attribute is used to specify whether the
-++ * request is for the initial association to an ESS (that attribute not
-++ * included) or for reassociation within the ESS (that attribute is
-++ * included).
-+ * @NL80211_CMD_DEAUTHENTICATE: deauthentication request and notification; like
-+ * NL80211_CMD_AUTHENTICATE but for Deauthentication frames (similar to
-+ * MLME-DEAUTHENTICATION.request and MLME-DEAUTHENTICATE.indication
-+@@ -468,6 +483,9 @@
-+ * set of BSSID,frequency parameters is used (i.e., either the enforcing
-+ * %NL80211_ATTR_MAC,%NL80211_ATTR_WIPHY_FREQ or the less strict
-+ * %NL80211_ATTR_MAC_HINT and %NL80211_ATTR_WIPHY_FREQ_HINT).
-++ * %NL80211_ATTR_PREV_BSSID can be used to request a reassociation within
-++ * the ESS in case the device is already associated and an association with
-++ * a different BSS is desired.
-+ * Background scan period can optionally be
-+ * specified in %NL80211_ATTR_BG_SCAN_PERIOD,
-+ * if not specified default background scan configuration
-+@@ -811,6 +829,10 @@
-+ * as an event to indicate changes for devices with wiphy-specific regdom
-+ * management.
-+ *
-++ * @NL80211_CMD_ABORT_SCAN: Stop an ongoing scan. Returns -ENOENT if a scan is
-++ * not running. The driver indicates the status of the scan through
-++ * cfg80211_scan_done().
-++ *
-+ * @NL80211_CMD_MAX: highest used command number
-+ * @__NL80211_CMD_AFTER_LAST: internal use
-+ */
-+@@ -997,6 +1019,8 @@ enum nl80211_commands {
-+
-+ NL80211_CMD_WIPHY_REG_CHANGE,
-+
-++ NL80211_CMD_ABORT_SCAN,
-++
-+ /* add new commands above here */
-+
-+ /* used to define NL80211_CMD_MAX below */
-+@@ -1270,8 +1294,11 @@ enum nl80211_commands {
-+ * @NL80211_ATTR_RESP_IE: (Re)association response information elements as
-+ * sent by peer, for ROAM and successful CONNECT events.
-+ *
-+- * @NL80211_ATTR_PREV_BSSID: previous BSSID, to be used by in ASSOCIATE
-+- * commands to specify using a reassociate frame
-++ * @NL80211_ATTR_PREV_BSSID: previous BSSID, to be used in ASSOCIATE and CONNECT
-++ * commands to specify a request to reassociate within an ESS, i.e., to use
-++ * Reassociate Request frame (with the value of this attribute in the
-++ * Current AP address field) instead of Association Request frame which is
-++ * used for the initial association to an ESS.
-+ *
-+ * @NL80211_ATTR_KEY: key information in a nested attribute with
-+ * %NL80211_KEY_* sub-attributes
-+@@ -1712,6 +1739,8 @@ enum nl80211_commands {
-+ * underlying device supports these minimal RRM features:
-+ * %NL80211_FEATURE_DS_PARAM_SET_IE_IN_PROBES,
-+ * %NL80211_FEATURE_QUIET,
-++ * Or, if global RRM is supported, see:
-++ * %NL80211_EXT_FEATURE_RRM
-+ * If this flag is used, driver must add the Power Capabilities IE to the
-+ * association request. In addition, it must also set the RRM capability
-+ * flag in the association request's Capability Info field.
-+@@ -1755,12 +1784,44 @@ enum nl80211_commands {
-+ * over all channels.
-+ *
-+ * @NL80211_ATTR_SCHED_SCAN_DELAY: delay before the first cycle of a
-+- * scheduled scan (or a WoWLAN net-detect scan) is started, u32
-+- * in seconds.
-++ * scheduled scan is started. Or the delay before a WoWLAN
-++ * net-detect scan is started, counting from the moment the
-++ * system is suspended. This value is a u32, in seconds.
-+
- * @NL80211_ATTR_REG_INDOOR: flag attribute, if set indicates that the device
- * is operating in an indoor environment.
- *
-@@ -41,6 +126,21 @@
- + * thus it must not specify the number of iterations, only the interval
- + * between scans. The scan plans are executed sequentially.
- + * Each scan plan is a nested attribute of &enum nl80211_sched_scan_plan.
-++ * @NL80211_ATTR_PBSS: flag attribute. If set it means operate
-++ * in a PBSS. Specified in %NL80211_CMD_CONNECT to request
-++ * connecting to a PCP, and in %NL80211_CMD_START_AP to start
-++ * a PCP instead of AP. Relevant for DMG networks only.
-++ * @NL80211_ATTR_BSS_SELECT: nested attribute for driver supporting the
-++ * BSS selection feature. When used with %NL80211_CMD_GET_WIPHY it contains
-++ * attributes according &enum nl80211_bss_select_attr to indicate what
-++ * BSS selection behaviours are supported. When used with %NL80211_CMD_CONNECT
-++ * it contains the behaviour-specific attribute containing the parameters for
-++ * BSS selection to be done by driver and/or firmware.
-++ *
-++ * @NL80211_ATTR_STA_SUPPORT_P2P_PS: whether P2P PS mechanism supported
-++ * or not. u8, one of the values of &enum nl80211_sta_p2p_ps_status
-++ *
-++ * @NL80211_ATTR_PAD: attribute used for padding for 64-bit alignment
- + *
- + * @NL80211_ATTR_WIPHY_ANTENNA_GAIN: Configured antenna gain. Used to reduce
- + * transmit power to stay within regulatory limits. u32, dBi.
-@@ -48,7 +148,7 @@
- * @NUM_NL80211_ATTR: total number of nl80211_attrs available
- * @NL80211_ATTR_MAX: highest attribute number currently defined
- * @__NL80211_ATTR_AFTER_LAST: internal use
--@@ -2130,6 +2155,13 @@ enum nl80211_attrs {
-+@@ -2130,6 +2191,21 @@ enum nl80211_attrs {
-
- NL80211_ATTR_REG_INDOOR,
-
-@@ -57,30 +157,147 @@
- + NL80211_ATTR_MAX_SCAN_PLAN_ITERATIONS,
- + NL80211_ATTR_SCHED_SCAN_PLANS,
- +
-++ NL80211_ATTR_PBSS,
-++
-++ NL80211_ATTR_BSS_SELECT,
-++
-++ NL80211_ATTR_STA_SUPPORT_P2P_PS,
-++
-++ NL80211_ATTR_PAD,
-++
- + NL80211_ATTR_WIPHY_ANTENNA_GAIN,
- +
- /* add attributes here, update the policy in nl80211.c */
-
- __NL80211_ATTR_AFTER_LAST,
--@@ -3364,6 +3396,9 @@ enum nl80211_bss_scan_width {
-+@@ -2273,6 +2349,20 @@ enum nl80211_sta_flags {
-+ NL80211_STA_FLAG_MAX = __NL80211_STA_FLAG_AFTER_LAST - 1
-+ };
-+
-++/**
-++ * enum nl80211_sta_p2p_ps_status - station support of P2P PS
-++ *
-++ * @NL80211_P2P_PS_UNSUPPORTED: station doesn't support P2P PS mechanism
-++ * @@NL80211_P2P_PS_SUPPORTED: station supports P2P PS mechanism
-++ * @NUM_NL80211_P2P_PS_STATUS: number of values
-++ */
-++enum nl80211_sta_p2p_ps_status {
-++ NL80211_P2P_PS_UNSUPPORTED = 0,
-++ NL80211_P2P_PS_SUPPORTED,
-++
-++ NUM_NL80211_P2P_PS_STATUS,
-++};
-++
-+ #define NL80211_STA_FLAG_MAX_OLD_API NL80211_STA_FLAG_TDLS_PEER
-+
-+ /**
-+@@ -2430,6 +2520,9 @@ enum nl80211_sta_bss_param {
-+ * TID+1 and the special TID 16 (i.e. value 17) is used for non-QoS frames;
-+ * each one of those is again nested with &enum nl80211_tid_stats
-+ * attributes carrying the actual values.
-++ * @NL80211_STA_INFO_RX_DURATION: aggregate PPDU duration for all frames
-++ * received from the station (u64, usec)
-++ * @NL80211_STA_INFO_PAD: attribute used for padding for 64-bit alignment
-+ * @__NL80211_STA_INFO_AFTER_LAST: internal
-+ * @NL80211_STA_INFO_MAX: highest possible station info attribute
-+ */
-+@@ -2466,6 +2559,8 @@ enum nl80211_sta_info {
-+ NL80211_STA_INFO_BEACON_RX,
-+ NL80211_STA_INFO_BEACON_SIGNAL_AVG,
-+ NL80211_STA_INFO_TID_STATS,
-++ NL80211_STA_INFO_RX_DURATION,
-++ NL80211_STA_INFO_PAD,
-+
-+ /* keep last */
-+ __NL80211_STA_INFO_AFTER_LAST,
-+@@ -2482,6 +2577,7 @@ enum nl80211_sta_info {
-+ * transmitted MSDUs (not counting the first attempt; u64)
-+ * @NL80211_TID_STATS_TX_MSDU_FAILED: number of failed transmitted
-+ * MSDUs (u64)
-++ * @NL80211_TID_STATS_PAD: attribute used for padding for 64-bit alignment
-+ * @NUM_NL80211_TID_STATS: number of attributes here
-+ * @NL80211_TID_STATS_MAX: highest numbered attribute here
-+ */
-+@@ -2491,6 +2587,7 @@ enum nl80211_tid_stats {
-+ NL80211_TID_STATS_TX_MSDU,
-+ NL80211_TID_STATS_TX_MSDU_RETRIES,
-+ NL80211_TID_STATS_TX_MSDU_FAILED,
-++ NL80211_TID_STATS_PAD,
-+
-+ /* keep last */
-+ NUM_NL80211_TID_STATS,
-+@@ -2927,6 +3024,7 @@ enum nl80211_user_reg_hint_type {
-+ * transmitting data (on channel or globally)
-+ * @NL80211_SURVEY_INFO_TIME_SCAN: time the radio spent for scan
-+ * (on this channel or globally)
-++ * @NL80211_SURVEY_INFO_PAD: attribute used for padding for 64-bit alignment
-+ * @NL80211_SURVEY_INFO_MAX: highest survey info attribute number
-+ * currently defined
-+ * @__NL80211_SURVEY_INFO_AFTER_LAST: internal use
-+@@ -2942,6 +3040,7 @@ enum nl80211_survey_info {
-+ NL80211_SURVEY_INFO_TIME_RX,
-+ NL80211_SURVEY_INFO_TIME_TX,
-+ NL80211_SURVEY_INFO_TIME_SCAN,
-++ NL80211_SURVEY_INFO_PAD,
-+
-+ /* keep last */
-+ __NL80211_SURVEY_INFO_AFTER_LAST,
-+@@ -3364,6 +3463,10 @@ enum nl80211_bss_scan_width {
- * (not present if no beacon frame has been received yet)
- * @NL80211_BSS_PRESP_DATA: the data in @NL80211_BSS_INFORMATION_ELEMENTS and
- * @NL80211_BSS_TSF is known to be from a probe response (flag attribute)
- + * @NL80211_BSS_LAST_SEEN_BOOTTIME: CLOCK_BOOTTIME timestamp when this entry
- + * was last updated by a received frame. The value is expected to be
- + * accurate to about 10ms. (u64, nanoseconds)
-++ * @NL80211_BSS_PAD: attribute used for padding for 64-bit alignment
- * @__NL80211_BSS_AFTER_LAST: internal
- * @NL80211_BSS_MAX: highest BSS attribute
- */
--@@ -3383,6 +3418,7 @@ enum nl80211_bss {
-+@@ -3383,6 +3486,8 @@ enum nl80211_bss {
- NL80211_BSS_CHAN_WIDTH,
- NL80211_BSS_BEACON_TSF,
- NL80211_BSS_PRESP_DATA,
- + NL80211_BSS_LAST_SEEN_BOOTTIME,
-++ NL80211_BSS_PAD,
-
- /* keep last */
- __NL80211_BSS_AFTER_LAST,
--@@ -4589,4 +4625,28 @@ enum nl80211_tdls_peer_capability {
-+@@ -3568,11 +3673,15 @@ enum nl80211_txrate_gi {
-+ * @NL80211_BAND_2GHZ: 2.4 GHz ISM band
-+ * @NL80211_BAND_5GHZ: around 5 GHz band (4.9 - 5.7 GHz)
-+ * @NL80211_BAND_60GHZ: around 60 GHz band (58.32 - 64.80 GHz)
-++ * @NUM_NL80211_BANDS: number of bands, avoid using this in userspace
-++ * since newer kernel versions may support more bands
-+ */
-+ enum nl80211_band {
-+ NL80211_BAND_2GHZ,
-+ NL80211_BAND_5GHZ,
-+ NL80211_BAND_60GHZ,
-++
-++ NUM_NL80211_BANDS,
-+ };
-+
-+ /**
-+@@ -4358,12 +4467,18 @@ enum nl80211_feature_flags {
-+ /**
-+ * enum nl80211_ext_feature_index - bit index of extended features.
-+ * @NL80211_EXT_FEATURE_VHT_IBSS: This driver supports IBSS with VHT datarates.
-++ * @NL80211_EXT_FEATURE_RRM: This driver supports RRM. When featured, user can
-++ * can request to use RRM (see %NL80211_ATTR_USE_RRM) with
-++ * %NL80211_CMD_ASSOCIATE and %NL80211_CMD_CONNECT requests, which will set
-++ * the ASSOC_REQ_USE_RRM flag in the association request even if
-++ * NL80211_FEATURE_QUIET is not advertized.
-+ *
-+ * @NUM_NL80211_EXT_FEATURES: number of extended features.
-+ * @MAX_NL80211_EXT_FEATURES: highest extended feature index.
-+ */
-+ enum nl80211_ext_feature_index {
-+ NL80211_EXT_FEATURE_VHT_IBSS,
-++ NL80211_EXT_FEATURE_RRM,
-+
-+ /* add new features before the definition below */
-+ NUM_NL80211_EXT_FEATURES,
-+@@ -4589,4 +4704,72 @@ enum nl80211_tdls_peer_capability {
- NL80211_TDLS_PEER_WMM = 1<<2,
- };
-
-@@ -108,4 +325,48 @@
- + __NL80211_SCHED_SCAN_PLAN_AFTER_LAST - 1
- +};
- +
-++/**
-++ * struct nl80211_bss_select_rssi_adjust - RSSI adjustment parameters.
-++ *
-++ * @band: band of BSS that must match for RSSI value adjustment.
-++ * @delta: value used to adjust the RSSI value of matching BSS.
-++ */
-++struct nl80211_bss_select_rssi_adjust {
-++ __u8 band;
-++ __s8 delta;
-++} __attribute__((packed));
-++
-++/**
-++ * enum nl80211_bss_select_attr - attributes for bss selection.
-++ *
-++ * @__NL80211_BSS_SELECT_ATTR_INVALID: reserved.
-++ * @NL80211_BSS_SELECT_ATTR_RSSI: Flag indicating only RSSI-based BSS selection
-++ * is requested.
-++ * @NL80211_BSS_SELECT_ATTR_BAND_PREF: attribute indicating BSS
-++ * selection should be done such that the specified band is preferred.
-++ * When there are multiple BSS-es in the preferred band, the driver
-++ * shall use RSSI-based BSS selection as a second step. The value of
-++ * this attribute is according to &enum nl80211_band (u32).
-++ * @NL80211_BSS_SELECT_ATTR_RSSI_ADJUST: When present the RSSI level for
-++ * BSS-es in the specified band is to be adjusted before doing
-++ * RSSI-based BSS selection. The attribute value is a packed structure
-++ * value as specified by &struct nl80211_bss_select_rssi_adjust.
-++ * @NL80211_BSS_SELECT_ATTR_MAX: highest bss select attribute number.
-++ * @__NL80211_BSS_SELECT_ATTR_AFTER_LAST: internal use.
-++ *
-++ * One and only one of these attributes are found within %NL80211_ATTR_BSS_SELECT
-++ * for %NL80211_CMD_CONNECT. It specifies the required BSS selection behaviour
-++ * which the driver shall use.
-++ */
-++enum nl80211_bss_select_attr {
-++ __NL80211_BSS_SELECT_ATTR_INVALID,
-++ NL80211_BSS_SELECT_ATTR_RSSI,
-++ NL80211_BSS_SELECT_ATTR_BAND_PREF,
-++ NL80211_BSS_SELECT_ATTR_RSSI_ADJUST,
-++
-++ /* keep last */
-++ __NL80211_BSS_SELECT_ATTR_AFTER_LAST,
-++ NL80211_BSS_SELECT_ATTR_MAX = __NL80211_BSS_SELECT_ATTR_AFTER_LAST - 1
-++};
-++
- #endif /* __LINUX_NL80211_H */
-diff --git a/package/network/utils/iw/patches/300-display_interface_TX_power.patch b/package/network/utils/iw/patches/300-display_interface_TX_power.patch
-index 574c490318d03d09f6c6762be892b0814718dbbe..2cdf360cc57a512680e7f9f0b2450055c2c81d35 100644
---- a/package/network/utils/iw/patches/300-display_interface_TX_power.patch
-+++ b/package/network/utils/iw/patches/300-display_interface_TX_power.patch
-@@ -12,11 +12,9 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
- interface.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
--diff --git a/interface.c b/interface.c
--index 73ccecd..4f0821d 100644
- --- a/interface.c
- +++ b/interface.c
--@@ -368,6 +368,13 @@ static int print_iface_handler(struct nl_msg *msg, void *arg)
-+@@ -368,6 +368,13 @@ static int print_iface_handler(struct nl
- printf("\n");
- }
-
-diff --git a/package/network/utils/iw/patches/301-ibss_add_VHT80.patch b/package/network/utils/iw/patches/301-ibss_add_VHT80.patch
-index 709fbb29146b3fe80f7af240d04dec8f5e96795a..0627bccb468cd31f8357a4b0fe3f3bee879230c6 100644
---- a/package/network/utils/iw/patches/301-ibss_add_VHT80.patch
-+++ b/package/network/utils/iw/patches/301-ibss_add_VHT80.patch
-@@ -14,8 +14,6 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
- ibss.c | 49 +++++++++++++++++++++++++++++++++++++++++--------
- 1 file changed, 41 insertions(+), 8 deletions(-)
-
--diff --git a/ibss.c b/ibss.c
--index 7a0b707..a99a262 100644
- --- a/ibss.c
- +++ b/ibss.c
- @@ -16,6 +16,39 @@
-@@ -58,7 +56,7 @@ index 7a0b707..a99a262 100644
- static int join_ibss(struct nl80211_state *state,
- struct nl_msg *msg,
- int argc, char **argv,
--@@ -30,12 +63,8 @@ static int join_ibss(struct nl80211_state *state,
-+@@ -30,12 +63,8 @@ static int join_ibss(struct nl80211_stat
- int bintval;
- int i;
- unsigned long freq;
-@@ -73,7 +71,7 @@ index 7a0b707..a99a262 100644
- { .name = "HT20",
- .width = NL80211_CHAN_WIDTH_20,
- .freq1_diff = 0,
--@@ -60,6 +89,10 @@ static int join_ibss(struct nl80211_state *state,
-+@@ -60,6 +89,10 @@ static int join_ibss(struct nl80211_stat
- .width = NL80211_CHAN_WIDTH_10,
- .freq1_diff = 0,
- .chantype = -1 },
-@@ -84,7 +82,7 @@ index 7a0b707..a99a262 100644
- };
-
- if (argc < 2)
--@@ -90,7 +123,7 @@ static int join_ibss(struct nl80211_state *state,
-+@@ -90,7 +123,7 @@ static int join_ibss(struct nl80211_stat
- NLA_PUT_U32(msg, NL80211_ATTR_CHANNEL_WIDTH,
- chanmode_selected->width);
- NLA_PUT_U32(msg, NL80211_ATTR_CENTER_FREQ1,
-diff --git a/package/network/utils/iw/patches/302-ibss_use_MHz_instead_MHZ.patch b/package/network/utils/iw/patches/302-ibss_use_MHz_instead_MHZ.patch
-index fc4442792d4e55d14cfd85823202755b3c4678c0..f96d5eafdac4942f5e418dfba15242c83659d572 100644
---- a/package/network/utils/iw/patches/302-ibss_use_MHz_instead_MHZ.patch
-+++ b/package/network/utils/iw/patches/302-ibss_use_MHz_instead_MHZ.patch
-@@ -7,11 +7,9 @@ Signed-off-by: Johannes Berg <johannes.berg@intel.com>
- ibss.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
--diff --git a/ibss.c b/ibss.c
--index a99a262..23bda70 100644
- --- a/ibss.c
- +++ b/ibss.c
--@@ -81,15 +81,15 @@ static int join_ibss(struct nl80211_state *state,
-+@@ -81,15 +81,15 @@ static int join_ibss(struct nl80211_stat
- .width = NL80211_CHAN_WIDTH_20_NOHT,
- .freq1_diff = 0,
- .chantype = NL80211_CHAN_NO_HT },
-diff --git a/package/network/utils/iw/patches/303-mesh_add_VHT80.patch b/package/network/utils/iw/patches/303-mesh_add_VHT80.patch
-index fe8dc21a19db12b056efcaa79b30987d0c1f8e10..956b0505e662b29c24cbdf18c17b1d5c6ed106f8 100644
---- a/package/network/utils/iw/patches/303-mesh_add_VHT80.patch
-+++ b/package/network/utils/iw/patches/303-mesh_add_VHT80.patch
-@@ -15,8 +15,6 @@ Signed-off-by: Sven Eckelmann <sven@open-mesh.com>
- util.c | 26 ++++++++++++++++++++++++++
- 4 files changed, 43 insertions(+), 41 deletions(-)
-
--diff --git a/ibss.c b/ibss.c
--index 23bda70..ac06fc5 100644
- --- a/ibss.c
- +++ b/ibss.c
- @@ -16,39 +16,6 @@
-@@ -59,8 +57,6 @@ index 23bda70..ac06fc5 100644
- static int join_ibss(struct nl80211_state *state,
- struct nl_msg *msg,
- int argc, char **argv,
--diff --git a/iw.h b/iw.h
--index cef9da8..8e1a37a 100644
- --- a/iw.h
- +++ b/iw.h
- @@ -59,6 +59,13 @@ struct cmd {
-@@ -77,7 +73,7 @@ index cef9da8..8e1a37a 100644
- #define ARRAY_SIZE(ar) (sizeof(ar)/sizeof(ar[0]))
- #define DIV_ROUND_UP(x, y) (((x) + (y - 1)) / (y))
-
--@@ -174,6 +181,8 @@ void print_ies(unsigned char *ie, int ielen, bool unknown,
-+@@ -174,6 +181,8 @@ void print_ies(unsigned char *ie, int ie
- void parse_bitrate(struct nlattr *bitrate_attr, char *buf, int buflen);
- void iw_hexdump(const char *prefix, const __u8 *data, size_t len);
-
-@@ -86,11 +82,9 @@ index cef9da8..8e1a37a 100644
- #define SCHED_SCAN_OPTIONS "interval <in_msecs> [delay <in_secs>] " \
- "[freqs <freq>+] [matches [ssid <ssid>]+]] [active [ssid <ssid>]+|passive] [randomise[=<addr>/<mask>]]"
- int parse_sched_scan(struct nl_msg *msg, int *argc, char ***argv);
--diff --git a/mesh.c b/mesh.c
--index 0090530..930d58f 100644
- --- a/mesh.c
- +++ b/mesh.c
--@@ -439,12 +439,8 @@ static int join_mesh(struct nl80211_state *state,
-+@@ -439,12 +439,8 @@ static int join_mesh(struct nl80211_stat
- int bintval, dtim_period, i, n_rates = 0;
- char *end, *value = NULL, *sptr = NULL;
- unsigned long freq = 0;
-@@ -105,7 +99,7 @@ index 0090530..930d58f 100644
- { .name = "HT20",
- .width = NL80211_CHAN_WIDTH_20,
- .freq1_diff = 0,
--@@ -461,6 +457,10 @@ static int join_mesh(struct nl80211_state *state,
-+@@ -461,6 +457,10 @@ static int join_mesh(struct nl80211_stat
- .width = NL80211_CHAN_WIDTH_20_NOHT,
- .freq1_diff = 0,
- .chantype = NL80211_CHAN_NO_HT },
-@@ -116,7 +110,7 @@ index 0090530..930d58f 100644
- };
-
- if (argc < 1)
--@@ -497,7 +497,7 @@ static int join_mesh(struct nl80211_state *state,
-+@@ -497,7 +497,7 @@ static int join_mesh(struct nl80211_stat
- NLA_PUT_U32(msg, NL80211_ATTR_CHANNEL_WIDTH,
- chanmode_selected->width);
- NLA_PUT_U32(msg, NL80211_ATTR_CENTER_FREQ1,
-@@ -125,7 +119,7 @@ index 0090530..930d58f 100644
- if (chanmode_selected->chantype != -1)
- NLA_PUT_U32(msg,
- NL80211_ATTR_WIPHY_CHANNEL_TYPE,
--@@ -599,7 +599,7 @@ static int join_mesh(struct nl80211_state *state,
-+@@ -599,7 +599,7 @@ static int join_mesh(struct nl80211_stat
- nla_put_failure:
- return -ENOBUFS;
- }
-@@ -134,11 +128,9 @@ index 0090530..930d58f 100644
- " [basic-rates <rate in Mbps,rate2,...>]], [mcast-rate <rate in Mbps>]"
- " [beacon-interval <time in TUs>] [dtim-period <value>]"
- " [vendor_sync on|off] [<param>=<value>]*",
--diff --git a/util.c b/util.c
--index 4efc4c8..d75ffe0 100644
- --- a/util.c
- +++ b/util.c
--@@ -728,3 +728,29 @@ void iw_hexdump(const char *prefix, const __u8 *buf, size_t size)
-+@@ -728,3 +728,29 @@ void iw_hexdump(const char *prefix, cons
- }
- printf("\n\n");
- }
-diff --git a/target/linux/ar71xx/files/arch/mips/ath79/dev-ap9x-pci.c b/target/linux/ar71xx/files/arch/mips/ath79/dev-ap9x-pci.c
-index d382453b1918502240738b33c10cb08b113c7026..20bb06e4867a78aae60485d0c6c7a38e82c2997c 100644
---- a/target/linux/ar71xx/files/arch/mips/ath79/dev-ap9x-pci.c
-+++ b/target/linux/ar71xx/files/arch/mips/ath79/dev-ap9x-pci.c
-@@ -39,6 +39,18 @@ __init void ap9x_pci_setup_wmac_led_pin(unsigned wmac, int pin)
- }
- }
-
-+__init void ap9x_pci_setup_wmac_led_name(unsigned wmac, const char *led_name)
-+{
-+ switch (wmac) {
-+ case 0:
-+ ap9x_wmac0_data.led_name = led_name;
-+ break;
-+ case 1:
-+ ap9x_wmac1_data.led_name = led_name;
-+ break;
-+ }
-+}
-+
- __init struct ath9k_platform_data *ap9x_pci_get_wmac_data(unsigned wmac)
- {
- switch (wmac) {
-@@ -81,6 +93,20 @@ __init void ap9x_pci_setup_wmac_leds(unsigned wmac, struct gpio_led *leds,
- }
- }
-
-+__init void ap9x_pci_setup_wmac_btns(unsigned wmac,
-+ struct gpio_keys_button *btns,
-+ unsigned num_btns, unsigned poll_interval)
-+{
-+ struct ath9k_platform_data *ap9x_wmac_data;
-+
-+ if (!(ap9x_wmac_data = ap9x_pci_get_wmac_data(wmac)))
-+ return;
-+
-+ ap9x_wmac_data->btns = btns;
-+ ap9x_wmac_data->num_btns = num_btns;
-+ ap9x_wmac_data->btn_poll_interval = poll_interval;
-+}
-+
- static int ap91_pci_plat_dev_init(struct pci_dev *dev)
- {
- switch (PCI_SLOT(dev->devfn)) {
-diff --git a/target/linux/ar71xx/files/arch/mips/ath79/dev-ap9x-pci.h b/target/linux/ar71xx/files/arch/mips/ath79/dev-ap9x-pci.h
-index ad288cbdf90e1a93f914ee7c4d5edbc10a2dbdd1..d7c018565ea9248fd69cd9ec37083c4d5887a6ca 100644
---- a/target/linux/ar71xx/files/arch/mips/ath79/dev-ap9x-pci.h
-+++ b/target/linux/ar71xx/files/arch/mips/ath79/dev-ap9x-pci.h
-@@ -12,6 +12,7 @@
- #define _ATH79_DEV_AP9X_PCI_H
-
- struct gpio_led;
-+struct gpio_keys_button;
- struct ath9k_platform_data;
-
- #if defined(CONFIG_ATH79_DEV_AP9X_PCI)
-@@ -19,6 +20,9 @@ void ap9x_pci_setup_wmac_led_pin(unsigned wmac, int pin);
- void ap9x_pci_setup_wmac_gpio(unsigned wmac, u32 mask, u32 val);
- void ap9x_pci_setup_wmac_leds(unsigned wmac, struct gpio_led *leds,
- int num_leds);
-+void ap9x_pci_setup_wmac_led_name(unsigned wmac, const char *led_name);
-+void ap9x_pci_setup_wmac_btns(unsigned wmac, struct gpio_keys_button *btns,
-+ unsigned num_btns, unsigned poll_interval);
- struct ath9k_platform_data *ap9x_pci_get_wmac_data(unsigned wmac);
-
- void ap91_pci_init(u8 *cal_data, u8 *mac_addr);
-@@ -33,6 +37,12 @@ static inline void ap9x_pci_setup_wmac_gpio(unsigned wmac,
- static inline void ap9x_pci_setup_wmac_leds(unsigned wmac,
- struct gpio_led *leds,
- int num_leds) {}
-+static inline void ap9x_pci_setup_wmac_led_name(unsigned wmac,
-+ const char *led_name) {}
-+static inline void ap9x_pci_setup_wmac_btns(unsigned wmac,
-+ struct gpio_keys_button *btns,
-+ unsigned num_btns,
-+ unsigned poll_interval) {}
- static inline struct ath9k_platform_data *ap9x_pci_get_wmac_data(unsigned wmac)
- {
- return NULL;
-diff --git a/target/linux/generic/files/include/linux/ath9k_platform.h b/target/linux/generic/files/include/linux/ath9k_platform.h
-index 30ce2165cb4fbd8513ef045930f6a4a5dbb59a3a..2c19f3b494582144806e175783efbc2e124ca873 100644
---- a/target/linux/generic/files/include/linux/ath9k_platform.h
-+++ b/target/linux/generic/files/include/linux/ath9k_platform.h
-@@ -31,6 +31,10 @@ struct ath9k_platform_data {
- u32 gpio_mask;
- u32 gpio_val;
-
-+ u32 bt_active_pin;
-+ u32 bt_priority_pin;
-+ u32 wlan_active_pin;
-+
- bool endian_check;
- bool is_clk_25mhz;
- bool tx_gain_buffalo;
-@@ -45,6 +49,11 @@ struct ath9k_platform_data {
-
- int num_leds;
- const struct gpio_led *leds;
-+ const char *led_name;
-+
-+ unsigned num_btns;
-+ const struct gpio_keys_button *btns;
-+ unsigned btn_poll_interval;
- };
-
- #endif /* _LINUX_ATH9K_PLATFORM_H */
diff --git a/patches/openwrt/0008-iwinfo-update-NanoStation-Loco-txpower-offsets.patch b/patches/openwrt/0008-iwinfo-update-NanoStation-Loco-txpower-offsets.patch
deleted file mode 100644
index 31275cc2c2127378657b199c02883431984d151a..0000000000000000000000000000000000000000
--- a/patches/openwrt/0008-iwinfo-update-NanoStation-Loco-txpower-offsets.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Wed, 20 May 2015 23:15:20 +0200
-Subject: iwinfo: update NanoStation (Loco) txpower offsets
-
-diff --git a/package/network/utils/iwinfo/patches/001-update_nanostation_offsets.patch b/package/network/utils/iwinfo/patches/001-update_nanostation_offsets.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..1e13570fc2b585a8e33275116370f5438c899633
---- /dev/null
-+++ b/package/network/utils/iwinfo/patches/001-update_nanostation_offsets.patch
-@@ -0,0 +1,14 @@
-+--- a/hardware.txt
-++++ b/hardware.txt
-+@@ -42,8 +42,9 @@
-+ 0x168c 0x0027 0x0777 0x4082 7 0 "Ubiquiti" "SR71"
-+ 0x168c 0x0029 0x0777 0x4005 7 0 "Ubiquiti" "SR71-15"
-+ 0x168c 0x002a 0x0777 0xe302 12 0 "Ubiquiti" "PicoStation M2" /* ToDo: confirm offset */
-+-0x168c 0x002a 0x0777 0xe012 12 0 "Ubiquiti" "NanoStation M2" /* ToDo: confirm offset */
-+-0x168c 0x002a 0x0777 0xe005 5 0 "Ubiquiti" "NanoStation M5" /* ToDo: confirm offset */
-++0x168c 0x002a 0x0777 0xe012 11 0 "Ubiquiti" "NanoStation M2"
-++0x168c 0x002e 0x0777 0xe0a2 8 0 "Ubiquiti" "NanoStation Loco M2"
-++0x168c 0x002a 0x0777 0xe005 16 0 "Ubiquiti" "NanoStation M5"
-+ 0x168c 0x002a 0x0777 0xe202 12 0 "Ubiquiti" "Bullet M2"
-+ 0x168c 0x002a 0x0777 0xe805 5 0 "Ubiquiti" "Bullet M5"
-+ 0x168c 0x002a 0x0777 0xe345 0 0 "Ubiquiti" "WispStation M5" /* ToDo: confirm offset */
diff --git a/patches/openwrt/0010-ipv6-fix-crash-on-ICMPv6-redirects-with-prohibited-blackholed-source.patch b/patches/openwrt/0010-ipv6-fix-crash-on-ICMPv6-redirects-with-prohibited-blackholed-source.patch
deleted file mode 100644
index c9ba80f94606c5446ce9705892614f931eaf8d5e..0000000000000000000000000000000000000000
--- a/patches/openwrt/0010-ipv6-fix-crash-on-ICMPv6-redirects-with-prohibited-blackholed-source.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Mon, 2 Nov 2015 02:02:02 +0100
-Subject: ipv6: fix crash on ICMPv6 redirects with prohibited/blackholed source
-
-There are other error values besides ip6_null_entry that can be returned by
-ip6_route_redirect(): fib6_rule_action() can also result in
-ip6_blk_hole_entry and ip6_prohibit_entry if such ip rules are installed.
-
-Only checking for ip6_null_entry in rt6_do_redirect() causes ip6_ins_rt()
-to be called with rt->rt6i_table == NULL in these cases, making the kernel
-crash.
-
-diff --git a/target/linux/generic/patches-3.18/672-ipv6-fix-crash-on-ICMPv6-redirects-with-prohibited-blackholed-source.patch b/target/linux/generic/patches-3.18/672-ipv6-fix-crash-on-ICMPv6-redirects-with-prohibited-blackholed-source.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..6e4b3da3ad820e789f57df71b33ccfc5eaead01e
---- /dev/null
-+++ b/target/linux/generic/patches-3.18/672-ipv6-fix-crash-on-ICMPv6-redirects-with-prohibited-blackholed-source.patch
-@@ -0,0 +1,39 @@
-+From 7426eb388ade0f1ad800c408d7efa227d4f41408 Mon Sep 17 00:00:00 2001
-+Message-Id: <7426eb388ade0f1ad800c408d7efa227d4f41408.1446425986.git.mschiffer@universe-factory.net>
-+From: Matthias Schiffer <mschiffer@universe-factory.net>
-+Date: Mon, 2 Nov 2015 01:05:15 +0100
-+Subject: [PATCH] ipv6: fix crash on ICMPv6 redirects with
-+ prohibited/blackholed source
-+
-+There are other error values besides ip6_null_entry that can be returned by
-+ip6_route_redirect(): fib6_rule_action() can also result in
-+ip6_blk_hole_entry and ip6_prohibit_entry if such ip rules are installed.
-+
-+Only checking for ip6_null_entry in rt6_do_redirect() causes ip6_ins_rt()
-+to be called with rt->rt6i_table == NULL in these cases, making the kernel
-+crash.
-+
-+Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-+---
-+ net/ipv6/route.c | 3 +--
-+ 1 file changed, 1 insertion(+), 2 deletions(-)
-+
-+--- a/net/ipv6/route.c
-++++ b/net/ipv6/route.c
-+@@ -1766,7 +1766,6 @@ static int ip6_route_del(struct fib6_con
-+
-+ static void rt6_do_redirect(struct dst_entry *dst, struct sock *sk, struct sk_buff *skb)
-+ {
-+- struct net *net = dev_net(skb->dev);
-+ struct netevent_redirect netevent;
-+ struct rt6_info *rt, *nrt = NULL;
-+ struct ndisc_options ndopts;
-+@@ -1827,7 +1826,7 @@ static void rt6_do_redirect(struct dst_e
-+ }
-+
-+ rt = (struct rt6_info *) dst;
-+- if (rt == net->ipv6.ip6_null_entry) {
-++ if (rt->rt6i_flags & RTF_REJECT) {
-+ net_dbg_ratelimited("rt6_redirect: source isn't a valid nexthop for redirect target\n");
-+ return;
-+ }
diff --git a/patches/openwrt/0011-lua-fix-installation-of-headers-for-host-build.patch b/patches/openwrt/0011-lua-fix-installation-of-headers-for-host-build.patch
deleted file mode 100644
index c0045af3a314fcf40dadbca14a791b870f9bcb6f..0000000000000000000000000000000000000000
--- a/patches/openwrt/0011-lua-fix-installation-of-headers-for-host-build.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Tue, 29 Dec 2015 22:48:52 +0100
-Subject: lua: fix installation of headers for host build
-
-diff --git a/package/utils/lua/Makefile b/package/utils/lua/Makefile
-index 72d56316b45dc484888d219aebd98e651edbe415..c37d99b485d58d955b86a033ea776adb54cfa414 100644
---- a/package/utils/lua/Makefile
-+++ b/package/utils/lua/Makefile
-@@ -140,6 +140,7 @@ define Host/Install
- $(MAKE) -C $(HOST_BUILD_DIR) \
- INSTALL_TOP="$(STAGING_DIR_HOST)" \
- install
-+ $(CP) $(HOST_BUILD_DIR)/src/lnum_config.h $(STAGING_DIR_HOST)/include/
- endef
-
- define Build/InstallDev
diff --git a/patches/openwrt/0012-kernel-fs-seq_file-fallback-to-vmalloc-instead-of-oom-kill-processes.patch b/patches/openwrt/0012-kernel-fs-seq_file-fallback-to-vmalloc-instead-of-oom-kill-processes.patch
deleted file mode 100644
index b63972569930884e3ac2e180b018765142843a22..0000000000000000000000000000000000000000
--- a/patches/openwrt/0012-kernel-fs-seq_file-fallback-to-vmalloc-instead-of-oom-kill-processes.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Mon, 4 Jan 2016 10:22:52 +0100
-Subject: kernel: fs, seq_file: fallback to vmalloc instead of oom kill processes
-
-diff --git a/target/linux/generic/patches-3.18/089-fs-seq_file-fallback-to-vmalloc-instead-of-oom-kill-.patch b/target/linux/generic/patches-3.18/089-fs-seq_file-fallback-to-vmalloc-instead-of-oom-kill-.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..cad56f4275287b73dd5e769ea34daee064ee8d69
---- /dev/null
-+++ b/target/linux/generic/patches-3.18/089-fs-seq_file-fallback-to-vmalloc-instead-of-oom-kill-.patch
-@@ -0,0 +1,53 @@
-+From 5cec38ac866bfb8775638e71a86e4d8cac30caae Mon Sep 17 00:00:00 2001
-+Message-Id: <5cec38ac866bfb8775638e71a86e4d8cac30caae.1451899087.git.mschiffer@universe-factory.net>
-+From: David Rientjes <rientjes@google.com>
-+Date: Fri, 12 Dec 2014 16:56:16 -0800
-+Subject: [PATCH] fs, seq_file: fallback to vmalloc instead of oom kill
-+ processes
-+
-+Since commit 058504edd026 ("fs/seq_file: fallback to vmalloc allocation"),
-+seq_buf_alloc() falls back to vmalloc() when the kmalloc() for contiguous
-+memory fails. This was done to address order-4 slab allocations for
-+reading /proc/stat on large machines and noticed because
-+PAGE_ALLOC_COSTLY_ORDER < 4, so there is no infinite loop in the page
-+allocator when allocating new slab for such high-order allocations.
-+
-+Contiguous memory isn't necessary for caller of seq_buf_alloc(), however.
-+Other GFP_KERNEL high-order allocations that are <=
-+PAGE_ALLOC_COSTLY_ORDER will simply loop forever in the page allocator and
-+oom kill processes as a result.
-+
-+We don't want to kill processes so that we can allocate contiguous memory
-+in situations when contiguous memory isn't necessary.
-+
-+This patch does the kmalloc() allocation with __GFP_NORETRY for high-order
-+allocations. This still utilizes memory compaction and direct reclaim in
-+the allocation path, the only difference is that it will fail immediately
-+instead of oom kill processes when out of memory.
-+
-+[akpm@linux-foundation.org: add comment]
-+Signed-off-by: David Rientjes <rientjes@google.com>
-+Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
-+Cc: Christoph Hellwig <hch@infradead.org>
-+Cc: Al Viro <viro@zeniv.linux.org.uk>
-+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-+---
-+ fs/seq_file.c | 6 +++++-
-+ 1 file changed, 5 insertions(+), 1 deletion(-)
-+
-+--- a/fs/seq_file.c
-++++ b/fs/seq_file.c
-+@@ -36,7 +36,11 @@ static void *seq_buf_alloc(unsigned long
-+ {
-+ void *buf;
-+
-+- buf = kmalloc(size, GFP_KERNEL | __GFP_NOWARN);
-++ /*
-++ * __GFP_NORETRY to avoid oom-killings with high-order allocations -
-++ * it's better to fall back to vmalloc() than to kill things.
-++ */
-++ buf = kmalloc(size, GFP_KERNEL | __GFP_NORETRY | __GFP_NOWARN);
-+ if (!buf && size > PAGE_SIZE)
-+ buf = vmalloc(size);
-+ return buf;
diff --git a/patches/openwrt/0013-fix-UBNT-XM-model-detection.patch b/patches/openwrt/0013-fix-UBNT-XM-model-detection.patch
deleted file mode 100644
index 65f5ef3e26b05d3ba0904cf50ef7804905f34d27..0000000000000000000000000000000000000000
--- a/patches/openwrt/0013-fix-UBNT-XM-model-detection.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From: Neal Oakey <neal.oakey@bingo-ev.de>
-Date: Sun, 14 Feb 2016 20:58:20 +0100
-Subject: fix UBNT XM model detection
-
-Signed-off-by: Neal Oakey <neal.oakey@bingo-ev.de>
-
-diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
-index a9dca58847fe1fb62a69c5845fda3206407c6727..0aa1c865cbdeb0624147d4117d289a640d20a5ef 100755
---- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
-+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
-@@ -64,6 +64,40 @@ wndr3700_board_detect() {
- AR71XX_MODEL="$machine"
- }
-
-+ubnt_get_mtd_part_magic() {
-+ ar71xx_get_mtd_offset_size_format EEPROM 4118 2 %02x
-+}
-+
-+ubnt_xm_board_detect() {
-+ local model
-+ local magic
-+
-+ magic="$(ubnt_get_mtd_part_magic)"
-+ case ${magic:0:3} in
-+ "e00"|\
-+ "e01"|\
-+ "e80")
-+ model="Ubiquiti NanoStation M"
-+ ;;
-+ "e0a")
-+ model="Ubiquiti NanoStation loco M"
-+ ;;
-+ "e1b"|\
-+ "e1d")
-+ model="Ubiquiti Rocket M"
-+ ;;
-+ "e20"|\
-+ "e2d")
-+ model="Ubiquiti Bullet M"
-+ ;;
-+ "e30")
-+ model="Ubiquiti PicoStation M"
-+ ;;
-+ esac
-+
-+ [ ! -z "$model" ] && AR71XX_MODEL="${model}${magic:3:1}"
-+}
-+
- cybertan_get_hw_magic() {
- local part
-
-@@ -478,12 +512,14 @@ ar71xx_board_detect() {
- ;;
- *"Bullet M")
- name="bullet-m"
-+ ubnt_xm_board_detect
- ;;
- *"Loco M XW")
- name="loco-m-xw"
- ;;
- *"Nanostation M")
- name="nanostation-m"
-+ ubnt_xm_board_detect
- ;;
- *"Nanostation M XW")
- name="nanostation-m-xw"
-@@ -685,6 +721,7 @@ ar71xx_board_detect() {
- ;;
- *"Rocket M")
- name="rocket-m"
-+ ubnt_xm_board_detect
- ;;
- *"Rocket M XW")
- name="rocket-m-xw"
diff --git a/patches/openwrt/0014-base-files-implemented-basic-GPIO-control.patch b/patches/openwrt/0014-base-files-implemented-basic-GPIO-control.patch
deleted file mode 100644
index c67eb8242124e38cb7eee3d9a88950ec409573b2..0000000000000000000000000000000000000000
--- a/patches/openwrt/0014-base-files-implemented-basic-GPIO-control.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Mon, 7 Mar 2016 06:07:21 +0100
-Subject: base-files: implemented basic GPIO control
-
-Internal GPIO pins are used for PoE passthrough setups in multi-port
-routers. This patch implemnets control over this hardware feature for
-Ubiquiti Nanostations and TP-Link CPE510.
-
-Signed-off-by: Lars Kruse <lists@sumpfralle.de>
-
-Backport of r46271
-
-diff --git a/package/base-files/files/etc/init.d/gpio_switch b/package/base-files/files/etc/init.d/gpio_switch
-new file mode 100755
-index 0000000000000000000000000000000000000000..1f1b44b2129ce2315943f6a10508eefb66412c48
---- /dev/null
-+++ b/package/base-files/files/etc/init.d/gpio_switch
-@@ -0,0 +1,42 @@
-+#!/bin/sh /etc/rc.common
-+# Copyright (C) 2015 OpenWrt.org
-+
-+START=98
-+STOP=10
-+USE_PROCD=1
-+
-+
-+load_gpio_switch()
-+{
-+ local name
-+ local gpio_pin
-+ local value
-+
-+ config_get gpio_pin "$1" gpio_pin
-+ config_get name "$1" name
-+ config_get value "$1" value 0
-+
-+ local gpio_path="/sys/class/gpio/gpio${gpio_pin}"
-+ # export GPIO pin for access
-+ [ -d "$gpio_path" ] || {
-+ echo "$gpio_pin" >/sys/class/gpio/export
-+ # we need to wait a bit until the GPIO appears
-+ [ -d "$gpio_path" ] || sleep 1
-+ echo out >"$gpio_path/direction"
-+ }
-+ # write 0 or 1 to the "value" field
-+ { [ "$value" = "0" ] && echo "0" || echo "1"; } >"$gpio_path/value"
-+}
-+
-+service_triggers()
-+{
-+ procd_add_reload_trigger "system"
-+}
-+
-+start_service()
-+{
-+ [ -e /sys/class/gpio/ ] && {
-+ config_load system
-+ config_foreach load_gpio_switch gpio_switch
-+ }
-+}
-diff --git a/package/base-files/files/lib/functions/uci-defaults.sh b/package/base-files/files/lib/functions/uci-defaults.sh
-index 5a8809d68c89ac0431919f15dad5f5c33351bbf2..6577ecdcde0c856b3e6dd1b9337f23cb782ef2be 100644
---- a/package/base-files/files/lib/functions/uci-defaults.sh
-+++ b/package/base-files/files/lib/functions/uci-defaults.sh
-@@ -2,6 +2,7 @@
- # Copyright (C) 2011 OpenWrt.org
-
- UCIDEF_LEDS_CHANGED=0
-+UCIDEF_GPIO_SWITCHES_CHANGED=0
-
- ucidef_set_led_netdev() {
- local cfg="led_$1"
-@@ -180,6 +181,29 @@ ucidef_commit_leds()
- [ "$UCIDEF_LEDS_CHANGED" = "1" ] && uci commit system
- }
-
-+ucidef_set_gpio_switch() {
-+ local cfg="gpio_switch_$1"
-+ local name="$2"
-+ local gpio_pin="$3"
-+ # use "0" as default value
-+ local default="${4:-0}"
-+
-+ uci -q get "system.$cfg" && return 0
-+
-+ uci batch <<EOF
-+set system.$cfg='gpio_switch'
-+set system.$cfg.name='$name'
-+set system.$cfg.gpio_pin='$gpio_pin'
-+set system.$cfg.value='$default'
-+EOF
-+ UCIDEF_GPIO_SWITCHES_CHANGED=1
-+}
-+
-+ucidef_commit_gpio_switches()
-+{
-+ [ "$UCIDEF_GPIO_SWITCHES_CHANGED" = "1" ] && uci commit system
-+}
-+
- ucidef_set_interface_loopback() {
- uci batch <<EOF
- set network.loopback='interface'
-diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/01_gpio-switches b/target/linux/ar71xx/base-files/etc/uci-defaults/01_gpio-switches
-new file mode 100644
-index 0000000000000000000000000000000000000000..81d3982ed8bf98e01ce2e161017f088a1d0f60dc
---- /dev/null
-+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/01_gpio-switches
-@@ -0,0 +1,25 @@
-+#!/bin/sh
-+#
-+# Copyright (C) 2015 OpenWrt.org
-+#
-+
-+. /lib/functions/uci-defaults.sh
-+. /lib/ar71xx.sh
-+
-+board=$(ar71xx_board_name)
-+
-+case "$board" in
-+nanostation-m)
-+ ucidef_set_gpio_switch "poe_passthrough" "PoE Passthrough" "2"
-+ ;;
-+nanostation-m-xw)
-+ ucidef_set_gpio_switch "poe_passthrough" "PoE Passthrough" "8"
-+ ;;
-+cpe510)
-+ ucidef_set_gpio_switch "poe_passthrough" "PoE Passthrough" "20"
-+ ;;
-+esac
-+
-+ucidef_commit_gpio_switches
-+
-+exit 0
diff --git a/patches/openwrt/0015-ar71xx-assign-proper-GPIO-pin-for-Ubiquiti-Nanostation-models.patch b/patches/openwrt/0015-ar71xx-assign-proper-GPIO-pin-for-Ubiquiti-Nanostation-models.patch
deleted file mode 100644
index 3bd8de4b681749d726cbf121470bfac1b98d065e..0000000000000000000000000000000000000000
--- a/patches/openwrt/0015-ar71xx-assign-proper-GPIO-pin-for-Ubiquiti-Nanostation-models.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Mon, 7 Mar 2016 06:07:59 +0100
-Subject: ar71xx: assign proper GPIO pin for Ubiquiti Nanostation models
-
-The GPIO pins for "POE passthrough" of Ubiquiti Nanostation models are the
-following:
-* Ubiquiti Nanostation M XM: Pin 8
-* Ubiquiti Nanostation M XW: Pin 2
-
-The previous definition of the pins was mixed up between XM and XW model.
-
-Signed-off-by: Lars Kruse <lists@sumpfralle.de>
-
-Backport of r46922
-
-diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/01_gpio-switches b/target/linux/ar71xx/base-files/etc/uci-defaults/01_gpio-switches
-index 81d3982ed8bf98e01ce2e161017f088a1d0f60dc..b41f27554b1e3eac19c22af59731771631a1135b 100644
---- a/target/linux/ar71xx/base-files/etc/uci-defaults/01_gpio-switches
-+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/01_gpio-switches
-@@ -10,10 +10,10 @@ board=$(ar71xx_board_name)
-
- case "$board" in
- nanostation-m)
-- ucidef_set_gpio_switch "poe_passthrough" "PoE Passthrough" "2"
-+ ucidef_set_gpio_switch "poe_passthrough" "PoE Passthrough" "8"
- ;;
- nanostation-m-xw)
-- ucidef_set_gpio_switch "poe_passthrough" "PoE Passthrough" "8"
-+ ucidef_set_gpio_switch "poe_passthrough" "PoE Passthrough" "2"
- ;;
- cpe510)
- ucidef_set_gpio_switch "poe_passthrough" "PoE Passthrough" "20"
diff --git a/patches/openwrt/0016-netifd-update-to-latest-version.patch b/patches/openwrt/0016-netifd-update-to-latest-version.patch
deleted file mode 100644
index 31472cda6d32ced641123fb3cd135e77b31b3a56..0000000000000000000000000000000000000000
--- a/patches/openwrt/0016-netifd-update-to-latest-version.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Fri, 29 Jul 2016 21:28:24 +0200
-Subject: netifd: update to latest version
-
-diff --git a/package/network/config/netifd/Makefile b/package/network/config/netifd/Makefile
-index 619024bd708541dfb3bda28a963fc87a5d301a0d..dc83ca612bcd4c441e8fa0db77c98c8a1b97ad13 100644
---- a/package/network/config/netifd/Makefile
-+++ b/package/network/config/netifd/Makefile
-@@ -1,15 +1,15 @@
- include $(TOPDIR)/rules.mk
-
- PKG_NAME:=netifd
--PKG_VERSION:=2015-12-16
-+PKG_VERSION:=2016-07-29
- PKG_RELEASE=$(PKG_SOURCE_VERSION)
-
- PKG_SOURCE_PROTO:=git
- PKG_SOURCE_URL:=http://git.openwrt.org/project/netifd.git
- PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
--PKG_SOURCE_VERSION:=245527193e90906451be35c2b8e972b8712ea6ab
-+PKG_SOURCE_VERSION:=656c387974879105c2aaec6b62478d0195067f2d
- PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
--PKG_MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
-+PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
- # PKG_MIRROR_MD5SUM:=
- # CMAKE_INSTALL:=1
-
-diff --git a/package/network/config/netifd/files/etc/init.d/network b/package/network/config/netifd/files/etc/init.d/network
-index 542fc08958e001c2bfce7668ecd7d1c52a649e4e..bdadbbce6db6f9383a0e2c7fab25e7f5d8823091 100755
---- a/package/network/config/netifd/files/etc/init.d/network
-+++ b/package/network/config/netifd/files/etc/init.d/network
-@@ -21,7 +21,6 @@ start_service() {
- procd_set_param watch network.interface
- [ -e /proc/sys/kernel/core_pattern ] && {
- procd_set_param limits core="unlimited"
-- echo '/tmp/%e.%p.%s.%t.core' > /proc/sys/kernel/core_pattern
- }
- procd_close_instance
- }
-diff --git a/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh b/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh
-index 0e88af9e96ad85e7c51ff0b497ce71342d2d1568..1d3a2091060aac6b89d8d10f915b11b251011a85 100755
---- a/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh
-+++ b/package/network/config/netifd/files/lib/netifd/proto/dhcp.sh
-@@ -12,6 +12,7 @@ proto_dhcp_init_config() {
- proto_config_add_string clientid
- proto_config_add_string vendorid
- proto_config_add_boolean 'broadcast:bool'
-+ proto_config_add_boolean 'release:bool'
- proto_config_add_string 'reqopts:list(string)'
- proto_config_add_string iface6rd
- proto_config_add_string sendopts
-@@ -26,8 +27,8 @@ proto_dhcp_setup() {
- local config="$1"
- local iface="$2"
-
-- local ipaddr hostname clientid vendorid broadcast reqopts iface6rd sendopts delegate zone6rd zone mtu6rd customroutes
-- json_get_vars ipaddr hostname clientid vendorid broadcast reqopts iface6rd sendopts delegate zone6rd zone mtu6rd customroutes
-+ local ipaddr hostname clientid vendorid broadcast release reqopts iface6rd sendopts delegate zone6rd zone mtu6rd customroutes
-+ json_get_vars ipaddr hostname clientid vendorid broadcast release reqopts iface6rd sendopts delegate zone6rd zone mtu6rd customroutes
-
- local opt dhcpopts
- for opt in $reqopts; do
-@@ -39,6 +40,7 @@ proto_dhcp_setup() {
- done
-
- [ "$broadcast" = 1 ] && broadcast="-B" || broadcast=
-+ [ "$release" = 1 ] && release="-R" || release=
- [ -n "$clientid" ] && clientid="-x 0x3d:${clientid//:/}" || clientid="-C"
- [ -n "$iface6rd" ] && proto_export "IFACE6RD=$iface6rd"
- [ "$iface6rd" != 0 -a -f /lib/netifd/proto/6rd.sh ] && append dhcpopts "-O 212"
-@@ -54,9 +56,9 @@ proto_dhcp_setup() {
- -s /lib/netifd/dhcp.script \
- -f -t 0 -i "$iface" \
- ${ipaddr:+-r $ipaddr} \
-- ${hostname:+-H $hostname} \
-- ${vendorid:+-V $vendorid} \
-- $clientid $broadcast $dhcpopts
-+ ${hostname:+-x "hostname:$hostname"} \
-+ ${vendorid:+-V "$vendorid"} \
-+ $clientid $broadcast $release $dhcpopts
- }
-
- proto_dhcp_renew() {
-diff --git a/package/network/config/netifd/files/sbin/ifup b/package/network/config/netifd/files/sbin/ifup
-index af3aaa8453ce93f52c2b89e743f43f9c509ad696..5515b91f76df2b5c36d46ac4b86dfc9bdcd78b1d 100755
---- a/package/network/config/netifd/files/sbin/ifup
-+++ b/package/network/config/netifd/files/sbin/ifup
-@@ -67,12 +67,10 @@ if [ -n "$setup_wifi" ] && grep -sq config /etc/config/wireless; then
- fi
- }
-
-- local radio_devs
-- local network="$1"
-+ network="$1"
- config_load wireless
- config_foreach find_related_radios wifi-iface
-
-- local dev
- for dev in $(echo "$radio_devs" | sort -u); do
- /sbin/wifi up "$dev"
- done
diff --git a/patches/openwrt/0017-x86-fix-platform_export_bootpart-for-Xen-virtual-disks.patch b/patches/openwrt/0017-x86-fix-platform_export_bootpart-for-Xen-virtual-disks.patch
deleted file mode 100644
index 20ab565dfe8fc50e4899c47605716c7f0fa72b61..0000000000000000000000000000000000000000
--- a/patches/openwrt/0017-x86-fix-platform_export_bootpart-for-Xen-virtual-disks.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From: Alexander Dahl <alex@netz39.de>
-Date: Thu, 17 Mar 2016 15:04:09 +0100
-Subject: x86: fix platform_export_bootpart() for Xen virtual disks
-
-Virtual disk devices in a Xen virtual machine (DomU) can be /dev/xvda,
-/dev/xvdb and so on with partitions like /dev/xdva1. Devices named like
-this where not considered before. This resulted in a non working
-sysupgrade, because the boot partition could not be found.
-
-Signed-off-by: Alexander Dahl <alex@netz39.de>
-Suggested-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/target/linux/x86/base-files/lib/upgrade/platform.sh b/target/linux/x86/base-files/lib/upgrade/platform.sh
-index 73ab5ef0794c942495d18865fa2c2498b84e63e6..adc119c897ed840aef17c2041a48244d0922564e 100644
---- a/target/linux/x86/base-files/lib/upgrade/platform.sh
-+++ b/target/linux/x86/base-files/lib/upgrade/platform.sh
-@@ -17,7 +17,7 @@ platform_export_bootpart() {
- PARTUUID=[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-02)
- uuid="${disk#PARTUUID=}"
- uuid="${uuid%-02}"
-- for disk in /dev/[hsv]d[a-z]; do
-+ for disk in /dev/[hsv]d[a-z] /dev/xvd[a-z]; do
- set -- $(dd if=$disk bs=1 skip=440 count=4 2>/dev/null | hexdump -v -e '4/1 "%02x "')
- if [ "$4$3$2$1" = "$uuid" ]; then
- export BOOTPART="${disk}1"
diff --git a/patches/openwrt/0018-Support-LibreSSL-as-provider-of-openssl.patch b/patches/openwrt/0018-Support-LibreSSL-as-provider-of-openssl.patch
deleted file mode 100644
index 566ec6c21b920dd4457ebad8013882fbb294fbf9..0000000000000000000000000000000000000000
--- a/patches/openwrt/0018-Support-LibreSSL-as-provider-of-openssl.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Wed, 30 Mar 2016 02:59:19 +0200
-Subject: Support LibreSSL as provider of openssl
-
-The build scripts check for openssl by grepping the string "OpenSSL" in
-the output of openssl version command. LibreSSL fails this test as it
-outputs something like "LibreSSL 2.2.4". This patch fix the
-prereq-bulid.mk file so that it accepts LibreSSL as openssl provider as
-well.
-
-Signed-off-by: Marek Behun <kabel@blackhole.sk>
-
-Backport of r48267
-
-diff --git a/include/prereq-build.mk b/include/prereq-build.mk
-index 32c4adabb748c4026d507d40769b3201e2ac5599..f36d57ce06c46be7ac33f3034ad08a3ce603089d 100644
---- a/include/prereq-build.mk
-+++ b/include/prereq-build.mk
-@@ -151,7 +151,7 @@ $(eval $(call SetupHostCommand,file,Please install the 'file' package, \
- file --version 2>&1 | grep file))
-
- $(eval $(call SetupHostCommand,openssl,Please install the 'openssl' utility, \
-- openssl version | grep OpenSSL))
-+ openssl version | grep '\(OpenSSL\|LibreSSL\)'))
-
-
- # Install ldconfig stub
diff --git a/patches/openwrt/0019-ar71xx-check-both-HWID-and-HWREV-on-upgrades-of-TP-LINK-devices.patch b/patches/openwrt/0019-ar71xx-check-both-HWID-and-HWREV-on-upgrades-of-TP-LINK-devices.patch
deleted file mode 100644
index 358b3da7db664d86e8be1404367c4cf6148da9e0..0000000000000000000000000000000000000000
--- a/patches/openwrt/0019-ar71xx-check-both-HWID-and-HWREV-on-upgrades-of-TP-LINK-devices.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Fri, 1 Apr 2016 23:16:13 +0200
-Subject: ar71xx: check both HWID and HWREV on upgrades of TP-LINK devices
-
-There's no reason for us to be more lenient than the stock firmware, so
-better check the HWREV as well to avoid bricked devices.
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-Backport of r49105
-
-diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
-index 762cd760ceb9ff3917903dfd26a5a7a42175abfe..024e4930949c927efd36c3ac67cd351dcaa4bf7b 100755
---- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
-+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
-@@ -66,6 +66,10 @@ tplink_get_image_hwid() {
- get_image "$@" | dd bs=4 count=1 skip=16 2>/dev/null | hexdump -v -n 4 -e '1/1 "%02x"'
- }
-
-+tplink_get_image_mid() {
-+ get_image "$@" | dd bs=4 count=1 skip=17 2>/dev/null | hexdump -v -n 4 -e '1/1 "%02x"'
-+}
-+
- tplink_get_image_boot_size() {
- get_image "$@" | dd bs=4 count=1 skip=37 2>/dev/null | hexdump -v -n 4 -e '1/1 "%02x"'
- }
-@@ -373,13 +377,17 @@ platform_check_image() {
- }
-
- local hwid
-- local imageid
-+ local mid
-+ local imagehwid
-+ local imagemid
-
- hwid=$(tplink_get_hwid)
-- imageid=$(tplink_get_image_hwid "$1")
-+ mid=$(tplink_get_mid)
-+ imagehwid=$(tplink_get_image_hwid "$1")
-+ imagemid=$(tplink_get_image_mid "$1")
-
-- [ "$hwid" != "$imageid" ] && {
-- echo "Invalid image, hardware ID mismatch, hw:$hwid image:$imageid."
-+ [ "$hwid" != "$imagehwid" -o "$mid" != "$imagemid" ] && {
-+ echo "Invalid image, hardware ID mismatch, hw:$hwid $mid image:$imagehwid $imagemid."
- return 1
- }
-
diff --git a/patches/openwrt/0020-ar71xx-avoid-AR71XX_MODEL-ending-with-a-space-on-some-TP-LINK-like-devices.patch b/patches/openwrt/0020-ar71xx-avoid-AR71XX_MODEL-ending-with-a-space-on-some-TP-LINK-like-devices.patch
deleted file mode 100644
index 55ad0059a1c12ec26e4b923c35255467aeeb6593..0000000000000000000000000000000000000000
--- a/patches/openwrt/0020-ar71xx-avoid-AR71XX_MODEL-ending-with-a-space-on-some-TP-LINK-like-devices.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Fri, 1 Apr 2016 23:19:16 +0200
-Subject: ar71xx: avoid AR71XX_MODEL ending with a space on some TP-LINK-like devices
-
-Instead of adding the space when combining $model and $hwver, add the space
-to the beginning of $hwver, so the resulting string won't end with a space
-when $hwver is set to the empty string.
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-Backport of r49106
-
-diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
-index 0aa1c865cbdeb0624147d4117d289a640d20a5ef..96a37b4bec019d06c9283afc44b7961d150c05fb 100755
---- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
-+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
-@@ -133,7 +133,7 @@ tplink_board_detect() {
- hwid=$(tplink_get_hwid)
- mid=$(tplink_get_mid)
- hwver=${hwid:6:2}
-- hwver="v${hwver#0}"
-+ hwver=" v${hwver#0}"
-
- case "$hwid" in
- "015000"*)
-@@ -196,8 +196,8 @@ tplink_board_detect() {
- "083000"*)
- model="TP-Link TL-WA830RE"
-
-- if [ "$hwver" = 'v10' ]; then
-- hwver='v1'
-+ if [ "$hwver" = ' v10' ]; then
-+ hwver=' v1'
- fi
- ;;
- "084100"*)
-@@ -296,7 +296,7 @@ tplink_board_detect() {
- ;;
- esac
-
-- AR71XX_MODEL="$model $hwver"
-+ AR71XX_MODEL="$model$hwver"
- }
-
- tplink_pharos_get_model_string() {
diff --git a/patches/openwrt/0021-ar71xx-fix-the-revision-of-a-few-TP-LINK-devices-in-AR71XX_MODEL-to-match-labels-image-names.patch b/patches/openwrt/0021-ar71xx-fix-the-revision-of-a-few-TP-LINK-devices-in-AR71XX_MODEL-to-match-labels-image-names.patch
deleted file mode 100644
index e06c73353161dc9fc2fa8683ef57cd80112adf7d..0000000000000000000000000000000000000000
--- a/patches/openwrt/0021-ar71xx-fix-the-revision-of-a-few-TP-LINK-devices-in-AR71XX_MODEL-to-match-labels-image-names.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Fri, 1 Apr 2016 23:21:32 +0200
-Subject: ar71xx: fix the revision of a few TP-LINK devices in AR71XX_MODEL to match labels/image names
-
-Let's not confuse users about the revisions of their devices when we can
-easily avoid it.
-
-Not tested on real hardware.
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-Backport of r49107
-
-diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
-index 96a37b4bec019d06c9283afc44b7961d150c05fb..6c106179bfa0c01308a03678aef1b7cf4caaf05b 100755
---- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
-+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
-@@ -162,6 +162,10 @@ tplink_board_detect() {
- ;;
- "071000"*)
- model="TP-Link TL-WR710N"
-+
-+ if [ "$hwid" = '07100002' -a "$mid" = '00000002' ]; then
-+ hwver=' v2.1'
-+ fi
- ;;
- "072001"*)
- model="TP-Link TL-WR720N"
-@@ -202,6 +206,10 @@ tplink_board_detect() {
- ;;
- "084100"*)
- model="TP-Link TL-WR841N/ND"
-+
-+ if [ "$hwid" = '08410002' -a "$mid" = '00000002' ]; then
-+ hwver=' v1.5'
-+ fi
- ;;
- "084200"*)
- model="TP-Link TL-WR842N/ND"
diff --git a/patches/openwrt/0022-ar71xx-build-image-for-TL-WR710N-v2.1.patch b/patches/openwrt/0022-ar71xx-build-image-for-TL-WR710N-v2.1.patch
deleted file mode 100644
index 455078eb5605c739e9df3fe13dc5d71ee6bfdd86..0000000000000000000000000000000000000000
--- a/patches/openwrt/0022-ar71xx-build-image-for-TL-WR710N-v2.1.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Sat, 2 Apr 2016 00:56:50 +0200
-Subject: ar71xx: build image for TL-WR710N v2.1
-
-This patch just extends target/linux/ar71xx/image/Makefile to build
-images also for version 2.1 of TL-WR710N
-patch against the latest git
-
-Signed off by: Norbert Wegener <nw@wegener-net.de>
-
-Backport of r47849
-
-diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
-index a8073f2ecadce8404dde77278302202fe494cd75..0783381baeddef2064df8faff89c49c2bed6a28b 100644
---- a/target/linux/ar71xx/image/Makefile
-+++ b/target/linux/ar71xx/image/Makefile
-@@ -476,6 +476,15 @@ define Device/tl-wr710n-v2
- CONSOLE := ttyATH0,115200
- endef
-
-+define Device/tl-wr710n-v2.1
-+ $(Device/tplink-8mlzma)
-+ BOARDNAME := TL-WR710N
-+ DEVICE_PROFILE := TLWR710
-+ TPLINK_HWID := 0x07100002
-+ TPLINK_HWREV := 0x00000002
-+ CONSOLE := ttyATH0,115200
-+endef
-+
- define Device/tl-wr720n-v3
- $(Device/tplink-4mlzma)
- BOARDNAME := TL-WR720N-v3
-@@ -491,7 +500,7 @@ define Device/tl-wr720n-v4
- TPLINK_HWID := 0x07200104
- CONSOLE := ttyATH0,115200
- endef
--TARGET_DEVICES += tl-wr703n-v1 tl-wr710n-v1 tl-wr710n-v2 tl-wr720n-v3 tl-wr720n-v4
-+TARGET_DEVICES += tl-wr703n-v1 tl-wr710n-v1 tl-wr710n-v2 tl-wr710n-v2.1 tl-wr720n-v3 tl-wr720n-v4
-
- define Device/tl-wr740n-v4
- $(Device/tplink-4mlzma)
diff --git a/patches/openwrt/0023-xtables-addons-build-fix-configure-compatiblity-with-POSIX-shells.patch b/patches/openwrt/0023-xtables-addons-build-fix-configure-compatiblity-with-POSIX-shells.patch
deleted file mode 100644
index df64e7c391045818f5501c323004f38b9217ada5..0000000000000000000000000000000000000000
--- a/patches/openwrt/0023-xtables-addons-build-fix-configure-compatiblity-with-POSIX-shells.patch
+++ /dev/null
@@ -1,2026 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Tue, 5 Apr 2016 20:30:56 +0200
-Subject: xtables-addons: build: fix configure compatiblity with POSIX shells
-
-diff --git a/package/network/utils/xtables-addons/patches/001-build-fix-configure-compatiblity-with-POSIX-shells.patch b/package/network/utils/xtables-addons/patches/001-build-fix-configure-compatiblity-with-POSIX-shells.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..e0b11b5459e5e4cd49c80b76ed945eb96aa96e8d
---- /dev/null
-+++ b/package/network/utils/xtables-addons/patches/001-build-fix-configure-compatiblity-with-POSIX-shells.patch
-@@ -0,0 +1,51 @@
-+From f07a0a5cb8b3c5e1aee8b30c7fa21ccfbf24a95a Mon Sep 17 00:00:00 2001
-+Message-Id: <f07a0a5cb8b3c5e1aee8b30c7fa21ccfbf24a95a.1459880505.git.mschiffer@universe-factory.net>
-+From: Matthias Schiffer <mschiffer@universe-factory.net>
-+Date: Fri, 1 Apr 2016 22:24:00 +0200
-+Subject: [PATCH] build: fix configure compatiblity with POSIX shells
-+
-+The kernel version detection code uses some bashisms, which makes the build
-+fail on Debian systems where /bin/sh links to dash. Replace with POSIX-
-+conforming commands at the cost of requiring awk.
-+---
-+ configure.ac | 24 +++++++++---------------
-+ 1 file changed, 9 insertions(+), 15 deletions(-)
-+
-+diff --git a/configure.ac b/configure.ac
-+index 82a1355..5a5ea57 100644
-+--- a/configure.ac
-++++ b/configure.ac
-+@@ -44,21 +44,15 @@ regular_CFLAGS="-Wall -Waggregate-return -Wmissing-declarations \
-+
-+ if test -n "$kbuilddir"; then
-+ AC_MSG_CHECKING([kernel version that we will build against])
-+- krel="$(make -sC "$kbuilddir" M=$PWD kernelrelease)";
-+- kmajor="${krel%%[[^0-9]]*}";
-+- kmajor="$(($kmajor+0))";
-+- krel="${krel:${#kmajor}}";
-+- krel="${krel#.}";
-+- kminor="${krel%%[[^0-9]]*}";
-+- kminor="$(($kminor+0))";
-+- krel="${krel:${#kminor}}";
-+- krel="${krel#.}";
-+- kmicro="${krel%%[[^0-9]]*}";
-+- kmicro="$(($kmicro+0))";
-+- krel="${krel:${#kmicro}}";
-+- krel="${krel#.}";
-+- kstable="${krel%%[[^0-9]]*}";
-+- kstable="$(($kstable+0))";
-++ krel="$(make -sC "$kbuilddir" M=$PWD kernelrelease | $AWK -v 'FS=[[^0-9.]]' '{print $1; exit}')";
-++ save_IFS=$IFS;
-++ IFS='.';
-++ set x $krel;
-++ IFS=$save_IFS;
-++ kmajor="$(($2+0))";
-++ kminor="$(($3+0))";
-++ kmicro="$(($4+0))";
-++ kstable="$(($5+0))";
-+ if test -z "$kmajor" -o -z "$kminor" -o -z "$kmicro"; then
-+ echo "WARNING: Version detection did not succeed. Continue at own luck.";
-+ else
-+--
-+2.8.0
-+
-diff --git a/package/network/utils/xtables-addons/patches/002-fix-kernel-version-detection.patch b/package/network/utils/xtables-addons/patches/002-fix-kernel-version-detection.patch
-index d3b7caa634ba0cc33b01bbf795f1f70995cb3dc6..6a7a099fcc3aad162fc2aaba70dac54882c2b464 100644
---- a/package/network/utils/xtables-addons/patches/002-fix-kernel-version-detection.patch
-+++ b/package/network/utils/xtables-addons/patches/002-fix-kernel-version-detection.patch
-@@ -1,1954 +1,11 @@
----- a/configure
--+++ b/configure
--@@ -1,9 +1,11 @@
-- #! /bin/sh
-- # Guess values for system-dependent variables and create Makefiles.
---# Generated by GNU Autoconf 2.69 for xtables-addons 2.5.
--+# Generated by GNU Autoconf 2.68 for xtables-addons 2.5.
-- #
-- #
---# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
--+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
--+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
--+# Foundation, Inc.
-- #
-- #
-- # This configure script is free software; the Free Software Foundation
--@@ -132,31 +134,6 @@ export LANGUAGE
-- # CDPATH.
-- (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
--
---# Use a proper internal environment variable to ensure we don't fall
--- # into an infinite loop, continuously re-executing ourselves.
--- if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
--- _as_can_reexec=no; export _as_can_reexec;
--- # We cannot yet assume a decent shell, so we have to provide a
---# neutralization value for shells without unset; and this also
---# works around shells that cannot unset nonexistent variables.
---# Preserve -v and -x to the replacement shell.
---BASH_ENV=/dev/null
---ENV=/dev/null
---(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
---case $- in # ((((
--- *v*x* | *x*v* ) as_opts=-vx ;;
--- *v* ) as_opts=-v ;;
--- *x* ) as_opts=-x ;;
--- * ) as_opts= ;;
---esac
---exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
---# Admittedly, this is quite paranoid, since all the known shells bail
---# out after a failed `exec'.
---$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
---as_fn_exit 255
--- fi
--- # We don't want this to propagate to other subprocesses.
--- { _as_can_reexec=; unset _as_can_reexec;}
-- if test "x$CONFIG_SHELL" = x; then
-- as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
-- emulate sh
--@@ -190,8 +167,7 @@ if ( set x; as_fn_ret_success y && test
-- else
-- exitcode=1; echo positional parameters were not saved.
-- fi
---test x\$exitcode = x0 || exit 1
---test -x / || exit 1"
--+test x\$exitcode = x0 || exit 1"
-- as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
-- as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
-- eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
--@@ -244,25 +220,21 @@ IFS=$as_save_IFS
--
--
-- if test "x$CONFIG_SHELL" != x; then :
--- export CONFIG_SHELL
--- # We cannot yet assume a decent shell, so we have to provide a
---# neutralization value for shells without unset; and this also
---# works around shells that cannot unset nonexistent variables.
---# Preserve -v and -x to the replacement shell.
---BASH_ENV=/dev/null
---ENV=/dev/null
---(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
---case $- in # ((((
--- *v*x* | *x*v* ) as_opts=-vx ;;
--- *v* ) as_opts=-v ;;
--- *x* ) as_opts=-x ;;
--- * ) as_opts= ;;
---esac
---exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
---# Admittedly, this is quite paranoid, since all the known shells bail
---# out after a failed `exec'.
---$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
---exit 255
--+ # We cannot yet assume a decent shell, so we have to provide a
--+ # neutralization value for shells without unset; and this also
--+ # works around shells that cannot unset nonexistent variables.
--+ # Preserve -v and -x to the replacement shell.
--+ BASH_ENV=/dev/null
--+ ENV=/dev/null
--+ (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
--+ export CONFIG_SHELL
--+ case $- in # ((((
--+ *v*x* | *x*v* ) as_opts=-vx ;;
--+ *v* ) as_opts=-v ;;
--+ *x* ) as_opts=-x ;;
--+ * ) as_opts= ;;
--+ esac
--+ exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
-- fi
--
-- if test x$as_have_required = xno; then :
--@@ -364,14 +336,6 @@ $as_echo X"$as_dir" |
--
--
-- } # as_fn_mkdir_p
---
---# as_fn_executable_p FILE
---# -----------------------
---# Test if FILE is an executable regular file.
---as_fn_executable_p ()
---{
--- test -f "$1" && test -x "$1"
---} # as_fn_executable_p
-- # as_fn_append VAR VALUE
-- # ----------------------
-- # Append the text in VALUE to the end of the definition contained in VAR. Take
--@@ -493,10 +457,6 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits
-- chmod +x "$as_me.lineno" ||
-- { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
--
--- # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
--- # already done that, so ensure we don't try to do so again and fall
--- # in an infinite loop. This has already happened in practice.
--- _as_can_reexec=no; export _as_can_reexec
-- # Don't try to exec as it changes $[0], causing all sort of problems
-- # (the dirname of $[0] is not the place where we might find the
-- # original and so on. Autoconf is especially sensitive to this).
--@@ -531,16 +491,16 @@ if (echo >conf$$.file) 2>/dev/null; then
-- # ... but there are two gotchas:
-- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
--- # In both cases, we have to default to `cp -pR'.
--+ # In both cases, we have to default to `cp -p'.
-- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
--- as_ln_s='cp -pR'
--+ as_ln_s='cp -p'
-- elif ln conf$$.file conf$$ 2>/dev/null; then
-- as_ln_s=ln
-- else
--- as_ln_s='cp -pR'
--+ as_ln_s='cp -p'
-- fi
-- else
--- as_ln_s='cp -pR'
--+ as_ln_s='cp -p'
-- fi
-- rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-- rmdir conf$$.dir 2>/dev/null
--@@ -552,8 +512,28 @@ else
-- as_mkdir_p=false
-- fi
--
---as_test_x='test -x'
---as_executable_p=as_fn_executable_p
--+if test -x / >/dev/null 2>&1; then
--+ as_test_x='test -x'
--+else
--+ if ls -dL / >/dev/null 2>&1; then
--+ as_ls_L_option=L
--+ else
--+ as_ls_L_option=
--+ fi
--+ as_test_x='
--+ eval sh -c '\''
--+ if test -d "$1"; then
--+ test -d "$1/.";
--+ else
--+ case $1 in #(
--+ -*)set "./$1";;
--+ esac;
--+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
--+ ???[sx]*):;;*)false;;esac;fi
--+ '\'' sh
--+ '
--+fi
--+as_executable_p=$as_test_x
--
-- # Sed expression to map a string onto a valid CPP name.
-- as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
--@@ -688,10 +668,6 @@ CPPFLAGS
-- LDFLAGS
-- CFLAGS
-- CC
---AM_BACKSLASH
---AM_DEFAULT_VERBOSITY
---AM_DEFAULT_V
---AM_V
-- am__untar
-- am__tar
-- AMTAR
--@@ -756,7 +732,6 @@ SHELL'
-- ac_subst_files=''
-- ac_user_opts='
-- enable_option_checking
---enable_silent_rules
-- enable_dependency_tracking
-- enable_static
-- enable_shared
--@@ -1237,6 +1212,8 @@ target=$target_alias
-- if test "x$host_alias" != x; then
-- if test "x$build_alias" = x; then
-- cross_compiling=maybe
--+ $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
--+ If a cross compiler is detected then cross compile mode will be used" >&2
-- elif test "x$build_alias" != "x$host_alias"; then
-- cross_compiling=yes
-- fi
--@@ -1400,12 +1377,8 @@ Optional Features:
-- --disable-option-checking ignore unrecognized --enable/--with options
-- --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
-- --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--- --enable-silent-rules less verbose build output (undo: "make V=1")
--- --disable-silent-rules verbose build output (undo: "make V=0")
--- --enable-dependency-tracking
--- do not reject slow dependency extractors
--- --disable-dependency-tracking
--- speeds up one-time build
--+ --disable-dependency-tracking speeds up one-time build
--+ --enable-dependency-tracking do not reject slow dependency extractors
-- --enable-static[=PKGS] build static libraries [default=no]
-- --enable-shared[=PKGS] build shared libraries [default=yes]
-- --enable-fast-install[=PKGS]
--@@ -1415,7 +1388,7 @@ Optional Features:
-- Optional Packages:
-- --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
-- --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
--- --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use
--+ --with-pic try to use only PIC/non-PIC objects [default=use
-- both]
-- --with-gnu-ld assume the C compiler uses GNU ld [default=no]
-- --with-sysroot=DIR Search for dependent libraries within DIR
--@@ -1512,9 +1485,9 @@ test -n "$ac_init_help" && exit $ac_stat
-- if $ac_init_version; then
-- cat <<\_ACEOF
-- xtables-addons configure 2.5
---generated by GNU Autoconf 2.69
--+generated by GNU Autoconf 2.68
--
---Copyright (C) 2012 Free Software Foundation, Inc.
--+Copyright (C) 2010 Free Software Foundation, Inc.
-- This configure script is free software; the Free Software Foundation
-- gives unlimited permission to copy, distribute and modify it.
-- _ACEOF
--@@ -1590,7 +1563,7 @@ $as_echo "$ac_try_echo"; } >&5
-- test ! -s conftest.err
-- } && test -s conftest$ac_exeext && {
-- test "$cross_compiling" = yes ||
--- test -x conftest$ac_exeext
--+ $as_test_x conftest$ac_exeext
-- }; then :
-- ac_retval=0
-- else
--@@ -1877,7 +1850,7 @@ This file contains any messages produced
-- running configure, to aid debugging if configure makes a mistake.
--
-- It was created by xtables-addons $as_me 2.5, which was
---generated by GNU Autoconf 2.69. Invocation command line was
--+generated by GNU Autoconf 2.68. Invocation command line was
--
-- $ $0 $@
--
--@@ -2293,7 +2266,7 @@ case $as_dir/ in #((
-- # by default.
-- for ac_prog in ginstall scoinst install; do
-- for ac_exec_ext in '' $ac_executable_extensions; do
--- if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
--+ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
-- if test $ac_prog = install &&
-- grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-- # AIX install. It has an incompatible calling convention.
--@@ -2349,10 +2322,13 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCR
--
-- test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
--
---am__api_version='1.14'
--+am__api_version='1.11'
--
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
-- $as_echo_n "checking whether build environment is sane... " >&6; }
--+# Just in case
--+sleep 1
--+echo timestamp > conftest.file
-- # Reject unsafe characters in $srcdir or the absolute working directory
-- # name. Accept space and tab only in the latter.
-- am_lf='
--@@ -2363,40 +2339,32 @@ case `pwd` in
-- esac
-- case $srcdir in
-- *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
--- as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;;
--+ as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
-- esac
--
---# Do 'set' in a subshell so we don't clobber the current shell's
--+# Do `set' in a subshell so we don't clobber the current shell's
-- # arguments. Must try -L first in case configure is actually a
-- # symlink; some systems play weird games with the mod time of symlinks
-- # (eg FreeBSD returns the mod time of the symlink's containing
-- # directory).
-- if (
--- am_has_slept=no
--- for am_try in 1 2; do
--- echo "timestamp, slept: $am_has_slept" > conftest.file
--- set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
--- if test "$*" = "X"; then
--- # -L didn't work.
--- set X `ls -t "$srcdir/configure" conftest.file`
--- fi
--- if test "$*" != "X $srcdir/configure conftest.file" \
--- && test "$*" != "X conftest.file $srcdir/configure"; then
--+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
--+ if test "$*" = "X"; then
--+ # -L didn't work.
--+ set X `ls -t "$srcdir/configure" conftest.file`
--+ fi
--+ rm -f conftest.file
--+ if test "$*" != "X $srcdir/configure conftest.file" \
--+ && test "$*" != "X conftest.file $srcdir/configure"; then
--+
--+ # If neither matched, then we have a broken ls. This can happen
--+ # if, for instance, CONFIG_SHELL is bash and it inherits a
--+ # broken ls alias from the environment. This has actually
--+ # happened. Such a system could not be considered "sane".
--+ as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
--+alias in your environment" "$LINENO" 5
--+ fi
--
--- # If neither matched, then we have a broken ls. This can happen
--- # if, for instance, CONFIG_SHELL is bash and it inherits a
--- # broken ls alias from the environment. This has actually
--- # happened. Such a system could not be considered "sane".
--- as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
--- alias in your environment" "$LINENO" 5
--- fi
--- if test "$2" = conftest.file || test $am_try -eq 2; then
--- break
--- fi
--- # Just in case.
--- sleep 1
--- am_has_slept=yes
--- done
-- test "$2" = conftest.file
-- )
-- then
--@@ -2408,16 +2376,6 @@ Check your system clock" "$LINENO" 5
-- fi
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-- $as_echo "yes" >&6; }
---# If we didn't sleep, we still need to ensure time stamps of config.status and
---# generated files are strictly newer.
---am_sleep_pid=
---if grep 'slept: no' conftest.file >/dev/null 2>&1; then
--- ( sleep 1 ) &
--- am_sleep_pid=$!
---fi
---
---rm -f conftest.file
---
-- test "$program_prefix" != NONE &&
-- program_transform_name="s&^&$program_prefix&;$program_transform_name"
-- # Use a double $ so make ignores it.
--@@ -2440,12 +2398,12 @@ if test x"${MISSING+set}" != xset; then
-- esac
-- fi
-- # Use eval to expand $SHELL
---if eval "$MISSING --is-lightweight"; then
--- am_missing_run="$MISSING "
--+if eval "$MISSING --run true"; then
--+ am_missing_run="$MISSING --run "
-- else
-- am_missing_run=
--- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5
---$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;}
--+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
--+$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
-- fi
--
-- if test x"${install_sh}" != xset; then
--@@ -2457,10 +2415,10 @@ if test x"${install_sh}" != xset; then
-- esac
-- fi
--
---# Installed binaries are usually stripped using 'strip' when the user
---# run "make install-strip". However 'strip' might not be the right
--+# Installed binaries are usually stripped using `strip' when the user
--+# run `make install-strip'. However `strip' might not be the right
-- # tool to use in cross-compilation environments, therefore Automake
---# will honor the 'STRIP' environment variable to overrule this program.
--+# will honor the `STRIP' environment variable to overrule this program.
-- if test "$cross_compiling" != no; then
-- if test -n "$ac_tool_prefix"; then
-- # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
--@@ -2479,7 +2437,7 @@ do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
--- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
--@@ -2519,7 +2477,7 @@ do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
--- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_prog_ac_ct_STRIP="strip"
-- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
--@@ -2570,7 +2528,7 @@ do
-- test -z "$as_dir" && as_dir=.
-- for ac_prog in mkdir gmkdir; do
-- for ac_exec_ext in '' $ac_executable_extensions; do
--- as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
--+ { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
-- case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
-- 'mkdir (GNU coreutils) '* | \
-- 'mkdir (coreutils) '* | \
--@@ -2599,6 +2557,12 @@ fi
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
-- $as_echo "$MKDIR_P" >&6; }
--
--+mkdir_p="$MKDIR_P"
--+case $mkdir_p in
--+ [\\/$]* | ?:[\\/]*) ;;
--+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
--+esac
--+
-- for ac_prog in gawk mawk nawk awk
-- do
-- # Extract the first word of "$ac_prog", so it can be a program name with args.
--@@ -2617,7 +2581,7 @@ do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
--- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_prog_AWK="$ac_prog"
-- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
--@@ -2681,45 +2645,6 @@ else
-- fi
-- rmdir .tst 2>/dev/null
--
---# Check whether --enable-silent-rules was given.
---if test "${enable_silent_rules+set}" = set; then :
--- enableval=$enable_silent_rules;
---fi
---
---case $enable_silent_rules in # (((
--- yes) AM_DEFAULT_VERBOSITY=0;;
--- no) AM_DEFAULT_VERBOSITY=1;;
--- *) AM_DEFAULT_VERBOSITY=1;;
---esac
---am_make=${MAKE-make}
---{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
---$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
---if ${am_cv_make_support_nested_variables+:} false; then :
--- $as_echo_n "(cached) " >&6
---else
--- if $as_echo 'TRUE=$(BAR$(V))
---BAR0=false
---BAR1=true
---V=1
---am__doit:
--- @$(TRUE)
---.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
--- am_cv_make_support_nested_variables=yes
---else
--- am_cv_make_support_nested_variables=no
---fi
---fi
---{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
---$as_echo "$am_cv_make_support_nested_variables" >&6; }
---if test $am_cv_make_support_nested_variables = yes; then
--- AM_V='$(V)'
--- AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
---else
--- AM_V=$AM_DEFAULT_VERBOSITY
--- AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
---fi
---AM_BACKSLASH='\'
---
-- if test "`cd $srcdir && pwd`" != "`pwd`"; then
-- # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
-- # is not polluted with repeated "-I."
--@@ -2770,111 +2695,18 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_ru
--
-- MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
--
---# For better backward compatibility. To be removed once Automake 1.9.x
---# dies out for good. For more background, see:
---# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html>
---# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html>
---mkdir_p='$(MKDIR_P)'
---
-- # We need awk for the "check" target. The system "awk" is bad on
-- # some platforms.
-- # Always define AMTAR for backward compatibility. Yes, it's still used
-- # in the wild :-( We should find a proper way to deprecate it ...
-- AMTAR='$${TAR-tar}'
--
---
---# We'll loop over all known methods to create a tar archive until one works.
---_am_tools='gnutar pax cpio none'
---
-- am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
--
--
--
--
--
---
---# POSIX will say in a future version that running "rm -f" with no argument
---# is OK; and we want to be able to make that assumption in our Makefile
---# recipes. So use an aggressive probe to check that the usage we want is
---# actually supported "in the wild" to an acceptable degree.
---# See automake bug#10828.
---# To make any issue more visible, cause the running configure to be aborted
---# by default if the 'rm' program in use doesn't match our expectations; the
---# user can still override this though.
---if rm -f && rm -fr && rm -rf; then : OK; else
--- cat >&2 <<'END'
---Oops!
---
---Your 'rm' program seems unable to run without file operands specified
---on the command line, even when the '-f' option is present. This is contrary
---to the behaviour of most rm programs out there, and not conforming with
---the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542>
---
---Please tell bug-automake@gnu.org about your system, including the value
---of your $PATH and any error possibly output before this message. This
---can help us improve future automake versions.
---
---END
--- if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then
--- echo 'Configuration will proceed anyway, since you have set the' >&2
--- echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2
--- echo >&2
--- else
--- cat >&2 <<'END'
---Aborting the configuration process, to ensure you take notice of the issue.
---
---You can download and install GNU coreutils to get an 'rm' implementation
---that behaves properly: <http://www.gnu.org/software/coreutils/>.
---
---If you want to complete the configuration process using your problematic
---'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM
---to "yes", and re-run configure.
---
---END
--- as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5
--- fi
---fi
---
---# Check whether --enable-silent-rules was given.
---if test "${enable_silent_rules+set}" = set; then :
--- enableval=$enable_silent_rules;
---fi
---
---case $enable_silent_rules in # (((
--- yes) AM_DEFAULT_VERBOSITY=0;;
--- no) AM_DEFAULT_VERBOSITY=1;;
--- *) AM_DEFAULT_VERBOSITY=0;;
---esac
---am_make=${MAKE-make}
---{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5
---$as_echo_n "checking whether $am_make supports nested variables... " >&6; }
---if ${am_cv_make_support_nested_variables+:} false; then :
--- $as_echo_n "(cached) " >&6
---else
--- if $as_echo 'TRUE=$(BAR$(V))
---BAR0=false
---BAR1=true
---V=1
---am__doit:
--- @$(TRUE)
---.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then
--- am_cv_make_support_nested_variables=yes
---else
--- am_cv_make_support_nested_variables=no
---fi
---fi
---{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5
---$as_echo "$am_cv_make_support_nested_variables" >&6; }
---if test $am_cv_make_support_nested_variables = yes; then
--- AM_V='$(V)'
--- AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)'
---else
--- AM_V=$AM_DEFAULT_VERBOSITY
--- AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY
---fi
---AM_BACKSLASH='\'
---
---
-- ac_ext=c
-- ac_cpp='$CPP $CPPFLAGS'
-- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--@@ -2897,7 +2729,7 @@ do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
--- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_prog_CC="${ac_tool_prefix}gcc"
-- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
--@@ -2937,7 +2769,7 @@ do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
--- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_prog_ac_ct_CC="gcc"
-- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
--@@ -2990,7 +2822,7 @@ do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
--- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_prog_CC="${ac_tool_prefix}cc"
-- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
--@@ -3031,7 +2863,7 @@ do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
--- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-- ac_prog_rejected=yes
-- continue
--@@ -3089,7 +2921,7 @@ do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
--- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
--@@ -3133,7 +2965,7 @@ do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
--- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_prog_ac_ct_CC="$ac_prog"
-- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
--@@ -3579,7 +3411,8 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
-- /* end confdefs.h. */
-- #include <stdarg.h>
-- #include <stdio.h>
---struct stat;
--+#include <sys/types.h>
--+#include <sys/stat.h>
-- /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
-- struct buf { int x; };
-- FILE * (*rcsopen) (struct buf *, struct stat *, int);
--@@ -3663,65 +3496,6 @@ ac_cpp='$CPP $CPPFLAGS'
-- ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-- ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-- ac_compiler_gnu=$ac_cv_c_compiler_gnu
---
---ac_ext=c
---ac_cpp='$CPP $CPPFLAGS'
---ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
---ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
---ac_compiler_gnu=$ac_cv_c_compiler_gnu
---{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5
---$as_echo_n "checking whether $CC understands -c and -o together... " >&6; }
---if ${am_cv_prog_cc_c_o+:} false; then :
--- $as_echo_n "(cached) " >&6
---else
--- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
---/* end confdefs.h. */
---
---int
---main ()
---{
---
--- ;
--- return 0;
---}
---_ACEOF
--- # Make sure it works both with $CC and with simple cc.
--- # Following AC_PROG_CC_C_O, we do the test twice because some
--- # compilers refuse to overwrite an existing .o file with -o,
--- # though they will create one.
--- am_cv_prog_cc_c_o=yes
--- for am_i in 1 2; do
--- if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5
--- ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5
--- ac_status=$?
--- echo "$as_me:$LINENO: \$? = $ac_status" >&5
--- (exit $ac_status); } \
--- && test -f conftest2.$ac_objext; then
--- : OK
--- else
--- am_cv_prog_cc_c_o=no
--- break
--- fi
--- done
--- rm -f core conftest*
--- unset am_i
---fi
---{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5
---$as_echo "$am_cv_prog_cc_c_o" >&6; }
---if test "$am_cv_prog_cc_c_o" != yes; then
--- # Losing compiler, so override with the script.
--- # FIXME: It is wrong to rewrite CC.
--- # But if we don't then we get into trouble of one sort or another.
--- # A longer-term fix would be to have automake use am__CC in this case,
--- # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
--- CC="$am_aux_dir/compile $CC"
---fi
---ac_ext=c
---ac_cpp='$CPP $CPPFLAGS'
---ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
---ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
---ac_compiler_gnu=$ac_cv_c_compiler_gnu
---
-- DEPDIR="${am__leading_dot}deps"
--
-- ac_config_commands="$ac_config_commands depfiles"
--@@ -3741,7 +3515,7 @@ am__quote=
-- _am_result=none
-- # First try GNU make style include.
-- echo "include confinc" > confmf
---# Ignore all kinds of additional output from 'make'.
--+# Ignore all kinds of additional output from `make'.
-- case `$am_make -s -f confmf 2> /dev/null` in #(
-- *the\ am__doit\ target*)
-- am__include=include
--@@ -3797,8 +3571,8 @@ else
-- # We make a subdir and do the tests there. Otherwise we can end up
-- # making bogus files that we don't know about and never remove. For
-- # instance it was reported that on HP-UX the gcc test will end up
--- # making a dummy file named 'D' -- because '-MD' means "put the output
--- # in D".
--+ # making a dummy file named `D' -- because `-MD' means `put the output
--+ # in D'.
-- rm -rf conftest.dir
-- mkdir conftest.dir
-- # Copy depcomp to subdir because otherwise we won't find it if we're
--@@ -3833,16 +3607,16 @@ else
-- : > sub/conftest.c
-- for i in 1 2 3 4 5 6; do
-- echo '#include "conftst'$i'.h"' >> sub/conftest.c
--- # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with
--- # Solaris 10 /bin/sh.
--- echo '/* dummy */' > sub/conftst$i.h
--+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
--+ # Solaris 8's {/usr,}/bin/sh.
--+ touch sub/conftst$i.h
-- done
-- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
--
--- # We check with '-c' and '-o' for the sake of the "dashmstdout"
--+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
-- # mode. It turns out that the SunPro C++ compiler does not properly
--- # handle '-M -o', and we need to detect this. Also, some Intel
--- # versions had trouble with output in subdirs.
--+ # handle `-M -o', and we need to detect this. Also, some Intel
--+ # versions had trouble with output in subdirs
-- am__obj=sub/conftest.${OBJEXT-o}
-- am__minus_obj="-o $am__obj"
-- case $depmode in
--@@ -3851,8 +3625,8 @@ else
-- test "$am__universal" = false || continue
-- ;;
-- nosideeffect)
--- # After this tag, mechanisms are not by side-effect, so they'll
--- # only be used when explicitly requested.
--+ # after this tag, mechanisms are not by side-effect, so they'll
--+ # only be used when explicitly requested
-- if test "x$enable_dependency_tracking" = xyes; then
-- continue
-- else
--@@ -3860,7 +3634,7 @@ else
-- fi
-- ;;
-- msvc7 | msvc7msys | msvisualcpp | msvcmsys)
--- # This compiler won't grok '-c -o', but also, the minuso test has
--+ # This compiler won't grok `-c -o', but also, the minuso test has
-- # not run yet. These depmodes are late enough in the game, and
-- # so weak that their functioning should not be impacted.
-- am__obj=conftest.${OBJEXT-o}
--@@ -3914,6 +3688,131 @@ else
-- fi
--
--
--+if test "x$CC" != xcc; then
--+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
--+$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
--+else
--+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5
--+$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
--+fi
--+set dummy $CC; ac_cc=`$as_echo "$2" |
--+ sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
--+if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then :
--+ $as_echo_n "(cached) " >&6
--+else
--+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
--+/* end confdefs.h. */
--+
--+int
--+main ()
--+{
--+
--+ ;
--+ return 0;
--+}
--+_ACEOF
--+# Make sure it works both with $CC and with simple cc.
--+# We do the test twice because some compilers refuse to overwrite an
--+# existing .o file with -o, though they will create one.
--+ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
--+rm -f conftest2.*
--+if { { case "(($ac_try" in
--+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--+ *) ac_try_echo=$ac_try;;
--+esac
--+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
--+$as_echo "$ac_try_echo"; } >&5
--+ (eval "$ac_try") 2>&5
--+ ac_status=$?
--+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--+ test $ac_status = 0; } &&
--+ test -f conftest2.$ac_objext && { { case "(($ac_try" in
--+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--+ *) ac_try_echo=$ac_try;;
--+esac
--+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
--+$as_echo "$ac_try_echo"; } >&5
--+ (eval "$ac_try") 2>&5
--+ ac_status=$?
--+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--+ test $ac_status = 0; };
--+then
--+ eval ac_cv_prog_cc_${ac_cc}_c_o=yes
--+ if test "x$CC" != xcc; then
--+ # Test first that cc exists at all.
--+ if { ac_try='cc -c conftest.$ac_ext >&5'
--+ { { case "(($ac_try" in
--+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--+ *) ac_try_echo=$ac_try;;
--+esac
--+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
--+$as_echo "$ac_try_echo"; } >&5
--+ (eval "$ac_try") 2>&5
--+ ac_status=$?
--+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--+ test $ac_status = 0; }; }; then
--+ ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
--+ rm -f conftest2.*
--+ if { { case "(($ac_try" in
--+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--+ *) ac_try_echo=$ac_try;;
--+esac
--+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
--+$as_echo "$ac_try_echo"; } >&5
--+ (eval "$ac_try") 2>&5
--+ ac_status=$?
--+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--+ test $ac_status = 0; } &&
--+ test -f conftest2.$ac_objext && { { case "(($ac_try" in
--+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--+ *) ac_try_echo=$ac_try;;
--+esac
--+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
--+$as_echo "$ac_try_echo"; } >&5
--+ (eval "$ac_try") 2>&5
--+ ac_status=$?
--+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
--+ test $ac_status = 0; };
--+ then
--+ # cc works too.
--+ :
--+ else
--+ # cc exists but doesn't like -o.
--+ eval ac_cv_prog_cc_${ac_cc}_c_o=no
--+ fi
--+ fi
--+ fi
--+else
--+ eval ac_cv_prog_cc_${ac_cc}_c_o=no
--+fi
--+rm -f core conftest*
--+
--+fi
--+if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
--+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
--+$as_echo "yes" >&6; }
--+else
--+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--+$as_echo "no" >&6; }
--+
--+$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
--+
--+fi
--+
--+# FIXME: we rely on the cache variable name because
--+# there is no other way.
--+set dummy $CC
--+am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
--+eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
--+if test "$am_t" != yes; then
--+ # Losing compiler, so override with the script.
--+ # FIXME: It is wrong to rewrite CC.
--+ # But if we don't then we get into trouble of one sort or another.
--+ # A longer-term fix would be to have automake use am__CC in this case,
--+ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
--+ CC="$am_aux_dir/compile $CC"
--+fi
--+
--
--
-- if test -n "$ac_tool_prefix"; then
--@@ -3935,7 +3834,7 @@ do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
--- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
-- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
--@@ -3979,7 +3878,7 @@ do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
--- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_prog_ac_ct_AR="$ac_prog"
-- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
--@@ -4023,13 +3922,7 @@ $as_echo_n "checking the archiver ($AR)
-- if ${am_cv_ar_interface+:} false; then :
-- $as_echo_n "(cached) " >&6
-- else
--- ac_ext=c
---ac_cpp='$CPP $CPPFLAGS'
---ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
---ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
---ac_compiler_gnu=$ac_cv_c_compiler_gnu
---
--- am_cv_ar_interface=ar
--+ am_cv_ar_interface=ar
-- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-- /* end confdefs.h. */
-- int some_variable = 0;
--@@ -4060,11 +3953,6 @@ if ac_fn_c_try_compile "$LINENO"; then :
--
-- fi
-- rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
--- ac_ext=c
---ac_cpp='$CPP $CPPFLAGS'
---ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
---ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
---ac_compiler_gnu=$ac_cv_c_compiler_gnu
--
-- fi
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_ar_interface" >&5
--@@ -4126,8 +4014,8 @@ esac
--
--
--
---macro_version='2.4.2'
---macro_revision='1.3337'
--+macro_version='2.4'
--+macro_revision='1.3293'
--
--
--
--@@ -4305,7 +4193,7 @@ do
-- for ac_prog in sed gsed; do
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
--- as_fn_executable_p "$ac_path_SED" || continue
--+ { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
-- # Check for GNU ac_path_SED and select it if it is found.
-- # Check for GNU $ac_path_SED
-- case `"$ac_path_SED" --version 2>&1` in
--@@ -4381,7 +4269,7 @@ do
-- for ac_prog in grep ggrep; do
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
--- as_fn_executable_p "$ac_path_GREP" || continue
--+ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
-- # Check for GNU ac_path_GREP and select it if it is found.
-- # Check for GNU $ac_path_GREP
-- case `"$ac_path_GREP" --version 2>&1` in
--@@ -4447,7 +4335,7 @@ do
-- for ac_prog in egrep; do
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
--- as_fn_executable_p "$ac_path_EGREP" || continue
--+ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
-- # Check for GNU ac_path_EGREP and select it if it is found.
-- # Check for GNU $ac_path_EGREP
-- case `"$ac_path_EGREP" --version 2>&1` in
--@@ -4514,7 +4402,7 @@ do
-- for ac_prog in fgrep; do
-- for ac_exec_ext in '' $ac_executable_extensions; do
-- ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
--- as_fn_executable_p "$ac_path_FGREP" || continue
--+ { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
-- # Check for GNU ac_path_FGREP and select it if it is found.
-- # Check for GNU $ac_path_FGREP
-- case `"$ac_path_FGREP" --version 2>&1` in
--@@ -4770,7 +4658,7 @@ do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
--- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
-- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
--@@ -4814,7 +4702,7 @@ do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
--- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
-- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
--@@ -4972,11 +4860,6 @@ else
-- lt_cv_sys_max_cmd_len=196608
-- ;;
--
--- os2*)
--- # The test takes a long time on OS/2.
--- lt_cv_sys_max_cmd_len=8192
--- ;;
---
-- osf*)
-- # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
-- # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
--@@ -5016,7 +4899,7 @@ else
-- # If test is not a shell built-in, we'll probably end up computing a
-- # maximum length that is only half of the actual maximum length, but
-- # we can't tell.
--- while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
--+ while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \
-- = "X$teststring$teststring"; } >/dev/null 2>&1 &&
-- test $i != 17 # 1/2 MB should be enough
-- do
--@@ -5238,7 +5121,7 @@ do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
--- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
--@@ -5278,7 +5161,7 @@ do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
--- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_prog_ac_ct_OBJDUMP="objdump"
-- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
--@@ -5445,7 +5328,7 @@ irix5* | irix6* | nonstopux*)
-- lt_cv_deplibs_check_method=pass_all
-- ;;
--
---# This must be glibc/ELF.
--+# This must be Linux ELF.
-- linux* | k*bsd*-gnu | kopensolaris*-gnu)
-- lt_cv_deplibs_check_method=pass_all
-- ;;
--@@ -5584,7 +5467,7 @@ do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
--- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
--@@ -5624,7 +5507,7 @@ do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
--- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
--@@ -5727,7 +5610,7 @@ do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
--- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
-- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
--@@ -5771,7 +5654,7 @@ do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
--- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_prog_ac_ct_AR="$ac_prog"
-- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
--@@ -5896,7 +5779,7 @@ do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
--- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
--@@ -5936,7 +5819,7 @@ do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
--- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_prog_ac_ct_STRIP="strip"
-- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
--@@ -5995,7 +5878,7 @@ do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
--- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
--@@ -6035,7 +5918,7 @@ do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
--- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_prog_ac_ct_RANLIB="ranlib"
-- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
--@@ -6085,13 +5968,13 @@ old_postuninstall_cmds=
-- if test -n "$RANLIB"; then
-- case $host_os in
-- openbsd*)
--- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
--+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
-- ;;
-- *)
--- old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
--+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
-- ;;
-- esac
--- old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
--+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-- fi
--
-- case $host_os in
--@@ -6238,7 +6121,6 @@ for ac_symprfx in "" "_"; do
-- # which start with @ or ?.
-- lt_cv_sys_global_symbol_pipe="$AWK '"\
-- " {last_section=section; section=\$ 3};"\
---" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
-- " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
-- " \$ 0!~/External *\|/{next};"\
-- " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
--@@ -6627,7 +6509,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
-- CFLAGS="$SAVE_CFLAGS"
-- fi
-- ;;
---*-*solaris*)
--+sparc*-*solaris*)
-- # Find out which ABI we are using.
-- echo 'int i;' > conftest.$ac_ext
-- if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
--@@ -6638,20 +6520,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
-- case `/usr/bin/file conftest.o` in
-- *64-bit*)
-- case $lt_cv_prog_gnu_ld in
--- yes*)
--- case $host in
--- i?86-*-solaris*)
--- LD="${LD-ld} -m elf_x86_64"
--- ;;
--- sparc*-*-solaris*)
--- LD="${LD-ld} -m elf64_sparc"
--- ;;
--- esac
--- # GNU ld 2.21 introduced _sol2 emulations. Use them if available.
--- if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
--- LD="${LD-ld}_sol2"
--- fi
--- ;;
--+ yes*) LD="${LD-ld} -m elf64_sparc" ;;
-- *)
-- if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
-- LD="${LD-ld} -64"
--@@ -6684,7 +6553,7 @@ do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
--- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
-- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
--@@ -6724,7 +6593,7 @@ do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
--- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
-- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
--@@ -6804,7 +6673,7 @@ do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
--- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
-- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
--@@ -6844,7 +6713,7 @@ do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
--- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
-- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
--@@ -6896,7 +6765,7 @@ do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
--- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
-- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
--@@ -6936,7 +6805,7 @@ do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
--- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_prog_ac_ct_NMEDIT="nmedit"
-- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
--@@ -6988,7 +6857,7 @@ do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
--- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
-- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
--@@ -7028,7 +6897,7 @@ do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
--- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_prog_ac_ct_LIPO="lipo"
-- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
--@@ -7080,7 +6949,7 @@ do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
--- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
-- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
--@@ -7120,7 +6989,7 @@ do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
--- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_prog_ac_ct_OTOOL="otool"
-- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
--@@ -7172,7 +7041,7 @@ do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
--- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
-- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
--@@ -7212,7 +7081,7 @@ do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
--- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_prog_ac_ct_OTOOL64="otool64"
-- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
--@@ -7291,13 +7160,7 @@ else
-- $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
-- -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
-- _lt_result=$?
--- # If there is a non-empty error log, and "single_module"
--- # appears in it, assume the flag caused a linker warning
--- if test -s conftest.err && $GREP single_module conftest.err; then
--- cat conftest.err >&5
--- # Otherwise, if the output was created with a 0 exit code from
--- # the compiler, it worked.
--- elif test -f libconftest.dylib && test $_lt_result -eq 0; then
--+ if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
-- lt_cv_apple_cc_single_mod=yes
-- else
-- cat conftest.err >&5
--@@ -7308,7 +7171,6 @@ else
-- fi
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
-- $as_echo "$lt_cv_apple_cc_single_mod" >&6; }
---
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
-- $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
-- if ${lt_cv_ld_exported_symbols_list+:} false; then :
--@@ -7341,7 +7203,6 @@ rm -f core conftest.err conftest.$ac_obj
-- fi
-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
-- $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
---
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
-- $as_echo_n "checking for -force_load linker flag... " >&6; }
-- if ${lt_cv_ld_force_load+:} false; then :
--@@ -7363,9 +7224,7 @@ _LT_EOF
-- echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
-- $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
-- _lt_result=$?
--- if test -s conftest.err && $GREP force_load conftest.err; then
--- cat conftest.err >&5
--- elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
--+ if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then
-- lt_cv_ld_force_load=yes
-- else
-- cat conftest.err >&5
--@@ -7740,22 +7599,7 @@ fi
--
-- # Check whether --with-pic was given.
-- if test "${with_pic+set}" = set; then :
--- withval=$with_pic; lt_p=${PACKAGE-default}
--- case $withval in
--- yes|no) pic_mode=$withval ;;
--- *)
--- pic_mode=default
--- # Look at the argument we got. We use all the common list separators.
--- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
--- for lt_pkg in $withval; do
--- IFS="$lt_save_ifs"
--- if test "X$lt_pkg" = "X$lt_p"; then
--- pic_mode=yes
--- fi
--- done
--- IFS="$lt_save_ifs"
--- ;;
--- esac
--+ withval=$with_pic; pic_mode="$withval"
-- else
-- pic_mode=default
-- fi
--@@ -7833,10 +7677,6 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo
--
--
--
---
---
---
---
-- test -z "$LN_S" && LN_S="ln -s"
--
--
--@@ -8126,10 +7966,6 @@ _lt_linker_boilerplate=`cat conftest.err
-- $RM -r conftest*
--
--
---## CAVEAT EMPTOR:
---## There is no encapsulation within the following macros, do not change
---## the running order or otherwise move them around unless you know exactly
---## what you are doing...
-- if test -n "$compiler"; then
--
-- lt_prog_compiler_no_builtin_flag=
--@@ -8296,9 +8132,7 @@ lt_prog_compiler_static=
-- case $cc_basename in
-- nvcc*) # Cuda Compiler Driver 2.2
-- lt_prog_compiler_wl='-Xlinker '
--- if test -n "$lt_prog_compiler_pic"; then
--- lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
--- fi
--+ lt_prog_compiler_pic='-Xcompiler -fPIC'
-- ;;
-- esac
-- else
--@@ -8389,33 +8223,18 @@ lt_prog_compiler_static=
-- ;;
-- *)
-- case `$CC -V 2>&1 | sed 5q` in
--- *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
--+ *Sun\ F* | *Sun*Fortran*)
-- # Sun Fortran 8.3 passes all unrecognized flags to the linker
-- lt_prog_compiler_pic='-KPIC'
-- lt_prog_compiler_static='-Bstatic'
-- lt_prog_compiler_wl=''
-- ;;
--- *Sun\ F* | *Sun*Fortran*)
--- lt_prog_compiler_pic='-KPIC'
--- lt_prog_compiler_static='-Bstatic'
--- lt_prog_compiler_wl='-Qoption ld '
--- ;;
-- *Sun\ C*)
-- # Sun C 5.9
-- lt_prog_compiler_pic='-KPIC'
-- lt_prog_compiler_static='-Bstatic'
-- lt_prog_compiler_wl='-Wl,'
-- ;;
--- *Intel*\ [CF]*Compiler*)
--- lt_prog_compiler_wl='-Wl,'
--- lt_prog_compiler_pic='-fPIC'
--- lt_prog_compiler_static='-static'
--- ;;
--- *Portland\ Group*)
--- lt_prog_compiler_wl='-Wl,'
--- lt_prog_compiler_pic='-fpic'
--- lt_prog_compiler_static='-Bstatic'
--- ;;
-- esac
-- ;;
-- esac
--@@ -8777,6 +8596,7 @@ $as_echo_n "checking whether the $compil
-- hardcode_direct=no
-- hardcode_direct_absolute=no
-- hardcode_libdir_flag_spec=
--+ hardcode_libdir_flag_spec_ld=
-- hardcode_libdir_separator=
-- hardcode_minus_L=no
-- hardcode_shlibpath_var=unsupported
--@@ -9026,7 +8846,8 @@ _LT_EOF
-- xlf* | bgf* | bgxlf* | mpixlf*)
-- # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
-- whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
--- hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
--+ hardcode_libdir_flag_spec=
--+ hardcode_libdir_flag_spec_ld='-rpath $libdir'
-- archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
-- if test "x$supports_anon_versioning" = xyes; then
-- archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
--@@ -9405,7 +9226,6 @@ fi
-- # The linker will not automatically build a static lib if we build a DLL.
-- # _LT_TAGVAR(old_archive_from_new_cmds, )='true'
-- enable_shared_with_static_runtimes=yes
--- exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
-- export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
-- # Don't use ranlib
-- old_postinstall_cmds='chmod 644 $oldlib'
--@@ -9451,7 +9271,6 @@ fi
-- hardcode_shlibpath_var=unsupported
-- if test "$lt_cv_ld_force_load" = "yes"; then
-- whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
---
-- else
-- whole_archive_flag_spec=''
-- fi
--@@ -9480,6 +9299,10 @@ fi
-- hardcode_shlibpath_var=no
-- ;;
--
--+ freebsd1*)
--+ ld_shlibs=no
--+ ;;
--+
-- # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-- # support. Future versions do this automatically, but an explicit c++rt0.o
-- # does not break anything, and helps significantly (at the cost of a little
--@@ -9492,7 +9315,7 @@ fi
-- ;;
--
-- # Unfortunately, older versions of FreeBSD 2 do not have this feature.
--- freebsd2.*)
--+ freebsd2*)
-- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-- hardcode_direct=yes
-- hardcode_minus_L=yes
--@@ -9531,6 +9354,7 @@ fi
-- fi
-- if test "$with_gnu_ld" = no; then
-- hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
--+ hardcode_libdir_flag_spec_ld='+b $libdir'
-- hardcode_libdir_separator=:
-- hardcode_direct=yes
-- hardcode_direct_absolute=yes
--@@ -10154,6 +9978,11 @@ esac
--
--
--
--+
--+
--+
--+
--+
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
-- $as_echo_n "checking dynamic linker characteristics... " >&6; }
--
--@@ -10243,7 +10072,7 @@ need_version=unknown
--
-- case $host_os in
-- aix3*)
--- version_type=linux # correct to gnu/linux during the next big refactor
--+ version_type=linux
-- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-- shlibpath_var=LIBPATH
--
--@@ -10252,7 +10081,7 @@ aix3*)
-- ;;
--
-- aix[4-9]*)
--- version_type=linux # correct to gnu/linux during the next big refactor
--+ version_type=linux
-- need_lib_prefix=no
-- need_version=no
-- hardcode_into_libs=yes
--@@ -10317,7 +10146,7 @@ beos*)
-- ;;
--
-- bsdi[45]*)
--- version_type=linux # correct to gnu/linux during the next big refactor
--+ version_type=linux
-- need_version=no
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
--@@ -10456,7 +10285,7 @@ darwin* | rhapsody*)
-- ;;
--
-- dgux*)
--- version_type=linux # correct to gnu/linux during the next big refactor
--+ version_type=linux
-- need_lib_prefix=no
-- need_version=no
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
--@@ -10464,6 +10293,10 @@ dgux*)
-- shlibpath_var=LD_LIBRARY_PATH
-- ;;
--
--+freebsd1*)
--+ dynamic_linker=no
--+ ;;
--+
-- freebsd* | dragonfly*)
-- # DragonFly does not have aout. When/if they implement a new
-- # versioning mechanism, adjust this.
--@@ -10471,7 +10304,7 @@ freebsd* | dragonfly*)
-- objformat=`/usr/bin/objformat`
-- else
-- case $host_os in
--- freebsd[23].*) objformat=aout ;;
--+ freebsd[123]*) objformat=aout ;;
-- *) objformat=elf ;;
-- esac
-- fi
--@@ -10489,7 +10322,7 @@ freebsd* | dragonfly*)
-- esac
-- shlibpath_var=LD_LIBRARY_PATH
-- case $host_os in
--- freebsd2.*)
--+ freebsd2*)
-- shlibpath_overrides_runpath=yes
-- ;;
-- freebsd3.[01]* | freebsdelf3.[01]*)
--@@ -10509,18 +10342,17 @@ freebsd* | dragonfly*)
-- ;;
--
-- gnu*)
--- version_type=linux # correct to gnu/linux during the next big refactor
--+ version_type=linux
-- need_lib_prefix=no
-- need_version=no
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- shlibpath_var=LD_LIBRARY_PATH
--- shlibpath_overrides_runpath=no
-- hardcode_into_libs=yes
-- ;;
--
-- haiku*)
--- version_type=linux # correct to gnu/linux during the next big refactor
--+ version_type=linux
-- need_lib_prefix=no
-- need_version=no
-- dynamic_linker="$host_os runtime_loader"
--@@ -10581,7 +10413,7 @@ hpux9* | hpux10* | hpux11*)
-- ;;
--
-- interix[3-9]*)
--- version_type=linux # correct to gnu/linux during the next big refactor
--+ version_type=linux
-- need_lib_prefix=no
-- need_version=no
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
--@@ -10597,7 +10429,7 @@ irix5* | irix6* | nonstopux*)
-- nonstopux*) version_type=nonstopux ;;
-- *)
-- if test "$lt_cv_prog_gnu_ld" = yes; then
--- version_type=linux # correct to gnu/linux during the next big refactor
--+ version_type=linux
-- else
-- version_type=irix
-- fi ;;
--@@ -10634,9 +10466,9 @@ linux*oldld* | linux*aout* | linux*coff*
-- dynamic_linker=no
-- ;;
--
---# This must be glibc/ELF.
--+# This must be Linux ELF.
-- linux* | k*bsd*-gnu | kopensolaris*-gnu)
--- version_type=linux # correct to gnu/linux during the next big refactor
--+ version_type=linux
-- need_lib_prefix=no
-- need_version=no
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--@@ -10718,7 +10550,7 @@ netbsd*)
-- ;;
--
-- newsos6)
--- version_type=linux # correct to gnu/linux during the next big refactor
--+ version_type=linux
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-- shlibpath_var=LD_LIBRARY_PATH
-- shlibpath_overrides_runpath=yes
--@@ -10787,7 +10619,7 @@ rdos*)
-- ;;
--
-- solaris*)
--- version_type=linux # correct to gnu/linux during the next big refactor
--+ version_type=linux
-- need_lib_prefix=no
-- need_version=no
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--@@ -10812,7 +10644,7 @@ sunos4*)
-- ;;
--
-- sysv4 | sysv4.3*)
--- version_type=linux # correct to gnu/linux during the next big refactor
--+ version_type=linux
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- shlibpath_var=LD_LIBRARY_PATH
--@@ -10836,7 +10668,7 @@ sysv4 | sysv4.3*)
--
-- sysv4*MP*)
-- if test -d /usr/nec ;then
--- version_type=linux # correct to gnu/linux during the next big refactor
--+ version_type=linux
-- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-- soname_spec='$libname${shared_ext}.$major'
-- shlibpath_var=LD_LIBRARY_PATH
--@@ -10867,7 +10699,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware*
--
-- tpf*)
-- # TPF is a cross-target only. Preferred cross-host = GNU/Linux.
--- version_type=linux # correct to gnu/linux during the next big refactor
--+ version_type=linux
-- need_lib_prefix=no
-- need_version=no
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
--@@ -10877,7 +10709,7 @@ tpf*)
-- ;;
--
-- uts4*)
--- version_type=linux # correct to gnu/linux during the next big refactor
--+ version_type=linux
-- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-- soname_spec='${libname}${release}${shared_ext}$major'
-- shlibpath_var=LD_LIBRARY_PATH
--@@ -11659,8 +11491,6 @@ CC="$lt_save_CC"
--
--
--
---
---
-- ac_config_commands="$ac_config_commands libtool"
--
--
--@@ -11726,7 +11556,7 @@ do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
--- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
--@@ -11769,7 +11599,7 @@ do
-- IFS=$as_save_IFS
-- test -z "$as_dir" && as_dir=.
-- for ac_exec_ext in '' $ac_executable_extensions; do
--- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
--+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-- ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-- break 2
--@@ -11932,7 +11762,7 @@ regular_CFLAGS="-Wall -Waggregate-return
-- if test -n "$kbuilddir"; then
-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel version that we will build against" >&5
-- $as_echo_n "checking kernel version that we will build against... " >&6; }
--- krel="$(make -sC "$kbuilddir" M=$PWD kernelrelease)";
--+ krel="$(make -sC "$kbuilddir" M=$PWD kernelversion)";
-- kmajor="${krel%%[^0-9]*}";
-- kmajor="$(($kmajor+0))";
-- krel="${krel:${#kmajor}}";
--@@ -12076,14 +11906,6 @@ LIBOBJS=$ac_libobjs
-- LTLIBOBJS=$ac_ltlibobjs
--
--
---{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5
---$as_echo_n "checking that generated files are newer than configure... " >&6; }
--- if test -n "$am_sleep_pid"; then
--- # Hide warnings about reused PIDs.
--- wait $am_sleep_pid 2>/dev/null
--- fi
--- { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
---$as_echo "done" >&6; }
-- if test -n "$EXEEXT"; then
-- am__EXEEXT_TRUE=
-- am__EXEEXT_FALSE='#'
--@@ -12398,16 +12220,16 @@ if (echo >conf$$.file) 2>/dev/null; then
-- # ... but there are two gotchas:
-- # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
-- # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
--- # In both cases, we have to default to `cp -pR'.
--+ # In both cases, we have to default to `cp -p'.
-- ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
--- as_ln_s='cp -pR'
--+ as_ln_s='cp -p'
-- elif ln conf$$.file conf$$ 2>/dev/null; then
-- as_ln_s=ln
-- else
--- as_ln_s='cp -pR'
--+ as_ln_s='cp -p'
-- fi
-- else
--- as_ln_s='cp -pR'
--+ as_ln_s='cp -p'
-- fi
-- rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
-- rmdir conf$$.dir 2>/dev/null
--@@ -12467,16 +12289,28 @@ else
-- as_mkdir_p=false
-- fi
--
---
---# as_fn_executable_p FILE
---# -----------------------
---# Test if FILE is an executable regular file.
---as_fn_executable_p ()
---{
--- test -f "$1" && test -x "$1"
---} # as_fn_executable_p
---as_test_x='test -x'
---as_executable_p=as_fn_executable_p
--+if test -x / >/dev/null 2>&1; then
--+ as_test_x='test -x'
--+else
--+ if ls -dL / >/dev/null 2>&1; then
--+ as_ls_L_option=L
--+ else
--+ as_ls_L_option=
--+ fi
--+ as_test_x='
--+ eval sh -c '\''
--+ if test -d "$1"; then
--+ test -d "$1/.";
--+ else
--+ case $1 in #(
--+ -*)set "./$1";;
--+ esac;
--+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
--+ ???[sx]*):;;*)false;;esac;fi
--+ '\'' sh
--+ '
--+fi
--+as_executable_p=$as_test_x
--
-- # Sed expression to map a string onto a valid CPP name.
-- as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
--@@ -12498,7 +12332,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_wri
-- # values after options handling.
-- ac_log="
-- This file was extended by xtables-addons $as_me 2.5, which was
---generated by GNU Autoconf 2.69. Invocation command line was
--+generated by GNU Autoconf 2.68. Invocation command line was
--
-- CONFIG_FILES = $CONFIG_FILES
-- CONFIG_HEADERS = $CONFIG_HEADERS
--@@ -12564,10 +12398,10 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_writ
-- ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
-- ac_cs_version="\\
-- xtables-addons config.status 2.5
---configured by $0, generated by GNU Autoconf 2.69,
--+configured by $0, generated by GNU Autoconf 2.68,
-- with options \\"\$ac_cs_config\\"
--
---Copyright (C) 2012 Free Software Foundation, Inc.
--+Copyright (C) 2010 Free Software Foundation, Inc.
-- This config.status script is free software; the Free Software Foundation
-- gives unlimited permission to copy, distribute and modify it."
--
--@@ -12658,7 +12492,7 @@ fi
-- _ACEOF
-- cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-- if \$ac_cs_recheck; then
--- set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
--+ set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-- shift
-- \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
-- CONFIG_SHELL='$SHELL'
--@@ -12700,7 +12534,6 @@ pic_mode='`$ECHO "$pic_mode" | $SED "$de
-- enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
-- SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
-- ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
---PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
-- host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
-- host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
-- host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
--@@ -12783,6 +12616,7 @@ with_gnu_ld='`$ECHO "$with_gnu_ld" | $SE
-- allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
-- no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
-- hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
--+hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`'
-- hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
-- hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
-- hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
--@@ -12838,7 +12672,6 @@ _LTECHO_EOF'
-- # Quote evaled strings.
-- for var in SHELL \
-- ECHO \
---PATH_SEPARATOR \
-- SED \
-- GREP \
-- EGREP \
--@@ -12889,6 +12722,7 @@ with_gnu_ld \
-- allow_undefined_flag \
-- no_undefined_flag \
-- hardcode_libdir_flag_spec \
--+hardcode_libdir_flag_spec_ld \
-- hardcode_libdir_separator \
-- exclude_expsyms \
-- include_expsyms \
--@@ -13575,7 +13409,7 @@ $as_echo "$as_me: executing $ac_file com
--
-- case $ac_file$ac_mode in
-- "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
--- # Older Autoconf quotes --file arguments for eval, but not when files
--+ # Autoconf 2.62 quotes --file arguments for eval, but not when files
-- # are listed without --file. Let's play safe and only enable the eval
-- # if we detect the quoting.
-- case $CONFIG_FILES in
--@@ -13588,7 +13422,7 @@ $as_echo "$as_me: executing $ac_file com
-- # Strip MF so we end up with the name of the file.
-- mf=`echo "$mf" | sed -e 's/:.*$//'`
-- # Check whether this is an Automake generated Makefile or not.
--- # We used to match only the files named 'Makefile.in', but
--+ # We used to match only the files named `Makefile.in', but
-- # some people rename them; so instead we look at the file content.
-- # Grep'ing the first line is not enough: some people post-process
-- # each Makefile.in and add a new line on top of each file to say so.
--@@ -13622,19 +13456,21 @@ $as_echo X"$mf" |
-- continue
-- fi
-- # Extract the definition of DEPDIR, am__include, and am__quote
--- # from the Makefile without running 'make'.
--+ # from the Makefile without running `make'.
-- DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-- test -z "$DEPDIR" && continue
-- am__include=`sed -n 's/^am__include = //p' < "$mf"`
--- test -z "$am__include" && continue
--+ test -z "am__include" && continue
-- am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
--+ # When using ansi2knr, U may be empty or an underscore; expand it
--+ U=`sed -n 's/^U = //p' < "$mf"`
-- # Find all dependency output files, they are included files with
-- # $(DEPDIR) in their names. We invoke sed twice because it is the
-- # simplest approach to changing $(DEPDIR) to its actual value in the
-- # expansion.
-- for file in `sed -n "
-- s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
--- sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do
--+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-- # Make sure the directory exists.
-- test -f "$dirpart/$file" && continue
-- fdir=`$as_dirname -- "$file" ||
--@@ -13688,8 +13524,8 @@ $as_echo X"$file" |
-- # NOTE: Changes made to this file will be lost: look at ltmain.sh.
-- #
-- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
---# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
---# Foundation, Inc.
--+# 2006, 2007, 2008, 2009, 2010 Free Software Foundation,
--+# Inc.
-- # Written by Gordon Matzigkeit, 1996
-- #
-- # This file is part of GNU Libtool.
--@@ -13743,9 +13579,6 @@ SHELL=$lt_SHELL
-- # An echo program that protects backslashes.
-- ECHO=$lt_ECHO
--
---# The PATH separator for the build system.
---PATH_SEPARATOR=$lt_PATH_SEPARATOR
---
-- # The host system.
-- host_alias=$host_alias
-- host=$host
--@@ -14047,6 +13880,10 @@ no_undefined_flag=$lt_no_undefined_flag
-- # This must work even if \$libdir does not exist
-- hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
--
--+# If ld is used when linking, flag to hardcode \$libdir into a binary
--+# during linking. This must work even if \$libdir does not exist.
--+hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
--+
-- # Whether we need a single "-rpath" flag with a separated argument.
-- hardcode_libdir_separator=$lt_hardcode_libdir_separator
--
- --- a/configure.ac
- +++ b/configure.ac
--@@ -44,7 +44,7 @@ regular_CFLAGS="-Wall -Waggregate-return
-+@@ -44,7 +44,7 @@ regular_CFLAGS="-Wall -Waggregate-return -Wmissing-declarations \
-
- if test -n "$kbuilddir"; then
- AC_MSG_CHECKING([kernel version that we will build against])
--- krel="$(make -sC "$kbuilddir" M=$PWD kernelrelease)";
--+ krel="$(make -sC "$kbuilddir" M=$PWD kernelversion)";
-- kmajor="${krel%%[[^0-9]]*}";
-- kmajor="$(($kmajor+0))";
-- krel="${krel:${#kmajor}}";
-+- krel="$(make -sC "$kbuilddir" M=$PWD kernelrelease | $AWK -v 'FS=[[^0-9.]]' '{print $1; exit}')";
-++ krel="$(make -sC "$kbuilddir" M=$PWD kernelversion | $AWK -v 'FS=[[^0-9.]]' '{print $1; exit}')";
-+ save_IFS=$IFS;
-+ IFS='.';
-+ set x $krel;
diff --git a/patches/openwrt/0024-tools-add-tar-host-build-required-for-sort-name-which-was-only-added-in-the-latest-version.patch b/patches/openwrt/0024-tools-add-tar-host-build-required-for-sort-name-which-was-only-added-in-the-latest-version.patch
deleted file mode 100644
index b62bb8fb07a37b407a002869ee6b511f478259fc..0000000000000000000000000000000000000000
--- a/patches/openwrt/0024-tools-add-tar-host-build-required-for-sort-name-which-was-only-added-in-the-latest-version.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Sun, 24 Apr 2016 08:44:30 +0200
-Subject: tools: add tar host build, required for --sort=name which was only added in the latest version
-
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
-
-Backport of r46876
-
-diff --git a/tools/Makefile b/tools/Makefile
-index c6cded8eccd81c422f99e7ee50754c4bc66decc7..98ce8c5f1577981136b277a800a3edd5edd4941e 100644
---- a/tools/Makefile
-+++ b/tools/Makefile
-@@ -81,6 +81,9 @@ endif
- # dependency for tools which have patches directory
- $(foreach tool, $(tools-y), $(if $(wildcard $(curdir)/$(tool)/patches),$(eval $(curdir)/$(tool)/compile += $(curdir)/patch/install)))
-
-+$(foreach tool, $(tools-y), $(eval $(curdir)/$(tool)/compile += $(curdir)/tar/install))
-+tools-y += tar
-+
- $(curdir)/builddirs := $(tools-y) $(tools-dep) $(tools-)
- $(curdir)/builddirs-default := $(tools-y)
-
-diff --git a/tools/tar/Makefile b/tools/tar/Makefile
-new file mode 100644
-index 0000000000000000000000000000000000000000..975e7835ef09131326ef10a7951c3866d6050801
---- /dev/null
-+++ b/tools/tar/Makefile
-@@ -0,0 +1,30 @@
-+#
-+# Copyright (C) 2015 OpenWrt.org
-+#
-+# This is free software, licensed under the GNU General Public License v2.
-+# See /LICENSE for more information.
-+#
-+include $(TOPDIR)/rules.mk
-+
-+PKG_NAME:=tar
-+PKG_VERSION:=1.28
-+
-+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-+PKG_SOURCE_URL:=@GNU/tar
-+PKG_MD5SUM:=49b6306167724fe48f419a33a5beb857
-+
-+HOST_BUILD_PARALLEL := 1
-+
-+include $(INCLUDE_DIR)/host-build.mk
-+
-+HOSTCC := $(HOSTCC_NOCACHE)
-+HOSTCXX := $(HOSTCXX_NOCACHE)
-+
-+HOST_CONFIGURE_ARGS += \
-+ --without-posix-acls \
-+ --without-selinux \
-+ --without-xattrs \
-+ --disable-acl \
-+ --disable-nls
-+
-+$(eval $(call HostBuild))
-diff --git a/tools/tar/patches/100-fix_xattr_disable.patch b/tools/tar/patches/100-fix_xattr_disable.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..5735bd2364a4f324b54a3a49826921ead905d06f
---- /dev/null
-+++ b/tools/tar/patches/100-fix_xattr_disable.patch
-@@ -0,0 +1,17 @@
-+--- a/lib/xattr-at.c
-++++ b/lib/xattr-at.c
-+@@ -18,6 +18,8 @@
-+
-+ #include <config.h>
-+
-++#ifdef HAVE_XATTRS
-++
-+ #include "xattr-at.h"
-+ #include "openat.h"
-+
-+@@ -108,3 +110,5 @@
-+ #undef AT_FUNC_RESULT
-+ #undef AT_FUNC_POST_FILE_PARAM_DECLS
-+ #undef AT_FUNC_POST_FILE_ARGS
-++
-++#endif
diff --git a/patches/openwrt/0025-tools-compile-flock-before-everything-else.patch b/patches/openwrt/0025-tools-compile-flock-before-everything-else.patch
deleted file mode 100644
index 5cfd010a871e76345bc94377f8195b9eb0c02fc5..0000000000000000000000000000000000000000
--- a/patches/openwrt/0025-tools-compile-flock-before-everything-else.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Sun, 24 Apr 2016 08:44:47 +0200
-Subject: tools: compile flock before everything else
-
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
-
-Backport of r48413
-
-diff --git a/tools/Makefile b/tools/Makefile
-index 98ce8c5f1577981136b277a800a3edd5edd4941e..3402c08d5c6729a510446a3e9cf586f2d8e15be4 100644
---- a/tools/Makefile
-+++ b/tools/Makefile
-@@ -26,7 +26,7 @@ endif
- tools-$(BUILD_TOOLCHAIN) += gmp mpfr mpc libelf
- tools-y += m4 libtool autoconf automake flex bison pkg-config sed mklibs
- tools-y += sstrip make-ext4fs e2fsprogs mtd-utils mkimage
--tools-y += firmware-utils patch-image patch quilt yaffs2 flock padjffs2
-+tools-y += firmware-utils patch-image patch quilt yaffs2 padjffs2
- tools-y += mm-macros missing-macros xz cmake scons bc findutils gengetopt patchelf
- tools-$(CONFIG_TARGET_orion_generic) += wrt350nv2-builder upslug2
- tools-$(CONFIG_powerpc) += upx
-@@ -84,6 +84,9 @@ $(foreach tool, $(tools-y), $(if $(wildcard $(curdir)/$(tool)/patches),$(eval $(
- $(foreach tool, $(tools-y), $(eval $(curdir)/$(tool)/compile += $(curdir)/tar/install))
- tools-y += tar
-
-+$(curdir)/tar/compile := $(curdir)/flock/install
-+tools-y += flock
-+
- $(curdir)/builddirs := $(tools-y) $(tools-dep) $(tools-)
- $(curdir)/builddirs-default := $(tools-y)
-
diff --git a/patches/openwrt/0026-rules.mk-make-the-locked-template-available-even-if-flock-has-not-been-built-yet-fall-back-to-unlocked-shell-command.patch b/patches/openwrt/0026-rules.mk-make-the-locked-template-available-even-if-flock-has-not-been-built-yet-fall-back-to-unlocked-shell-command.patch
deleted file mode 100644
index e11465001a9130400f4be35aa6e6d262dd72cf17..0000000000000000000000000000000000000000
--- a/patches/openwrt/0026-rules.mk-make-the-locked-template-available-even-if-flock-has-not-been-built-yet-fall-back-to-unlocked-shell-command.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Sun, 24 Apr 2016 08:45:44 +0200
-Subject: rules.mk: make the locked template available even if flock has not been built yet (fall back to unlocked shell command)
-
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
-
-Backport of r48414
-
-diff --git a/rules.mk b/rules.mk
-index 9d0134d2b26a52b74d30546cc3d51f7e71d1bc75..ece502609bd08af21be782a706f0bf6599895568 100644
---- a/rules.mk
-+++ b/rules.mk
-@@ -310,12 +310,16 @@ endef
- # Execute commands under flock
- # $(1) => The shell expression.
- # $(2) => The lock name. If not given, the global lock will be used.
--define locked
-+ifneq ($(wildcard $(STAGING_DIR_HOST)/bin/flock),)
-+ define locked
- SHELL= \
-- $(STAGING_DIR_HOST)/bin/flock \
-+ flock \
- $(TMP_DIR)/.$(if $(2),$(strip $(2)),global).flock \
- -c '$(subst ','\'',$(1))'
--endef
-+ endef
-+else
-+ locked=$(1)
-+endif
-
- # Recursively copy paths into another directory, purge dangling
- # symlinks before.
diff --git a/patches/openwrt/0027-build-add-locking-for-downloads-fixes-race-conditions-with-multiple-variants.patch b/patches/openwrt/0027-build-add-locking-for-downloads-fixes-race-conditions-with-multiple-variants.patch
deleted file mode 100644
index 47fef84828ce60987b19ea23d2ec2acf4563ff87..0000000000000000000000000000000000000000
--- a/patches/openwrt/0027-build-add-locking-for-downloads-fixes-race-conditions-with-multiple-variants.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Sun, 24 Apr 2016 08:48:45 +0200
-Subject: build: add locking for downloads (fixes race conditions with multiple variants)
-
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
-
-Backport of r48416
-
-diff --git a/include/download.mk b/include/download.mk
-index e518cce4b2793152b7f4ef92509f2be07fb5cd62..9176b11c836123a37533c3d6cbaa2650a4f7c73d 100644
---- a/include/download.mk
-+++ b/include/download.mk
-@@ -182,6 +182,6 @@ define Download
-
- $(DL_DIR)/$(FILE):
- mkdir -p $(DL_DIR)
-- $(if $(DownloadMethod/$(call dl_method,$(URL),$(PROTO))),$(DownloadMethod/$(call dl_method,$(URL),$(PROTO))),$(DownloadMethod/unknown))
-+ $(call locked,$(if $(DownloadMethod/$(call dl_method,$(URL),$(PROTO))),$(DownloadMethod/$(call dl_method,$(URL),$(PROTO))),$(DownloadMethod/unknown)),$(FILE))
-
- endef
diff --git a/patches/openwrt/0028-download.mk-fix-packed-checkout-mirroring-support.patch b/patches/openwrt/0028-download.mk-fix-packed-checkout-mirroring-support.patch
deleted file mode 100644
index 6dbe8b68b8cbb98c4f2664cc02febbeddb9ce3a5..0000000000000000000000000000000000000000
--- a/patches/openwrt/0028-download.mk-fix-packed-checkout-mirroring-support.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Sun, 24 Apr 2016 08:49:27 +0200
-Subject: download.mk: fix packed checkout mirroring support
-
-Changeset r48416 broke the downloading of mirrored, packed scm checkouts.
-
-Fix this by removing the "@" sign in front of the download command which is
-now executed as part of a larger shell command under flock.
-
-Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
-
-Backport of r48733
-
-diff --git a/include/download.mk b/include/download.mk
-index 9176b11c836123a37533c3d6cbaa2650a4f7c73d..130bbc57ba89b4ad0b8e8600f45bf553ad6ecfa1 100644
---- a/include/download.mk
-+++ b/include/download.mk
-@@ -48,7 +48,7 @@ define DownloadMethod/default
- endef
-
- define wrap_mirror
-- $(if $(if $(MIRROR),$(filter-out x,$(MIRROR_MD5SUM))),@$(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(FILE)" "$(MIRROR_MD5SUM)" "" || ( $(1) ),$(1))
-+$(if $(if $(MIRROR),$(filter-out x,$(MIRROR_MD5SUM))),$(SCRIPT_DIR)/download.pl "$(DL_DIR)" "$(FILE)" "$(MIRROR_MD5SUM)" "" || ( $(1) ),$(1))
- endef
-
- define DownloadMethod/cvs
diff --git a/patches/openwrt/0029-kernel-backport-spi-nor-driver-from-4.4.9.patch b/patches/openwrt/0029-kernel-backport-spi-nor-driver-from-4.4.9.patch
deleted file mode 100644
index 382df737a4b5cef947ddc9845e1c68108e4828c3..0000000000000000000000000000000000000000
--- a/patches/openwrt/0029-kernel-backport-spi-nor-driver-from-4.4.9.patch
+++ /dev/null
@@ -1,2096 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Sat, 7 May 2016 00:07:51 +0200
-Subject: kernel: backport spi-nor driver from 4.4.9
-
-diff --git a/target/linux/ar71xx/patches-3.18/407-mtd-m25p80-allow-to-pass-probe-types-via-platform-data.patch b/target/linux/ar71xx/patches-3.18/407-mtd-m25p80-allow-to-pass-probe-types-via-platform-data.patch
-index 568f5161b1e4639c005577ea46c2e0411f95ec7c..6a9132032ff1cefae213464d3212ef0d4e4b8011 100644
---- a/target/linux/ar71xx/patches-3.18/407-mtd-m25p80-allow-to-pass-probe-types-via-platform-data.patch
-+++ b/target/linux/ar71xx/patches-3.18/407-mtd-m25p80-allow-to-pass-probe-types-via-platform-data.patch
-@@ -1,11 +1,11 @@
- --- a/drivers/mtd/devices/m25p80.c
- +++ b/drivers/mtd/devices/m25p80.c
--@@ -246,7 +246,9 @@ static int m25p_probe(struct spi_device
-+@@ -229,7 +229,9 @@ static int m25p_probe(struct spi_device
-
- ppdata.of_node = spi->dev.of_node;
-
--- return mtd_device_parse_register(&flash->mtd, NULL, &ppdata,
--+ return mtd_device_parse_register(&flash->mtd,
-+- return mtd_device_parse_register(&nor->mtd, NULL, &ppdata,
-++ return mtd_device_parse_register(&nor->mtd,
- + data ? data->part_probes : NULL,
- + &ppdata,
- data ? data->parts : NULL,
-diff --git a/target/linux/ar71xx/patches-3.18/412-mtd-m25p80-zero-partition-parser-data.patch b/target/linux/ar71xx/patches-3.18/412-mtd-m25p80-zero-partition-parser-data.patch
-index d51694d9fd2d6fa5a519ce27108c964b1b6f32f8..175acf630e0d0437936066b51ea086cf39740b30 100644
---- a/target/linux/ar71xx/patches-3.18/412-mtd-m25p80-zero-partition-parser-data.patch
-+++ b/target/linux/ar71xx/patches-3.18/412-mtd-m25p80-zero-partition-parser-data.patch
-@@ -1,10 +1,10 @@
- --- a/drivers/mtd/devices/m25p80.c
- +++ b/drivers/mtd/devices/m25p80.c
--@@ -244,6 +244,7 @@ static int m25p_probe(struct spi_device
-+@@ -227,6 +227,7 @@ static int m25p_probe(struct spi_device
- if (ret)
- return ret;
-
- + memset(&ppdata, '\0', sizeof(ppdata));
- ppdata.of_node = spi->dev.of_node;
-
-- return mtd_device_parse_register(&flash->mtd,
-+ return mtd_device_parse_register(&nor->mtd,
-diff --git a/target/linux/ar71xx/patches-3.18/462-mtd-m25p80-set-spi-transfer-type.patch b/target/linux/ar71xx/patches-3.18/462-mtd-m25p80-set-spi-transfer-type.patch
-index 3320e5b845bdf2843f32e52b5b620ce880fd4e96..11bf9ff71b609b03239179bcd8977c2202f5c8cf 100644
---- a/target/linux/ar71xx/patches-3.18/462-mtd-m25p80-set-spi-transfer-type.patch
-+++ b/target/linux/ar71xx/patches-3.18/462-mtd-m25p80-set-spi-transfer-type.patch
-@@ -1,6 +1,6 @@
- --- a/drivers/mtd/devices/m25p80.c
- +++ b/drivers/mtd/devices/m25p80.c
--@@ -142,10 +142,12 @@ static int m25p80_read(struct spi_nor *n
-+@@ -137,10 +137,12 @@ static int m25p80_read(struct spi_nor *n
- flash->command[0] = nor->read_opcode;
- m25p_addr2cmd(nor, from, flash->command);
-
-diff --git a/target/linux/ar71xx/patches-3.18/464-spi-ath79-fix-fast-flash-read.patch b/target/linux/ar71xx/patches-3.18/464-spi-ath79-fix-fast-flash-read.patch
-index e48665d6a09fdcc77d027274016c24fe78e8d95a..758d23181d49eff6afeb35b1fbbd8f36efa2cfca 100644
---- a/target/linux/ar71xx/patches-3.18/464-spi-ath79-fix-fast-flash-read.patch
-+++ b/target/linux/ar71xx/patches-3.18/464-spi-ath79-fix-fast-flash-read.patch
-@@ -1,6 +1,6 @@
- --- a/drivers/mtd/devices/m25p80.c
- +++ b/drivers/mtd/devices/m25p80.c
--@@ -142,6 +142,9 @@ static int m25p80_read(struct spi_nor *n
-+@@ -137,6 +137,9 @@ static int m25p80_read(struct spi_nor *n
- flash->command[0] = nor->read_opcode;
- m25p_addr2cmd(nor, from, flash->command);
-
-@@ -25,7 +25,7 @@
- while (len--) {
- --- a/include/linux/spi/spi.h
- +++ b/include/linux/spi/spi.h
--@@ -637,6 +637,7 @@ struct spi_transfer {
-+@@ -633,6 +633,7 @@ struct spi_transfer {
- u16 delay_usecs;
- u32 speed_hz;
- enum spi_transfer_type type;
-diff --git a/target/linux/brcm63xx/patches-3.18/202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch b/target/linux/brcm63xx/patches-3.18/202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch
-index b94969406deed4d6b8d51789235cd3e63e432c7c..be62e6789c883a5854a7bc9fae6dcc882090800f 100644
---- a/target/linux/brcm63xx/patches-3.18/202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch
-+++ b/target/linux/brcm63xx/patches-3.18/202-MTD-DEVICES-m25p80-use-parsers-if-provided-in-flash-.patch
-@@ -11,12 +11,12 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
-
- --- a/drivers/mtd/devices/m25p80.c
- +++ b/drivers/mtd/devices/m25p80.c
--@@ -246,7 +246,8 @@ static int m25p_probe(struct spi_device
-+@@ -229,7 +229,8 @@ static int m25p_probe(struct spi_device
-
- ppdata.of_node = spi->dev.of_node;
-
--- return mtd_device_parse_register(&flash->mtd, NULL, &ppdata,
--+ return mtd_device_parse_register(&flash->mtd,
-+- return mtd_device_parse_register(&nor->mtd, NULL, &ppdata,
-++ return mtd_device_parse_register(&nor->mtd,
- + data ? data->part_probe_types : NULL, &ppdata,
- data ? data->parts : NULL,
- data ? data->nr_parts : 0);
-diff --git a/target/linux/brcm63xx/patches-3.18/203-MTD-DEVICES-m25p80-add-support-for-limiting-reads.patch b/target/linux/brcm63xx/patches-3.18/203-MTD-DEVICES-m25p80-add-support-for-limiting-reads.patch
-index 740fb2dafc4ece9e0c88630a1ad2b800f763ed59..3877442d21eb8f6a9fdacc415c60be78d61b3c5f 100644
---- a/target/linux/brcm63xx/patches-3.18/203-MTD-DEVICES-m25p80-add-support-for-limiting-reads.patch
-+++ b/target/linux/brcm63xx/patches-3.18/203-MTD-DEVICES-m25p80-add-support-for-limiting-reads.patch
-@@ -11,15 +11,15 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
-
- --- a/drivers/mtd/devices/m25p80.c
- +++ b/drivers/mtd/devices/m25p80.c
--@@ -32,6 +32,7 @@ struct m25p {
-+@@ -31,6 +31,7 @@
-+ struct m25p {
- struct spi_device *spi;
- struct spi_nor spi_nor;
-- struct mtd_info mtd;
- + int max_transfer_len;
- u8 command[MAX_CMD_SIZE];
- };
-
--@@ -121,7 +122,7 @@ static inline unsigned int m25p80_rx_nbi
-+@@ -119,7 +120,7 @@ static inline unsigned int m25p80_rx_nbi
- * Read an address range from the nor chip. The address range
- * may be any size provided it is within the physical boundaries.
- */
-@@ -28,7 +28,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
- size_t *retlen, u_char *buf)
- {
- struct m25p *flash = nor->priv;
--@@ -157,6 +158,29 @@ static int m25p80_read(struct spi_nor *n
-+@@ -152,6 +153,29 @@ static int m25p80_read(struct spi_nor *n
- return 0;
- }
-
-@@ -58,7 +58,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
- static int m25p80_erase(struct spi_nor *nor, loff_t offset)
- {
- struct m25p *flash = nor->priv;
--@@ -240,6 +264,9 @@ static int m25p_probe(struct spi_device
-+@@ -223,6 +247,9 @@ static int m25p_probe(struct spi_device
- else
- flash_name = spi->modalias;
-
-diff --git a/target/linux/brcm63xx/patches-3.18/414-MTD-m25p80-allow-passing-pp_data.patch b/target/linux/brcm63xx/patches-3.18/414-MTD-m25p80-allow-passing-pp_data.patch
-index b7bf57f697961a06d1ccef93ce4474f34f5e03e4..e421e9adbefb45fa837f686e253636781842fa7e 100644
---- a/target/linux/brcm63xx/patches-3.18/414-MTD-m25p80-allow-passing-pp_data.patch
-+++ b/target/linux/brcm63xx/patches-3.18/414-MTD-m25p80-allow-passing-pp_data.patch
-@@ -10,7 +10,7 @@ Subject: [PATCH 64/79] MTD: m25p80: allow passing pp_data
-
- --- a/drivers/mtd/devices/m25p80.c
- +++ b/drivers/mtd/devices/m25p80.c
--@@ -267,6 +267,9 @@ static int m25p_probe(struct spi_device
-+@@ -250,6 +250,9 @@ static int m25p_probe(struct spi_device
- if (data)
- flash->max_transfer_len = data->max_transfer_len;
-
-diff --git a/target/linux/generic/patches-3.18/043-mtd_GD25Q128B_support_backport_from_3.19.patch b/target/linux/generic/patches-3.18/043-mtd_GD25Q128B_support_backport_from_3.19.patch
-deleted file mode 100644
-index 4d0403bfd8a4a076cc9e91349463593adb79047c..0000000000000000000000000000000000000000
---- a/target/linux/generic/patches-3.18/043-mtd_GD25Q128B_support_backport_from_3.19.patch
-+++ /dev/null
-@@ -1,10 +0,0 @@
----- a/drivers/mtd/spi-nor/spi-nor.c
--+++ b/drivers/mtd/spi-nor/spi-nor.c
--@@ -510,6 +510,7 @@ static const struct spi_device_id spi_no
-- /* GigaDevice */
-- { "gd25q32", INFO(0xc84016, 0, 64 * 1024, 64, SECT_4K) },
-- { "gd25q64", INFO(0xc84017, 0, 64 * 1024, 128, SECT_4K) },
--+ { "gd25q128", INFO(0xc84018, 0, 64 * 1024, 256, SECT_4K) },
--
-- /* Intel/Numonyx -- xxxs33b */
-- { "160s33b", INFO(0x898911, 0, 64 * 1024, 32, 0) },
-diff --git a/target/linux/generic/patches-3.18/093-m25p80_spi-nor_update_to_4.4.9.patch b/target/linux/generic/patches-3.18/093-m25p80_spi-nor_update_to_4.4.9.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..5f74d3a07ba62c9e1da0a0b2aef8abe309efdbb9
---- /dev/null
-+++ b/target/linux/generic/patches-3.18/093-m25p80_spi-nor_update_to_4.4.9.patch
-@@ -0,0 +1,1579 @@
-+--- a/drivers/mtd/devices/m25p80.c
-++++ b/drivers/mtd/devices/m25p80.c
-+@@ -31,7 +31,6 @@
-+ struct m25p {
-+ struct spi_device *spi;
-+ struct spi_nor spi_nor;
-+- struct mtd_info mtd;
-+ u8 command[MAX_CMD_SIZE];
-+ };
-+
-+@@ -62,8 +61,7 @@ static int m25p_cmdsz(struct spi_nor *no
-+ return 1 + nor->addr_width;
-+ }
-+
-+-static int m25p80_write_reg(struct spi_nor *nor, u8 opcode, u8 *buf, int len,
-+- int wr_en)
-++static int m25p80_write_reg(struct spi_nor *nor, u8 opcode, u8 *buf, int len)
-+ {
-+ struct m25p *flash = nor->priv;
-+ struct spi_device *spi = flash->spi;
-+@@ -128,13 +126,10 @@ static int m25p80_read(struct spi_nor *n
-+ struct spi_device *spi = flash->spi;
-+ struct spi_transfer t[2];
-+ struct spi_message m;
-+- int dummy = nor->read_dummy;
-+- int ret;
-++ unsigned int dummy = nor->read_dummy;
-+
-+- /* Wait till previous write/erase is done. */
-+- ret = nor->wait_till_ready(nor);
-+- if (ret)
-+- return ret;
-++ /* convert the dummy cycles to the number of bytes */
-++ dummy /= 8;
-+
-+ spi_message_init(&m);
-+ memset(t, 0, (sizeof t));
-+@@ -160,20 +155,9 @@ static int m25p80_read(struct spi_nor *n
-+ static int m25p80_erase(struct spi_nor *nor, loff_t offset)
-+ {
-+ struct m25p *flash = nor->priv;
-+- int ret;
-+
-+ dev_dbg(nor->dev, "%dKiB at 0x%08x\n",
-+- flash->mtd.erasesize / 1024, (u32)offset);
-+-
-+- /* Wait until finished previous write command. */
-+- ret = nor->wait_till_ready(nor);
-+- if (ret)
-+- return ret;
-+-
-+- /* Send write enable, then erase commands. */
-+- ret = nor->write_reg(nor, SPINOR_OP_WREN, NULL, 0, 0);
-+- if (ret)
-+- return ret;
-++ flash->spi_nor.mtd.erasesize / 1024, (u32)offset);
-+
-+ /* Set up command buffer. */
-+ flash->command[0] = nor->erase_opcode;
-+@@ -215,11 +199,10 @@ static int m25p_probe(struct spi_device
-+ nor->read_reg = m25p80_read_reg;
-+
-+ nor->dev = &spi->dev;
-+- nor->mtd = &flash->mtd;
-++ nor->flash_node = spi->dev.of_node;
-+ nor->priv = flash;
-+
-+ spi_set_drvdata(spi, flash);
-+- flash->mtd.priv = nor;
-+ flash->spi = spi;
-+
-+ if (spi->mode & SPI_RX_QUAD)
-+@@ -228,7 +211,7 @@ static int m25p_probe(struct spi_device
-+ mode = SPI_NOR_DUAL;
-+
-+ if (data && data->name)
-+- flash->mtd.name = data->name;
-++ nor->mtd.name = data->name;
-+
-+ /* For some (historical?) reason many platforms provide two different
-+ * names in flash_platform_data: "name" and "type". Quite often name is
-+@@ -246,7 +229,7 @@ static int m25p_probe(struct spi_device
-+
-+ ppdata.of_node = spi->dev.of_node;
-+
-+- return mtd_device_parse_register(&flash->mtd, NULL, &ppdata,
-++ return mtd_device_parse_register(&nor->mtd, NULL, &ppdata,
-+ data ? data->parts : NULL,
-+ data ? data->nr_parts : 0);
-+ }
-+@@ -257,64 +240,68 @@ static int m25p_remove(struct spi_device
-+ struct m25p *flash = spi_get_drvdata(spi);
-+
-+ /* Clean up MTD stuff. */
-+- return mtd_device_unregister(&flash->mtd);
-++ return mtd_device_unregister(&flash->spi_nor.mtd);
-+ }
-+
-+-
-+ /*
-+- * XXX This needs to be kept in sync with spi_nor_ids. We can't share
-+- * it with spi-nor, because if this is built as a module then modpost
-+- * won't be able to read it and add appropriate aliases.
-++ * Do NOT add to this array without reading the following:
-++ *
-++ * Historically, many flash devices are bound to this driver by their name. But
-++ * since most of these flash are compatible to some extent, and their
-++ * differences can often be differentiated by the JEDEC read-ID command, we
-++ * encourage new users to add support to the spi-nor library, and simply bind
-++ * against a generic string here (e.g., "jedec,spi-nor").
-++ *
-++ * Many flash names are kept here in this list (as well as in spi-nor.c) to
-++ * keep them available as module aliases for existing platforms.
-+ */
-+ static const struct spi_device_id m25p_ids[] = {
-+- {"at25fs010"}, {"at25fs040"}, {"at25df041a"}, {"at25df321a"},
-+- {"at25df641"}, {"at26f004"}, {"at26df081a"}, {"at26df161a"},
-+- {"at26df321"}, {"at45db081d"},
-+- {"en25f32"}, {"en25p32"}, {"en25q32b"}, {"en25p64"},
-+- {"en25q64"}, {"en25qh128"}, {"en25qh256"},
-+- {"f25l32pa"},
-+- {"mr25h256"}, {"mr25h10"},
-+- {"gd25q32"}, {"gd25q64"},
-+- {"160s33b"}, {"320s33b"}, {"640s33b"},
-+- {"mx25l2005a"}, {"mx25l4005a"}, {"mx25l8005"}, {"mx25l1606e"},
-+- {"mx25l3205d"}, {"mx25l3255e"}, {"mx25l6405d"}, {"mx25l12805d"},
-+- {"mx25l12855e"},{"mx25l25635e"},{"mx25l25655e"},{"mx66l51235l"},
-+- {"mx66l1g55g"},
-+- {"n25q064"}, {"n25q128a11"}, {"n25q128a13"}, {"n25q256a"},
-+- {"n25q512a"}, {"n25q512ax3"}, {"n25q00"},
-+- {"pm25lv512"}, {"pm25lv010"}, {"pm25lq032"},
-+- {"s25sl032p"}, {"s25sl064p"}, {"s25fl256s0"}, {"s25fl256s1"},
-+- {"s25fl512s"}, {"s70fl01gs"}, {"s25sl12800"}, {"s25sl12801"},
-+- {"s25fl129p0"}, {"s25fl129p1"}, {"s25sl004a"}, {"s25sl008a"},
-+- {"s25sl016a"}, {"s25sl032a"}, {"s25sl064a"}, {"s25fl008k"},
-+- {"s25fl016k"}, {"s25fl064k"},
-+- {"sst25vf040b"},{"sst25vf080b"},{"sst25vf016b"},{"sst25vf032b"},
-+- {"sst25vf064c"},{"sst25wf512"}, {"sst25wf010"}, {"sst25wf020"},
-+- {"sst25wf040"},
-+- {"m25p05"}, {"m25p10"}, {"m25p20"}, {"m25p40"},
-+- {"m25p80"}, {"m25p16"}, {"m25p32"}, {"m25p64"},
-+- {"m25p128"}, {"n25q032"},
-++ /*
-++ * Entries not used in DTs that should be safe to drop after replacing
-++ * them with "nor-jedec" in platform data.
-++ */
-++ {"s25sl064a"}, {"w25x16"}, {"m25p10"}, {"m25px64"},
-++
-++ /*
-++ * Entries that were used in DTs without "nor-jedec" fallback and should
-++ * be kept for backward compatibility.
-++ */
-++ {"at25df321a"}, {"at25df641"}, {"at26df081a"},
-++ {"mr25h256"},
-++ {"mx25l4005a"}, {"mx25l1606e"}, {"mx25l6405d"}, {"mx25l12805d"},
-++ {"mx25l25635e"},{"mx66l51235l"},
-++ {"n25q064"}, {"n25q128a11"}, {"n25q128a13"}, {"n25q512a"},
-++ {"s25fl256s1"}, {"s25fl512s"}, {"s25sl12801"}, {"s25fl008k"},
-++ {"s25fl064k"},
-++ {"sst25vf040b"},{"sst25vf016b"},{"sst25vf032b"},{"sst25wf040"},
-++ {"m25p40"}, {"m25p80"}, {"m25p16"}, {"m25p32"},
-++ {"m25p64"}, {"m25p128"},
-++ {"w25x80"}, {"w25x32"}, {"w25q32"}, {"w25q32dw"},
-++ {"w25q80bl"}, {"w25q128"}, {"w25q256"},
-++
-++ /* Flashes that can't be detected using JEDEC */
-+ {"m25p05-nonjedec"}, {"m25p10-nonjedec"}, {"m25p20-nonjedec"},
-+ {"m25p40-nonjedec"}, {"m25p80-nonjedec"}, {"m25p16-nonjedec"},
-+ {"m25p32-nonjedec"}, {"m25p64-nonjedec"}, {"m25p128-nonjedec"},
-+- {"m45pe10"}, {"m45pe80"}, {"m45pe16"},
-+- {"m25pe20"}, {"m25pe80"}, {"m25pe16"},
-+- {"m25px16"}, {"m25px32"}, {"m25px32-s0"}, {"m25px32-s1"},
-+- {"m25px64"}, {"m25px80"},
-+- {"w25x10"}, {"w25x20"}, {"w25x40"}, {"w25x80"},
-+- {"w25x16"}, {"w25x32"}, {"w25q32"}, {"w25q32dw"},
-+- {"w25x64"}, {"w25q64"}, {"w25q80"}, {"w25q80bl"},
-+- {"w25q128"}, {"w25q256"}, {"cat25c11"},
-+- {"cat25c03"}, {"cat25c09"}, {"cat25c17"}, {"cat25128"},
-++
-+ { },
-+ };
-+ MODULE_DEVICE_TABLE(spi, m25p_ids);
-+
-++static const struct of_device_id m25p_of_table[] = {
-++ /*
-++ * Generic compatibility for SPI NOR that can be identified by the
-++ * JEDEC READ ID opcode (0x9F). Use this, if possible.
-++ */
-++ { .compatible = "jedec,spi-nor" },
-++ {}
-++};
-++MODULE_DEVICE_TABLE(of, m25p_of_table);
-+
-+ static struct spi_driver m25p80_driver = {
-+ .driver = {
-+ .name = "m25p80",
-+- .owner = THIS_MODULE,
-++ .of_match_table = m25p_of_table,
-+ },
-+ .id_table = m25p_ids,
-+ .probe = m25p_probe,
-+--- a/drivers/mtd/spi-nor/spi-nor.c
-++++ b/drivers/mtd/spi-nor/spi-nor.c
-+@@ -16,19 +16,63 @@
-+ #include <linux/device.h>
-+ #include <linux/mutex.h>
-+ #include <linux/math64.h>
-++#include <linux/sizes.h>
-+
-+-#include <linux/mtd/cfi.h>
-+ #include <linux/mtd/mtd.h>
-+ #include <linux/of_platform.h>
-+ #include <linux/spi/flash.h>
-+ #include <linux/mtd/spi-nor.h>
-+
-+ /* Define max times to check status register before we give up. */
-+-#define MAX_READY_WAIT_JIFFIES (40 * HZ) /* M25P16 specs 40s max chip erase */
-+
-+-#define JEDEC_MFR(_jedec_id) ((_jedec_id) >> 16)
-++/*
-++ * For everything but full-chip erase; probably could be much smaller, but kept
-++ * around for safety for now
-++ */
-++#define DEFAULT_READY_WAIT_JIFFIES (40UL * HZ)
-++
-++/*
-++ * For full-chip erase, calibrated to a 2MB flash (M25P16); should be scaled up
-++ * for larger flash
-++ */
-++#define CHIP_ERASE_2MB_READY_WAIT_JIFFIES (40UL * HZ)
-++
-++#define SPI_NOR_MAX_ID_LEN 6
-++
-++struct flash_info {
-++ char *name;
-++
-++ /*
-++ * This array stores the ID bytes.
-++ * The first three bytes are the JEDIC ID.
-++ * JEDEC ID zero means "no ID" (mostly older chips).
-++ */
-++ u8 id[SPI_NOR_MAX_ID_LEN];
-++ u8 id_len;
-++
-++ /* The size listed here is what works with SPINOR_OP_SE, which isn't
-++ * necessarily called a "sector" by the vendor.
-++ */
-++ unsigned sector_size;
-++ u16 n_sectors;
-++
-++ u16 page_size;
-++ u16 addr_width;
-++
-++ u16 flags;
-++#define SECT_4K 0x01 /* SPINOR_OP_BE_4K works uniformly */
-++#define SPI_NOR_NO_ERASE 0x02 /* No erase command needed */
-++#define SST_WRITE 0x04 /* use SST byte programming */
-++#define SPI_NOR_NO_FR 0x08 /* Can't do fastread */
-++#define SECT_4K_PMC 0x10 /* SPINOR_OP_BE_4K_PMC works uniformly */
-++#define SPI_NOR_DUAL_READ 0x20 /* Flash supports Dual Read */
-++#define SPI_NOR_QUAD_READ 0x40 /* Flash supports Quad Read */
-++#define USE_FSR 0x80 /* use flag status register */
-++};
-+
-+-static const struct spi_device_id *spi_nor_match_id(const char *name);
-++#define JEDEC_MFR(info) ((info)->id[0])
-++
-++static const struct flash_info *spi_nor_match_id(const char *name);
-+
-+ /*
-+ * Read the status register, returning its value in the location
-+@@ -98,7 +142,7 @@ static inline int spi_nor_read_dummy_cyc
-+ case SPI_NOR_FAST:
-+ case SPI_NOR_DUAL:
-+ case SPI_NOR_QUAD:
-+- return 1;
-++ return 8;
-+ case SPI_NOR_NORMAL:
-+ return 0;
-+ }
-+@@ -112,7 +156,7 @@ static inline int spi_nor_read_dummy_cyc
-+ static inline int write_sr(struct spi_nor *nor, u8 val)
-+ {
-+ nor->cmd_buf[0] = val;
-+- return nor->write_reg(nor, SPINOR_OP_WRSR, nor->cmd_buf, 1, 0);
-++ return nor->write_reg(nor, SPINOR_OP_WRSR, nor->cmd_buf, 1);
-+ }
-+
-+ /*
-+@@ -121,7 +165,7 @@ static inline int write_sr(struct spi_no
-+ */
-+ static inline int write_enable(struct spi_nor *nor)
-+ {
-+- return nor->write_reg(nor, SPINOR_OP_WREN, NULL, 0, 0);
-++ return nor->write_reg(nor, SPINOR_OP_WREN, NULL, 0);
-+ }
-+
-+ /*
-+@@ -129,7 +173,7 @@ static inline int write_enable(struct sp
-+ */
-+ static inline int write_disable(struct spi_nor *nor)
-+ {
-+- return nor->write_reg(nor, SPINOR_OP_WRDI, NULL, 0, 0);
-++ return nor->write_reg(nor, SPINOR_OP_WRDI, NULL, 0);
-+ }
-+
-+ static inline struct spi_nor *mtd_to_spi_nor(struct mtd_info *mtd)
-+@@ -138,23 +182,24 @@ static inline struct spi_nor *mtd_to_spi
-+ }
-+
-+ /* Enable/disable 4-byte addressing mode. */
-+-static inline int set_4byte(struct spi_nor *nor, u32 jedec_id, int enable)
-++static inline int set_4byte(struct spi_nor *nor, const struct flash_info *info,
-++ int enable)
-+ {
-+ int status;
-+ bool need_wren = false;
-+ u8 cmd;
-+
-+- switch (JEDEC_MFR(jedec_id)) {
-+- case CFI_MFR_ST: /* Micron, actually */
-++ switch (JEDEC_MFR(info)) {
-++ case SNOR_MFR_MICRON:
-+ /* Some Micron need WREN command; all will accept it */
-+ need_wren = true;
-+- case CFI_MFR_MACRONIX:
-+- case 0xEF /* winbond */:
-++ case SNOR_MFR_MACRONIX:
-++ case SNOR_MFR_WINBOND:
-+ if (need_wren)
-+ write_enable(nor);
-+
-+ cmd = enable ? SPINOR_OP_EN4B : SPINOR_OP_EX4B;
-+- status = nor->write_reg(nor, cmd, NULL, 0, 0);
-++ status = nor->write_reg(nor, cmd, NULL, 0);
-+ if (need_wren)
-+ write_disable(nor);
-+
-+@@ -162,63 +207,73 @@ static inline int set_4byte(struct spi_n
-+ default:
-+ /* Spansion style */
-+ nor->cmd_buf[0] = enable << 7;
-+- return nor->write_reg(nor, SPINOR_OP_BRWR, nor->cmd_buf, 1, 0);
-++ return nor->write_reg(nor, SPINOR_OP_BRWR, nor->cmd_buf, 1);
-+ }
-+ }
-+-
-+-static int spi_nor_wait_till_ready(struct spi_nor *nor)
-++static inline int spi_nor_sr_ready(struct spi_nor *nor)
-+ {
-+- unsigned long deadline;
-+- int sr;
-+-
-+- deadline = jiffies + MAX_READY_WAIT_JIFFIES;
-+-
-+- do {
-+- cond_resched();
-++ int sr = read_sr(nor);
-++ if (sr < 0)
-++ return sr;
-++ else
-++ return !(sr & SR_WIP);
-++}
-+
-+- sr = read_sr(nor);
-+- if (sr < 0)
-+- break;
-+- else if (!(sr & SR_WIP))
-+- return 0;
-+- } while (!time_after_eq(jiffies, deadline));
-++static inline int spi_nor_fsr_ready(struct spi_nor *nor)
-++{
-++ int fsr = read_fsr(nor);
-++ if (fsr < 0)
-++ return fsr;
-++ else
-++ return fsr & FSR_READY;
-++}
-+
-+- return -ETIMEDOUT;
-++static int spi_nor_ready(struct spi_nor *nor)
-++{
-++ int sr, fsr;
-++ sr = spi_nor_sr_ready(nor);
-++ if (sr < 0)
-++ return sr;
-++ fsr = nor->flags & SNOR_F_USE_FSR ? spi_nor_fsr_ready(nor) : 1;
-++ if (fsr < 0)
-++ return fsr;
-++ return sr && fsr;
-+ }
-+
-+-static int spi_nor_wait_till_fsr_ready(struct spi_nor *nor)
-++/*
-++ * Service routine to read status register until ready, or timeout occurs.
-++ * Returns non-zero if error.
-++ */
-++static int spi_nor_wait_till_ready_with_timeout(struct spi_nor *nor,
-++ unsigned long timeout_jiffies)
-+ {
-+ unsigned long deadline;
-+- int sr;
-+- int fsr;
-++ int timeout = 0, ret;
-+
-+- deadline = jiffies + MAX_READY_WAIT_JIFFIES;
-++ deadline = jiffies + timeout_jiffies;
-++
-++ while (!timeout) {
-++ if (time_after_eq(jiffies, deadline))
-++ timeout = 1;
-++
-++ ret = spi_nor_ready(nor);
-++ if (ret < 0)
-++ return ret;
-++ if (ret)
-++ return 0;
-+
-+- do {
-+ cond_resched();
-++ }
-+
-+- sr = read_sr(nor);
-+- if (sr < 0) {
-+- break;
-+- } else if (!(sr & SR_WIP)) {
-+- fsr = read_fsr(nor);
-+- if (fsr < 0)
-+- break;
-+- if (fsr & FSR_READY)
-+- return 0;
-+- }
-+- } while (!time_after_eq(jiffies, deadline));
-++ dev_err(nor->dev, "flash operation timed out\n");
-+
-+ return -ETIMEDOUT;
-+ }
-+
-+-/*
-+- * Service routine to read status register until ready, or timeout occurs.
-+- * Returns non-zero if error.
-+- */
-+-static int wait_till_ready(struct spi_nor *nor)
-++static int spi_nor_wait_till_ready(struct spi_nor *nor)
-+ {
-+- return nor->wait_till_ready(nor);
-++ return spi_nor_wait_till_ready_with_timeout(nor,
-++ DEFAULT_READY_WAIT_JIFFIES);
-+ }
-+
-+ /*
-+@@ -228,19 +283,9 @@ static int wait_till_ready(struct spi_no
-+ */
-+ static int erase_chip(struct spi_nor *nor)
-+ {
-+- int ret;
-+-
-+- dev_dbg(nor->dev, " %lldKiB\n", (long long)(nor->mtd->size >> 10));
-++ dev_dbg(nor->dev, " %lldKiB\n", (long long)(nor->mtd.size >> 10));
-+
-+- /* Wait until finished previous write command. */
-+- ret = wait_till_ready(nor);
-+- if (ret)
-+- return ret;
-+-
-+- /* Send write enable, then erase commands. */
-+- write_enable(nor);
-+-
-+- return nor->write_reg(nor, SPINOR_OP_CHIP_ERASE, NULL, 0, 0);
-++ return nor->write_reg(nor, SPINOR_OP_CHIP_ERASE, NULL, 0);
-+ }
-+
-+ static int spi_nor_lock_and_prep(struct spi_nor *nor, enum spi_nor_ops ops)
-+@@ -294,11 +339,28 @@ static int spi_nor_erase(struct mtd_info
-+
-+ /* whole-chip erase? */
-+ if (len == mtd->size) {
-++ unsigned long timeout;
-++
-++ write_enable(nor);
-++
-+ if (erase_chip(nor)) {
-+ ret = -EIO;
-+ goto erase_err;
-+ }
-+
-++ /*
-++ * Scale the timeout linearly with the size of the flash, with
-++ * a minimum calibrated to an old 2MB flash. We could try to
-++ * pull these from CFI/SFDP, but these values should be good
-++ * enough for now.
-++ */
-++ timeout = max(CHIP_ERASE_2MB_READY_WAIT_JIFFIES,
-++ CHIP_ERASE_2MB_READY_WAIT_JIFFIES *
-++ (unsigned long)(mtd->size / SZ_2M));
-++ ret = spi_nor_wait_till_ready_with_timeout(nor, timeout);
-++ if (ret)
-++ goto erase_err;
-++
-+ /* REVISIT in some cases we could speed up erasing large regions
-+ * by using SPINOR_OP_SE instead of SPINOR_OP_BE_4K. We may have set up
-+ * to use "small sector erase", but that's not always optimal.
-+@@ -307,6 +369,8 @@ static int spi_nor_erase(struct mtd_info
-+ /* "sector"-at-a-time erase */
-+ } else {
-+ while (len) {
-++ write_enable(nor);
-++
-+ if (nor->erase(nor, addr)) {
-+ ret = -EIO;
-+ goto erase_err;
-+@@ -314,9 +378,15 @@ static int spi_nor_erase(struct mtd_info
-+
-+ addr += mtd->erasesize;
-+ len -= mtd->erasesize;
-++
-++ ret = spi_nor_wait_till_ready(nor);
-++ if (ret)
-++ goto erase_err;
-+ }
-+ }
-+
-++ write_disable(nor);
-++
-+ spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_ERASE);
-+
-+ instr->state = MTD_ERASE_DONE;
-+@@ -330,152 +400,267 @@ erase_err:
-+ return ret;
-+ }
-+
-+-static int spi_nor_lock(struct mtd_info *mtd, loff_t ofs, uint64_t len)
-++static void stm_get_locked_range(struct spi_nor *nor, u8 sr, loff_t *ofs,
-++ uint64_t *len)
-+ {
-+- struct spi_nor *nor = mtd_to_spi_nor(mtd);
-+- uint32_t offset = ofs;
-+- uint8_t status_old, status_new;
-+- int ret = 0;
-++ struct mtd_info *mtd = &nor->mtd;
-++ u8 mask = SR_BP2 | SR_BP1 | SR_BP0;
-++ int shift = ffs(mask) - 1;
-++ int pow;
-++
-++ if (!(sr & mask)) {
-++ /* No protection */
-++ *ofs = 0;
-++ *len = 0;
-++ } else {
-++ pow = ((sr & mask) ^ mask) >> shift;
-++ *len = mtd->size >> pow;
-++ *ofs = mtd->size - *len;
-++ }
-++}
-+
-+- ret = spi_nor_lock_and_prep(nor, SPI_NOR_OPS_LOCK);
-+- if (ret)
-+- return ret;
-++/*
-++ * Return 1 if the entire region is locked, 0 otherwise
-++ */
-++static int stm_is_locked_sr(struct spi_nor *nor, loff_t ofs, uint64_t len,
-++ u8 sr)
-++{
-++ loff_t lock_offs;
-++ uint64_t lock_len;
-+
-+- /* Wait until finished previous command */
-+- ret = wait_till_ready(nor);
-+- if (ret)
-+- goto err;
-++ stm_get_locked_range(nor, sr, &lock_offs, &lock_len);
-++
-++ return (ofs + len <= lock_offs + lock_len) && (ofs >= lock_offs);
-++}
-++
-++/*
-++ * Lock a region of the flash. Compatible with ST Micro and similar flash.
-++ * Supports only the block protection bits BP{0,1,2} in the status register
-++ * (SR). Does not support these features found in newer SR bitfields:
-++ * - TB: top/bottom protect - only handle TB=0 (top protect)
-++ * - SEC: sector/block protect - only handle SEC=0 (block protect)
-++ * - CMP: complement protect - only support CMP=0 (range is not complemented)
-++ *
-++ * Sample table portion for 8MB flash (Winbond w25q64fw):
-++ *
-++ * SEC | TB | BP2 | BP1 | BP0 | Prot Length | Protected Portion
-++ * --------------------------------------------------------------------------
-++ * X | X | 0 | 0 | 0 | NONE | NONE
-++ * 0 | 0 | 0 | 0 | 1 | 128 KB | Upper 1/64
-++ * 0 | 0 | 0 | 1 | 0 | 256 KB | Upper 1/32
-++ * 0 | 0 | 0 | 1 | 1 | 512 KB | Upper 1/16
-++ * 0 | 0 | 1 | 0 | 0 | 1 MB | Upper 1/8
-++ * 0 | 0 | 1 | 0 | 1 | 2 MB | Upper 1/4
-++ * 0 | 0 | 1 | 1 | 0 | 4 MB | Upper 1/2
-++ * X | X | 1 | 1 | 1 | 8 MB | ALL
-++ *
-++ * Returns negative on errors, 0 on success.
-++ */
-++static int stm_lock(struct spi_nor *nor, loff_t ofs, uint64_t len)
-++{
-++ struct mtd_info *mtd = &nor->mtd;
-++ u8 status_old, status_new;
-++ u8 mask = SR_BP2 | SR_BP1 | SR_BP0;
-++ u8 shift = ffs(mask) - 1, pow, val;
-+
-+ status_old = read_sr(nor);
-+
-+- if (offset < mtd->size - (mtd->size / 2))
-+- status_new = status_old | SR_BP2 | SR_BP1 | SR_BP0;
-+- else if (offset < mtd->size - (mtd->size / 4))
-+- status_new = (status_old & ~SR_BP0) | SR_BP2 | SR_BP1;
-+- else if (offset < mtd->size - (mtd->size / 8))
-+- status_new = (status_old & ~SR_BP1) | SR_BP2 | SR_BP0;
-+- else if (offset < mtd->size - (mtd->size / 16))
-+- status_new = (status_old & ~(SR_BP0 | SR_BP1)) | SR_BP2;
-+- else if (offset < mtd->size - (mtd->size / 32))
-+- status_new = (status_old & ~SR_BP2) | SR_BP1 | SR_BP0;
-+- else if (offset < mtd->size - (mtd->size / 64))
-+- status_new = (status_old & ~(SR_BP2 | SR_BP0)) | SR_BP1;
-+- else
-+- status_new = (status_old & ~(SR_BP2 | SR_BP1)) | SR_BP0;
-++ /* SPI NOR always locks to the end */
-++ if (ofs + len != mtd->size) {
-++ /* Does combined region extend to end? */
-++ if (!stm_is_locked_sr(nor, ofs + len, mtd->size - ofs - len,
-++ status_old))
-++ return -EINVAL;
-++ len = mtd->size - ofs;
-++ }
-++
-++ /*
-++ * Need smallest pow such that:
-++ *
-++ * 1 / (2^pow) <= (len / size)
-++ *
-++ * so (assuming power-of-2 size) we do:
-++ *
-++ * pow = ceil(log2(size / len)) = log2(size) - floor(log2(len))
-++ */
-++ pow = ilog2(mtd->size) - ilog2(len);
-++ val = mask - (pow << shift);
-++ if (val & ~mask)
-++ return -EINVAL;
-++ /* Don't "lock" with no region! */
-++ if (!(val & mask))
-++ return -EINVAL;
-++
-++ status_new = (status_old & ~mask) | val;
-+
-+ /* Only modify protection if it will not unlock other areas */
-+- if ((status_new & (SR_BP2 | SR_BP1 | SR_BP0)) >
-+- (status_old & (SR_BP2 | SR_BP1 | SR_BP0))) {
-+- write_enable(nor);
-+- ret = write_sr(nor, status_new);
-+- if (ret)
-+- goto err;
-++ if ((status_new & mask) <= (status_old & mask))
-++ return -EINVAL;
-++
-++ write_enable(nor);
-++ return write_sr(nor, status_new);
-++}
-++
-++/*
-++ * Unlock a region of the flash. See stm_lock() for more info
-++ *
-++ * Returns negative on errors, 0 on success.
-++ */
-++static int stm_unlock(struct spi_nor *nor, loff_t ofs, uint64_t len)
-++{
-++ struct mtd_info *mtd = &nor->mtd;
-++ uint8_t status_old, status_new;
-++ u8 mask = SR_BP2 | SR_BP1 | SR_BP0;
-++ u8 shift = ffs(mask) - 1, pow, val;
-++
-++ status_old = read_sr(nor);
-++
-++ /* Cannot unlock; would unlock larger region than requested */
-++ if (stm_is_locked_sr(nor, ofs - mtd->erasesize, mtd->erasesize,
-++ status_old))
-++ return -EINVAL;
-++
-++ /*
-++ * Need largest pow such that:
-++ *
-++ * 1 / (2^pow) >= (len / size)
-++ *
-++ * so (assuming power-of-2 size) we do:
-++ *
-++ * pow = floor(log2(size / len)) = log2(size) - ceil(log2(len))
-++ */
-++ pow = ilog2(mtd->size) - order_base_2(mtd->size - (ofs + len));
-++ if (ofs + len == mtd->size) {
-++ val = 0; /* fully unlocked */
-++ } else {
-++ val = mask - (pow << shift);
-++ /* Some power-of-two sizes are not supported */
-++ if (val & ~mask)
-++ return -EINVAL;
-+ }
-+
-+-err:
-+- spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_LOCK);
-+- return ret;
-++ status_new = (status_old & ~mask) | val;
-++
-++ /* Only modify protection if it will not lock other areas */
-++ if ((status_new & mask) >= (status_old & mask))
-++ return -EINVAL;
-++
-++ write_enable(nor);
-++ return write_sr(nor, status_new);
-+ }
-+
-+-static int spi_nor_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len)
-++/*
-++ * Check if a region of the flash is (completely) locked. See stm_lock() for
-++ * more info.
-++ *
-++ * Returns 1 if entire region is locked, 0 if any portion is unlocked, and
-++ * negative on errors.
-++ */
-++static int stm_is_locked(struct spi_nor *nor, loff_t ofs, uint64_t len)
-++{
-++ int status;
-++
-++ status = read_sr(nor);
-++ if (status < 0)
-++ return status;
-++
-++ return stm_is_locked_sr(nor, ofs, len, status);
-++}
-++
-++static int spi_nor_lock(struct mtd_info *mtd, loff_t ofs, uint64_t len)
-+ {
-+ struct spi_nor *nor = mtd_to_spi_nor(mtd);
-+- uint32_t offset = ofs;
-+- uint8_t status_old, status_new;
-+- int ret = 0;
-++ int ret;
-+
-+- ret = spi_nor_lock_and_prep(nor, SPI_NOR_OPS_UNLOCK);
-++ ret = spi_nor_lock_and_prep(nor, SPI_NOR_OPS_LOCK);
-+ if (ret)
-+ return ret;
-+
-+- /* Wait until finished previous command */
-+- ret = wait_till_ready(nor);
-+- if (ret)
-+- goto err;
-++ ret = nor->flash_lock(nor, ofs, len);
-+
-+- status_old = read_sr(nor);
-++ spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_UNLOCK);
-++ return ret;
-++}
-+
-+- if (offset+len > mtd->size - (mtd->size / 64))
-+- status_new = status_old & ~(SR_BP2 | SR_BP1 | SR_BP0);
-+- else if (offset+len > mtd->size - (mtd->size / 32))
-+- status_new = (status_old & ~(SR_BP2 | SR_BP1)) | SR_BP0;
-+- else if (offset+len > mtd->size - (mtd->size / 16))
-+- status_new = (status_old & ~(SR_BP2 | SR_BP0)) | SR_BP1;
-+- else if (offset+len > mtd->size - (mtd->size / 8))
-+- status_new = (status_old & ~SR_BP2) | SR_BP1 | SR_BP0;
-+- else if (offset+len > mtd->size - (mtd->size / 4))
-+- status_new = (status_old & ~(SR_BP0 | SR_BP1)) | SR_BP2;
-+- else if (offset+len > mtd->size - (mtd->size / 2))
-+- status_new = (status_old & ~SR_BP1) | SR_BP2 | SR_BP0;
-+- else
-+- status_new = (status_old & ~SR_BP0) | SR_BP2 | SR_BP1;
-++static int spi_nor_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len)
-++{
-++ struct spi_nor *nor = mtd_to_spi_nor(mtd);
-++ int ret;
-+
-+- /* Only modify protection if it will not lock other areas */
-+- if ((status_new & (SR_BP2 | SR_BP1 | SR_BP0)) <
-+- (status_old & (SR_BP2 | SR_BP1 | SR_BP0))) {
-+- write_enable(nor);
-+- ret = write_sr(nor, status_new);
-+- if (ret)
-+- goto err;
-+- }
-++ ret = spi_nor_lock_and_prep(nor, SPI_NOR_OPS_UNLOCK);
-++ if (ret)
-++ return ret;
-+
-+-err:
-+- spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_UNLOCK);
-++ ret = nor->flash_unlock(nor, ofs, len);
-++
-++ spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_LOCK);
-+ return ret;
-+ }
-+
-+-struct flash_info {
-+- /* JEDEC id zero means "no ID" (most older chips); otherwise it has
-+- * a high byte of zero plus three data bytes: the manufacturer id,
-+- * then a two byte device id.
-+- */
-+- u32 jedec_id;
-+- u16 ext_id;
-++static int spi_nor_is_locked(struct mtd_info *mtd, loff_t ofs, uint64_t len)
-++{
-++ struct spi_nor *nor = mtd_to_spi_nor(mtd);
-++ int ret;
-+
-+- /* The size listed here is what works with SPINOR_OP_SE, which isn't
-+- * necessarily called a "sector" by the vendor.
-+- */
-+- unsigned sector_size;
-+- u16 n_sectors;
-++ ret = spi_nor_lock_and_prep(nor, SPI_NOR_OPS_UNLOCK);
-++ if (ret)
-++ return ret;
-+
-+- u16 page_size;
-+- u16 addr_width;
-++ ret = nor->flash_is_locked(nor, ofs, len);
-+
-+- u16 flags;
-+-#define SECT_4K 0x01 /* SPINOR_OP_BE_4K works uniformly */
-+-#define SPI_NOR_NO_ERASE 0x02 /* No erase command needed */
-+-#define SST_WRITE 0x04 /* use SST byte programming */
-+-#define SPI_NOR_NO_FR 0x08 /* Can't do fastread */
-+-#define SECT_4K_PMC 0x10 /* SPINOR_OP_BE_4K_PMC works uniformly */
-+-#define SPI_NOR_DUAL_READ 0x20 /* Flash supports Dual Read */
-+-#define SPI_NOR_QUAD_READ 0x40 /* Flash supports Quad Read */
-+-#define USE_FSR 0x80 /* use flag status register */
-+-};
-++ spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_LOCK);
-++ return ret;
-++}
-+
-++/* Used when the "_ext_id" is two bytes at most */
-+ #define INFO(_jedec_id, _ext_id, _sector_size, _n_sectors, _flags) \
-+- ((kernel_ulong_t)&(struct flash_info) { \
-+- .jedec_id = (_jedec_id), \
-+- .ext_id = (_ext_id), \
-++ .id = { \
-++ ((_jedec_id) >> 16) & 0xff, \
-++ ((_jedec_id) >> 8) & 0xff, \
-++ (_jedec_id) & 0xff, \
-++ ((_ext_id) >> 8) & 0xff, \
-++ (_ext_id) & 0xff, \
-++ }, \
-++ .id_len = (!(_jedec_id) ? 0 : (3 + ((_ext_id) ? 2 : 0))), \
-++ .sector_size = (_sector_size), \
-++ .n_sectors = (_n_sectors), \
-++ .page_size = 256, \
-++ .flags = (_flags),
-++
-++#define INFO6(_jedec_id, _ext_id, _sector_size, _n_sectors, _flags) \
-++ .id = { \
-++ ((_jedec_id) >> 16) & 0xff, \
-++ ((_jedec_id) >> 8) & 0xff, \
-++ (_jedec_id) & 0xff, \
-++ ((_ext_id) >> 16) & 0xff, \
-++ ((_ext_id) >> 8) & 0xff, \
-++ (_ext_id) & 0xff, \
-++ }, \
-++ .id_len = 6, \
-+ .sector_size = (_sector_size), \
-+ .n_sectors = (_n_sectors), \
-+ .page_size = 256, \
-+- .flags = (_flags), \
-+- })
-++ .flags = (_flags),
-+
-+ #define CAT25_INFO(_sector_size, _n_sectors, _page_size, _addr_width, _flags) \
-+- ((kernel_ulong_t)&(struct flash_info) { \
-+ .sector_size = (_sector_size), \
-+ .n_sectors = (_n_sectors), \
-+ .page_size = (_page_size), \
-+ .addr_width = (_addr_width), \
-+- .flags = (_flags), \
-+- })
-++ .flags = (_flags),
-+
-+ /* NOTE: double check command sets and memory organization when you add
-+ * more nor chips. This current list focusses on newer chips, which
-+ * have been converging on command sets which including JEDEC ID.
-++ *
-++ * All newly added entries should describe *hardware* and should use SECT_4K
-++ * (or SECT_4K_PMC) if hardware supports erasing 4 KiB sectors. For usage
-++ * scenarios excluding small sectors there is config option that can be
-++ * disabled: CONFIG_MTD_SPI_NOR_USE_4K_SECTORS.
-++ * For historical (and compatibility) reasons (before we got above config) some
-++ * old entries may be missing 4K flag.
-+ */
-+-static const struct spi_device_id spi_nor_ids[] = {
-++static const struct flash_info spi_nor_ids[] = {
-+ /* Atmel -- some are (confusingly) marketed as "DataFlash" */
-+ { "at25fs010", INFO(0x1f6601, 0, 32 * 1024, 4, SECT_4K) },
-+ { "at25fs040", INFO(0x1f6604, 0, 64 * 1024, 8, SECT_4K) },
-+@@ -499,6 +684,7 @@ static const struct spi_device_id spi_no
-+ { "en25q64", INFO(0x1c3017, 0, 64 * 1024, 128, SECT_4K) },
-+ { "en25qh128", INFO(0x1c7018, 0, 64 * 1024, 256, 0) },
-+ { "en25qh256", INFO(0x1c7019, 0, 64 * 1024, 512, 0) },
-++ { "en25s64", INFO(0x1c3817, 0, 64 * 1024, 128, SECT_4K) },
-+
-+ /* ESMT */
-+ { "f25l32pa", INFO(0x8c2016, 0, 64 * 1024, 64, SECT_4K) },
-+@@ -507,16 +693,24 @@ static const struct spi_device_id spi_no
-+ { "mr25h256", CAT25_INFO( 32 * 1024, 1, 256, 2, SPI_NOR_NO_ERASE | SPI_NOR_NO_FR) },
-+ { "mr25h10", CAT25_INFO(128 * 1024, 1, 256, 3, SPI_NOR_NO_ERASE | SPI_NOR_NO_FR) },
-+
-++ /* Fujitsu */
-++ { "mb85rs1mt", INFO(0x047f27, 0, 128 * 1024, 1, SPI_NOR_NO_ERASE) },
-++
-+ /* GigaDevice */
-+ { "gd25q32", INFO(0xc84016, 0, 64 * 1024, 64, SECT_4K) },
-+ { "gd25q64", INFO(0xc84017, 0, 64 * 1024, 128, SECT_4K) },
-++ { "gd25q128", INFO(0xc84018, 0, 64 * 1024, 256, SECT_4K) },
-+
-+ /* Intel/Numonyx -- xxxs33b */
-+ { "160s33b", INFO(0x898911, 0, 64 * 1024, 32, 0) },
-+ { "320s33b", INFO(0x898912, 0, 64 * 1024, 64, 0) },
-+ { "640s33b", INFO(0x898913, 0, 64 * 1024, 128, 0) },
-+
-++ /* ISSI */
-++ { "is25cd512", INFO(0x7f9d20, 0, 32 * 1024, 2, SECT_4K) },
-++
-+ /* Macronix */
-++ { "mx25l512e", INFO(0xc22010, 0, 64 * 1024, 1, SECT_4K) },
-+ { "mx25l2005a", INFO(0xc22012, 0, 64 * 1024, 4, SECT_4K) },
-+ { "mx25l4005a", INFO(0xc22013, 0, 64 * 1024, 8, SECT_4K) },
-+ { "mx25l8005", INFO(0xc22014, 0, 64 * 1024, 16, 0) },
-+@@ -524,6 +718,7 @@ static const struct spi_device_id spi_no
-+ { "mx25l3205d", INFO(0xc22016, 0, 64 * 1024, 64, 0) },
-+ { "mx25l3255e", INFO(0xc29e16, 0, 64 * 1024, 64, SECT_4K) },
-+ { "mx25l6405d", INFO(0xc22017, 0, 64 * 1024, 128, 0) },
-++ { "mx25u6435f", INFO(0xc22537, 0, 64 * 1024, 128, SECT_4K) },
-+ { "mx25l12805d", INFO(0xc22018, 0, 64 * 1024, 256, 0) },
-+ { "mx25l12855e", INFO(0xc22618, 0, 64 * 1024, 256, 0) },
-+ { "mx25l25635e", INFO(0xc22019, 0, 64 * 1024, 512, 0) },
-+@@ -532,13 +727,16 @@ static const struct spi_device_id spi_no
-+ { "mx66l1g55g", INFO(0xc2261b, 0, 64 * 1024, 2048, SPI_NOR_QUAD_READ) },
-+
-+ /* Micron */
-+- { "n25q064", INFO(0x20ba17, 0, 64 * 1024, 128, 0) },
-+- { "n25q128a11", INFO(0x20bb18, 0, 64 * 1024, 256, 0) },
-+- { "n25q128a13", INFO(0x20ba18, 0, 64 * 1024, 256, 0) },
-+- { "n25q256a", INFO(0x20ba19, 0, 64 * 1024, 512, SECT_4K) },
-+- { "n25q512a", INFO(0x20bb20, 0, 64 * 1024, 1024, SECT_4K) },
-+- { "n25q512ax3", INFO(0x20ba20, 0, 64 * 1024, 1024, USE_FSR) },
-+- { "n25q00", INFO(0x20ba21, 0, 64 * 1024, 2048, USE_FSR) },
-++ { "n25q032", INFO(0x20ba16, 0, 64 * 1024, 64, SPI_NOR_QUAD_READ) },
-++ { "n25q032a", INFO(0x20bb16, 0, 64 * 1024, 64, SPI_NOR_QUAD_READ) },
-++ { "n25q064", INFO(0x20ba17, 0, 64 * 1024, 128, SECT_4K | SPI_NOR_QUAD_READ) },
-++ { "n25q064a", INFO(0x20bb17, 0, 64 * 1024, 128, SECT_4K | SPI_NOR_QUAD_READ) },
-++ { "n25q128a11", INFO(0x20bb18, 0, 64 * 1024, 256, SPI_NOR_QUAD_READ) },
-++ { "n25q128a13", INFO(0x20ba18, 0, 64 * 1024, 256, SPI_NOR_QUAD_READ) },
-++ { "n25q256a", INFO(0x20ba19, 0, 64 * 1024, 512, SECT_4K | SPI_NOR_QUAD_READ) },
-++ { "n25q512a", INFO(0x20bb20, 0, 64 * 1024, 1024, SECT_4K | USE_FSR | SPI_NOR_QUAD_READ) },
-++ { "n25q512ax3", INFO(0x20ba20, 0, 64 * 1024, 1024, SECT_4K | USE_FSR | SPI_NOR_QUAD_READ) },
-++ { "n25q00", INFO(0x20ba21, 0, 64 * 1024, 2048, SECT_4K | USE_FSR | SPI_NOR_QUAD_READ) },
-+
-+ /* PMC */
-+ { "pm25lv512", INFO(0, 0, 32 * 1024, 2, SECT_4K_PMC) },
-+@@ -549,23 +747,28 @@ static const struct spi_device_id spi_no
-+ * for the chips listed here (without boot sectors).
-+ */
-+ { "s25sl032p", INFO(0x010215, 0x4d00, 64 * 1024, 64, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
-+- { "s25sl064p", INFO(0x010216, 0x4d00, 64 * 1024, 128, 0) },
-++ { "s25sl064p", INFO(0x010216, 0x4d00, 64 * 1024, 128, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
-+ { "s25fl256s0", INFO(0x010219, 0x4d00, 256 * 1024, 128, 0) },
-+ { "s25fl256s1", INFO(0x010219, 0x4d01, 64 * 1024, 512, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
-+ { "s25fl512s", INFO(0x010220, 0x4d00, 256 * 1024, 256, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
-+ { "s70fl01gs", INFO(0x010221, 0x4d00, 256 * 1024, 256, 0) },
-+ { "s25sl12800", INFO(0x012018, 0x0300, 256 * 1024, 64, 0) },
-+ { "s25sl12801", INFO(0x012018, 0x0301, 64 * 1024, 256, 0) },
-+- { "s25fl129p0", INFO(0x012018, 0x4d00, 256 * 1024, 64, 0) },
-+- { "s25fl129p1", INFO(0x012018, 0x4d01, 64 * 1024, 256, 0) },
-++ { "s25fl128s", INFO6(0x012018, 0x4d0180, 64 * 1024, 256, SECT_4K | SPI_NOR_QUAD_READ) },
-++ { "s25fl129p0", INFO(0x012018, 0x4d00, 256 * 1024, 64, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
-++ { "s25fl129p1", INFO(0x012018, 0x4d01, 64 * 1024, 256, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
-+ { "s25sl004a", INFO(0x010212, 0, 64 * 1024, 8, 0) },
-+ { "s25sl008a", INFO(0x010213, 0, 64 * 1024, 16, 0) },
-+ { "s25sl016a", INFO(0x010214, 0, 64 * 1024, 32, 0) },
-+ { "s25sl032a", INFO(0x010215, 0, 64 * 1024, 64, 0) },
-+ { "s25sl064a", INFO(0x010216, 0, 64 * 1024, 128, 0) },
-+- { "s25fl008k", INFO(0xef4014, 0, 64 * 1024, 16, SECT_4K) },
-+- { "s25fl016k", INFO(0xef4015, 0, 64 * 1024, 32, SECT_4K) },
-++ { "s25fl004k", INFO(0xef4013, 0, 64 * 1024, 8, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
-++ { "s25fl008k", INFO(0xef4014, 0, 64 * 1024, 16, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
-++ { "s25fl016k", INFO(0xef4015, 0, 64 * 1024, 32, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
-+ { "s25fl064k", INFO(0xef4017, 0, 64 * 1024, 128, SECT_4K) },
-++ { "s25fl132k", INFO(0x014016, 0, 64 * 1024, 64, SECT_4K) },
-++ { "s25fl164k", INFO(0x014017, 0, 64 * 1024, 128, SECT_4K) },
-++ { "s25fl204k", INFO(0x014013, 0, 64 * 1024, 8, SECT_4K | SPI_NOR_DUAL_READ) },
-+
-+ /* SST -- large erase sizes are "overlays", "sectors" are 4K */
-+ { "sst25vf040b", INFO(0xbf258d, 0, 64 * 1024, 8, SECT_4K | SST_WRITE) },
-+@@ -576,7 +779,10 @@ static const struct spi_device_id spi_no
-+ { "sst25wf512", INFO(0xbf2501, 0, 64 * 1024, 1, SECT_4K | SST_WRITE) },
-+ { "sst25wf010", INFO(0xbf2502, 0, 64 * 1024, 2, SECT_4K | SST_WRITE) },
-+ { "sst25wf020", INFO(0xbf2503, 0, 64 * 1024, 4, SECT_4K | SST_WRITE) },
-++ { "sst25wf020a", INFO(0x621612, 0, 64 * 1024, 4, SECT_4K) },
-++ { "sst25wf040b", INFO(0x621613, 0, 64 * 1024, 8, SECT_4K) },
-+ { "sst25wf040", INFO(0xbf2504, 0, 64 * 1024, 8, SECT_4K | SST_WRITE) },
-++ { "sst25wf080", INFO(0xbf2505, 0, 64 * 1024, 16, SECT_4K | SST_WRITE) },
-+
-+ /* ST Microelectronics -- newer production may have feature updates */
-+ { "m25p05", INFO(0x202010, 0, 32 * 1024, 2, 0) },
-+@@ -588,7 +794,6 @@ static const struct spi_device_id spi_no
-+ { "m25p32", INFO(0x202016, 0, 64 * 1024, 64, 0) },
-+ { "m25p64", INFO(0x202017, 0, 64 * 1024, 128, 0) },
-+ { "m25p128", INFO(0x202018, 0, 256 * 1024, 64, 0) },
-+- { "n25q032", INFO(0x20ba16, 0, 64 * 1024, 64, 0) },
-+
-+ { "m25p05-nonjedec", INFO(0, 0, 32 * 1024, 2, 0) },
-+ { "m25p10-nonjedec", INFO(0, 0, 32 * 1024, 4, 0) },
-+@@ -616,6 +821,7 @@ static const struct spi_device_id spi_no
-+ { "m25px80", INFO(0x207114, 0, 64 * 1024, 16, 0) },
-+
-+ /* Winbond -- w25x "blocks" are 64K, "sectors" are 4KiB */
-++ { "w25x05", INFO(0xef3010, 0, 64 * 1024, 1, SECT_4K) },
-+ { "w25x10", INFO(0xef3011, 0, 64 * 1024, 2, SECT_4K) },
-+ { "w25x20", INFO(0xef3012, 0, 64 * 1024, 4, SECT_4K) },
-+ { "w25x40", INFO(0xef3013, 0, 64 * 1024, 8, SECT_4K) },
-+@@ -623,9 +829,11 @@ static const struct spi_device_id spi_no
-+ { "w25x16", INFO(0xef3015, 0, 64 * 1024, 32, SECT_4K) },
-+ { "w25x32", INFO(0xef3016, 0, 64 * 1024, 64, SECT_4K) },
-+ { "w25q32", INFO(0xef4016, 0, 64 * 1024, 64, SECT_4K) },
-+- { "w25q32dw", INFO(0xef6016, 0, 64 * 1024, 64, SECT_4K) },
-++ { "w25q32dw", INFO(0xef6016, 0, 64 * 1024, 64, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
-+ { "w25x64", INFO(0xef3017, 0, 64 * 1024, 128, SECT_4K) },
-+ { "w25q64", INFO(0xef4017, 0, 64 * 1024, 128, SECT_4K) },
-++ { "w25q64dw", INFO(0xef6017, 0, 64 * 1024, 128, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
-++ { "w25q128fw", INFO(0xef6018, 0, 64 * 1024, 256, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) },
-+ { "w25q80", INFO(0xef5014, 0, 64 * 1024, 16, SECT_4K) },
-+ { "w25q80bl", INFO(0xef4014, 0, 64 * 1024, 16, SECT_4K) },
-+ { "w25q128", INFO(0xef4018, 0, 64 * 1024, 256, SECT_4K) },
-+@@ -640,35 +848,27 @@ static const struct spi_device_id spi_no
-+ { },
-+ };
-+
-+-static const struct spi_device_id *spi_nor_read_id(struct spi_nor *nor)
-++static const struct flash_info *spi_nor_read_id(struct spi_nor *nor)
-+ {
-+ int tmp;
-+- u8 id[5];
-+- u32 jedec;
-+- u16 ext_jedec;
-+- struct flash_info *info;
-++ u8 id[SPI_NOR_MAX_ID_LEN];
-++ const struct flash_info *info;
-+
-+- tmp = nor->read_reg(nor, SPINOR_OP_RDID, id, 5);
-++ tmp = nor->read_reg(nor, SPINOR_OP_RDID, id, SPI_NOR_MAX_ID_LEN);
-+ if (tmp < 0) {
-+ dev_dbg(nor->dev, " error %d reading JEDEC ID\n", tmp);
-+ return ERR_PTR(tmp);
-+ }
-+- jedec = id[0];
-+- jedec = jedec << 8;
-+- jedec |= id[1];
-+- jedec = jedec << 8;
-+- jedec |= id[2];
-+-
-+- ext_jedec = id[3] << 8 | id[4];
-+
-+ for (tmp = 0; tmp < ARRAY_SIZE(spi_nor_ids) - 1; tmp++) {
-+- info = (void *)spi_nor_ids[tmp].driver_data;
-+- if (info->jedec_id == jedec) {
-+- if (info->ext_id == 0 || info->ext_id == ext_jedec)
-++ info = &spi_nor_ids[tmp];
-++ if (info->id_len) {
-++ if (!memcmp(info->id, id, info->id_len))
-+ return &spi_nor_ids[tmp];
-+ }
-+ }
-+- dev_err(nor->dev, "unrecognized JEDEC id %06x\n", jedec);
-++ dev_err(nor->dev, "unrecognized JEDEC id bytes: %02x, %2x, %2x\n",
-++ id[0], id[1], id[2]);
-+ return ERR_PTR(-ENODEV);
-+ }
-+
-+@@ -703,11 +903,6 @@ static int sst_write(struct mtd_info *mt
-+ if (ret)
-+ return ret;
-+
-+- /* Wait until finished previous write command. */
-+- ret = wait_till_ready(nor);
-+- if (ret)
-+- goto time_out;
-+-
-+ write_enable(nor);
-+
-+ nor->sst_write_second = false;
-+@@ -719,7 +914,7 @@ static int sst_write(struct mtd_info *mt
-+
-+ /* write one byte. */
-+ nor->write(nor, to, 1, retlen, buf);
-+- ret = wait_till_ready(nor);
-++ ret = spi_nor_wait_till_ready(nor);
-+ if (ret)
-+ goto time_out;
-+ }
-+@@ -731,7 +926,7 @@ static int sst_write(struct mtd_info *mt
-+
-+ /* write two bytes. */
-+ nor->write(nor, to, 2, retlen, buf + actual);
-+- ret = wait_till_ready(nor);
-++ ret = spi_nor_wait_till_ready(nor);
-+ if (ret)
-+ goto time_out;
-+ to += 2;
-+@@ -740,7 +935,7 @@ static int sst_write(struct mtd_info *mt
-+ nor->sst_write_second = false;
-+
-+ write_disable(nor);
-+- ret = wait_till_ready(nor);
-++ ret = spi_nor_wait_till_ready(nor);
-+ if (ret)
-+ goto time_out;
-+
-+@@ -751,7 +946,7 @@ static int sst_write(struct mtd_info *mt
-+ nor->program_opcode = SPINOR_OP_BP;
-+ nor->write(nor, to, 1, retlen, buf + actual);
-+
-+- ret = wait_till_ready(nor);
-++ ret = spi_nor_wait_till_ready(nor);
-+ if (ret)
-+ goto time_out;
-+ write_disable(nor);
-+@@ -779,11 +974,6 @@ static int spi_nor_write(struct mtd_info
-+ if (ret)
-+ return ret;
-+
-+- /* Wait until finished previous write command. */
-+- ret = wait_till_ready(nor);
-+- if (ret)
-+- goto write_err;
-+-
-+ write_enable(nor);
-+
-+ page_offset = to & (nor->page_size - 1);
-+@@ -802,16 +992,20 @@ static int spi_nor_write(struct mtd_info
-+ if (page_size > nor->page_size)
-+ page_size = nor->page_size;
-+
-+- wait_till_ready(nor);
-++ ret = spi_nor_wait_till_ready(nor);
-++ if (ret)
-++ goto write_err;
-++
-+ write_enable(nor);
-+
-+ nor->write(nor, to + i, page_size, retlen, buf + i);
-+ }
-+ }
-+
-++ ret = spi_nor_wait_till_ready(nor);
-+ write_err:
-+ spi_nor_unlock_and_unprep(nor, SPI_NOR_OPS_WRITE);
-+- return 0;
-++ return ret;
-+ }
-+
-+ static int macronix_quad_enable(struct spi_nor *nor)
-+@@ -821,10 +1015,9 @@ static int macronix_quad_enable(struct s
-+ val = read_sr(nor);
-+ write_enable(nor);
-+
-+- nor->cmd_buf[0] = val | SR_QUAD_EN_MX;
-+- nor->write_reg(nor, SPINOR_OP_WRSR, nor->cmd_buf, 1, 0);
-++ write_sr(nor, val | SR_QUAD_EN_MX);
-+
-+- if (wait_till_ready(nor))
-++ if (spi_nor_wait_till_ready(nor))
-+ return 1;
-+
-+ ret = read_sr(nor);
-+@@ -847,7 +1040,7 @@ static int write_sr_cr(struct spi_nor *n
-+ nor->cmd_buf[0] = val & 0xff;
-+ nor->cmd_buf[1] = (val >> 8);
-+
-+- return nor->write_reg(nor, SPINOR_OP_WRSR, nor->cmd_buf, 2, 0);
-++ return nor->write_reg(nor, SPINOR_OP_WRSR, nor->cmd_buf, 2);
-+ }
-+
-+ static int spansion_quad_enable(struct spi_nor *nor)
-+@@ -874,18 +1067,20 @@ static int spansion_quad_enable(struct s
-+ return 0;
-+ }
-+
-+-static int set_quad_mode(struct spi_nor *nor, u32 jedec_id)
-++static int set_quad_mode(struct spi_nor *nor, const struct flash_info *info)
-+ {
-+ int status;
-+
-+- switch (JEDEC_MFR(jedec_id)) {
-+- case CFI_MFR_MACRONIX:
-++ switch (JEDEC_MFR(info)) {
-++ case SNOR_MFR_MACRONIX:
-+ status = macronix_quad_enable(nor);
-+ if (status) {
-+ dev_err(nor->dev, "Macronix quad-read not enabled\n");
-+ return -EINVAL;
-+ }
-+ return status;
-++ case SNOR_MFR_MICRON:
-++ return 0;
-+ default:
-+ status = spansion_quad_enable(nor);
-+ if (status) {
-+@@ -904,21 +1099,15 @@ static int spi_nor_check(struct spi_nor
-+ return -EINVAL;
-+ }
-+
-+- if (!nor->read_id)
-+- nor->read_id = spi_nor_read_id;
-+- if (!nor->wait_till_ready)
-+- nor->wait_till_ready = spi_nor_wait_till_ready;
-+-
-+ return 0;
-+ }
-+
-+ int spi_nor_scan(struct spi_nor *nor, const char *name, enum read_mode mode)
-+ {
-+- const struct spi_device_id *id = NULL;
-+- struct flash_info *info;
-++ const struct flash_info *info = NULL;
-+ struct device *dev = nor->dev;
-+- struct mtd_info *mtd = nor->mtd;
-+- struct device_node *np = dev->of_node;
-++ struct mtd_info *mtd = &nor->mtd;
-++ struct device_node *np = nor->flash_node;
-+ int ret;
-+ int i;
-+
-+@@ -926,19 +1115,25 @@ int spi_nor_scan(struct spi_nor *nor, co
-+ if (ret)
-+ return ret;
-+
-+- id = spi_nor_match_id(name);
-+- if (!id)
-++ if (name)
-++ info = spi_nor_match_id(name);
-++ /* Try to auto-detect if chip name wasn't specified or not found */
-++ if (!info)
-++ info = spi_nor_read_id(nor);
-++ if (IS_ERR_OR_NULL(info))
-+ return -ENOENT;
-+
-+- info = (void *)id->driver_data;
-+-
-+- if (info->jedec_id) {
-+- const struct spi_device_id *jid;
-++ /*
-++ * If caller has specified name of flash model that can normally be
-++ * detected using JEDEC, let's verify it.
-++ */
-++ if (name && info->id_len) {
-++ const struct flash_info *jinfo;
-+
-+- jid = nor->read_id(nor);
-+- if (IS_ERR(jid)) {
-+- return PTR_ERR(jid);
-+- } else if (jid != id) {
-++ jinfo = spi_nor_read_id(nor);
-++ if (IS_ERR(jinfo)) {
-++ return PTR_ERR(jinfo);
-++ } else if (jinfo != info) {
-+ /*
-+ * JEDEC knows better, so overwrite platform ID. We
-+ * can't trust partitions any longer, but we'll let
-+@@ -947,28 +1142,28 @@ int spi_nor_scan(struct spi_nor *nor, co
-+ * information, even if it's not 100% accurate.
-+ */
-+ dev_warn(dev, "found %s, expected %s\n",
-+- jid->name, id->name);
-+- id = jid;
-+- info = (void *)jid->driver_data;
-++ jinfo->name, info->name);
-++ info = jinfo;
-+ }
-+ }
-+
-+ mutex_init(&nor->lock);
-+
-+ /*
-+- * Atmel, SST and Intel/Numonyx serial nor tend to power
-+- * up with the software protection bits set
-++ * Atmel, SST, Intel/Numonyx, and others serial NOR tend to power up
-++ * with the software protection bits set
-+ */
-+
-+- if (JEDEC_MFR(info->jedec_id) == CFI_MFR_ATMEL ||
-+- JEDEC_MFR(info->jedec_id) == CFI_MFR_INTEL ||
-+- JEDEC_MFR(info->jedec_id) == CFI_MFR_SST) {
-++ if (JEDEC_MFR(info) == SNOR_MFR_ATMEL ||
-++ JEDEC_MFR(info) == SNOR_MFR_INTEL ||
-++ JEDEC_MFR(info) == SNOR_MFR_SST) {
-+ write_enable(nor);
-+ write_sr(nor, 0);
-+ }
-+
-+ if (!mtd->name)
-+ mtd->name = dev_name(dev);
-++ mtd->priv = nor;
-+ mtd->type = MTD_NORFLASH;
-+ mtd->writesize = 1;
-+ mtd->flags = MTD_CAP_NORFLASH;
-+@@ -976,10 +1171,17 @@ int spi_nor_scan(struct spi_nor *nor, co
-+ mtd->_erase = spi_nor_erase;
-+ mtd->_read = spi_nor_read;
-+
-+- /* nor protection support for STmicro chips */
-+- if (JEDEC_MFR(info->jedec_id) == CFI_MFR_ST) {
-++ /* NOR protection support for STmicro/Micron chips and similar */
-++ if (JEDEC_MFR(info) == SNOR_MFR_MICRON) {
-++ nor->flash_lock = stm_lock;
-++ nor->flash_unlock = stm_unlock;
-++ nor->flash_is_locked = stm_is_locked;
-++ }
-++
-++ if (nor->flash_lock && nor->flash_unlock && nor->flash_is_locked) {
-+ mtd->_lock = spi_nor_lock;
-+ mtd->_unlock = spi_nor_unlock;
-++ mtd->_is_locked = spi_nor_is_locked;
-+ }
-+
-+ /* sst nor chips use AAI word program */
-+@@ -988,9 +1190,8 @@ int spi_nor_scan(struct spi_nor *nor, co
-+ else
-+ mtd->_write = spi_nor_write;
-+
-+- if ((info->flags & USE_FSR) &&
-+- nor->wait_till_ready == spi_nor_wait_till_ready)
-+- nor->wait_till_ready = spi_nor_wait_till_fsr_ready;
-++ if (info->flags & USE_FSR)
-++ nor->flags |= SNOR_F_USE_FSR;
-+
-+ #ifdef CONFIG_MTD_SPI_NOR_USE_4K_SECTORS
-+ /* prefer "small sector" erase if possible */
-+@@ -1031,7 +1232,7 @@ int spi_nor_scan(struct spi_nor *nor, co
-+
-+ /* Quad/Dual-read mode takes precedence over fast/normal */
-+ if (mode == SPI_NOR_QUAD && info->flags & SPI_NOR_QUAD_READ) {
-+- ret = set_quad_mode(nor, info->jedec_id);
-++ ret = set_quad_mode(nor, info);
-+ if (ret) {
-+ dev_err(dev, "quad mode not supported\n");
-+ return ret;
-+@@ -1067,7 +1268,7 @@ int spi_nor_scan(struct spi_nor *nor, co
-+ else if (mtd->size > 0x1000000) {
-+ /* enable 4-byte addressing if the device exceeds 16MiB */
-+ nor->addr_width = 4;
-+- if (JEDEC_MFR(info->jedec_id) == CFI_MFR_AMD) {
-++ if (JEDEC_MFR(info) == SNOR_MFR_SPANSION) {
-+ /* Dedicated 4-byte command set */
-+ switch (nor->flash_read) {
-+ case SPI_NOR_QUAD:
-+@@ -1088,14 +1289,14 @@ int spi_nor_scan(struct spi_nor *nor, co
-+ nor->erase_opcode = SPINOR_OP_SE_4B;
-+ mtd->erasesize = info->sector_size;
-+ } else
-+- set_4byte(nor, info->jedec_id, 1);
-++ set_4byte(nor, info, 1);
-+ } else {
-+ nor->addr_width = 3;
-+ }
-+
-+ nor->read_dummy = spi_nor_read_dummy_cycles(nor);
-+
-+- dev_info(dev, "%s (%lld Kbytes)\n", id->name,
-++ dev_info(dev, "%s (%lld Kbytes)\n", info->name,
-+ (long long)mtd->size >> 10);
-+
-+ dev_dbg(dev,
-+@@ -1118,11 +1319,11 @@ int spi_nor_scan(struct spi_nor *nor, co
-+ }
-+ EXPORT_SYMBOL_GPL(spi_nor_scan);
-+
-+-static const struct spi_device_id *spi_nor_match_id(const char *name)
-++static const struct flash_info *spi_nor_match_id(const char *name)
-+ {
-+- const struct spi_device_id *id = spi_nor_ids;
-++ const struct flash_info *id = spi_nor_ids;
-+
-+- while (id->name[0]) {
-++ while (id->name) {
-+ if (!strcmp(name, id->name))
-+ return id;
-+ id++;
-+--- a/include/linux/mtd/spi-nor.h
-++++ b/include/linux/mtd/spi-nor.h
-+@@ -10,6 +10,23 @@
-+ #ifndef __LINUX_MTD_SPI_NOR_H
-+ #define __LINUX_MTD_SPI_NOR_H
-+
-++#include <linux/bitops.h>
-++#include <linux/mtd/cfi.h>
-++
-++/*
-++ * Manufacturer IDs
-++ *
-++ * The first byte returned from the flash after sending opcode SPINOR_OP_RDID.
-++ * Sometimes these are the same as CFI IDs, but sometimes they aren't.
-++ */
-++#define SNOR_MFR_ATMEL CFI_MFR_ATMEL
-++#define SNOR_MFR_INTEL CFI_MFR_INTEL
-++#define SNOR_MFR_MICRON CFI_MFR_ST /* ST Micro <--> Micron */
-++#define SNOR_MFR_MACRONIX CFI_MFR_MACRONIX
-++#define SNOR_MFR_SPANSION CFI_MFR_AMD
-++#define SNOR_MFR_SST CFI_MFR_SST
-++#define SNOR_MFR_WINBOND 0xef /* Also used by some Spansion */
-++
-+ /*
-+ * Note on opcode nomenclature: some opcodes have a format like
-+ * SPINOR_OP_FUNCTION{4,}_x_y_z. The numbers x, y, and z stand for the number
-+@@ -56,22 +73,29 @@
-+ /* Used for Spansion flashes only. */
-+ #define SPINOR_OP_BRWR 0x17 /* Bank register write */
-+
-++/* Used for Micron flashes only. */
-++#define SPINOR_OP_RD_EVCR 0x65 /* Read EVCR register */
-++#define SPINOR_OP_WD_EVCR 0x61 /* Write EVCR register */
-++
-+ /* Status Register bits. */
-+-#define SR_WIP 1 /* Write in progress */
-+-#define SR_WEL 2 /* Write enable latch */
-++#define SR_WIP BIT(0) /* Write in progress */
-++#define SR_WEL BIT(1) /* Write enable latch */
-+ /* meaning of other SR_* bits may differ between vendors */
-+-#define SR_BP0 4 /* Block protect 0 */
-+-#define SR_BP1 8 /* Block protect 1 */
-+-#define SR_BP2 0x10 /* Block protect 2 */
-+-#define SR_SRWD 0x80 /* SR write protect */
-++#define SR_BP0 BIT(2) /* Block protect 0 */
-++#define SR_BP1 BIT(3) /* Block protect 1 */
-++#define SR_BP2 BIT(4) /* Block protect 2 */
-++#define SR_SRWD BIT(7) /* SR write protect */
-++
-++#define SR_QUAD_EN_MX BIT(6) /* Macronix Quad I/O */
-+
-+-#define SR_QUAD_EN_MX 0x40 /* Macronix Quad I/O */
-++/* Enhanced Volatile Configuration Register bits */
-++#define EVCR_QUAD_EN_MICRON BIT(7) /* Micron Quad I/O */
-+
-+ /* Flag Status Register bits */
-+-#define FSR_READY 0x80
-++#define FSR_READY BIT(7)
-+
-+ /* Configuration Register bits. */
-+-#define CR_QUAD_EN_SPAN 0x2 /* Spansion Quad I/O */
-++#define CR_QUAD_EN_SPAN BIT(1) /* Spansion Quad I/O */
-+
-+ enum read_mode {
-+ SPI_NOR_NORMAL = 0,
-+@@ -80,33 +104,6 @@ enum read_mode {
-+ SPI_NOR_QUAD,
-+ };
-+
-+-/**
-+- * struct spi_nor_xfer_cfg - Structure for defining a Serial Flash transfer
-+- * @wren: command for "Write Enable", or 0x00 for not required
-+- * @cmd: command for operation
-+- * @cmd_pins: number of pins to send @cmd (1, 2, 4)
-+- * @addr: address for operation
-+- * @addr_pins: number of pins to send @addr (1, 2, 4)
-+- * @addr_width: number of address bytes
-+- * (3,4, or 0 for address not required)
-+- * @mode: mode data
-+- * @mode_pins: number of pins to send @mode (1, 2, 4)
-+- * @mode_cycles: number of mode cycles (0 for mode not required)
-+- * @dummy_cycles: number of dummy cycles (0 for dummy not required)
-+- */
-+-struct spi_nor_xfer_cfg {
-+- u8 wren;
-+- u8 cmd;
-+- u8 cmd_pins;
-+- u32 addr;
-+- u8 addr_pins;
-+- u8 addr_width;
-+- u8 mode;
-+- u8 mode_pins;
-+- u8 mode_cycles;
-+- u8 dummy_cycles;
-+-};
-+-
-+ #define SPI_NOR_MAX_CMD_SIZE 8
-+ enum spi_nor_ops {
-+ SPI_NOR_OPS_READ = 0,
-+@@ -116,11 +113,18 @@ enum spi_nor_ops {
-+ SPI_NOR_OPS_UNLOCK,
-+ };
-+
-++enum spi_nor_option_flags {
-++ SNOR_F_USE_FSR = BIT(0),
-++};
-++
-++struct mtd_info;
-++
-+ /**
-+ * struct spi_nor - Structure for defining a the SPI NOR layer
-+ * @mtd: point to a mtd_info structure
-+ * @lock: the lock for the read/write/erase/lock/unlock operations
-+ * @dev: point to a spi device, or a spi nor controller device.
-++ * @flash_node: point to a device node describing this flash instance.
-+ * @page_size: the page size of the SPI NOR
-+ * @addr_width: number of address bytes
-+ * @erase_opcode: the opcode for erasing a sector
-+@@ -129,29 +133,29 @@ enum spi_nor_ops {
-+ * @program_opcode: the program opcode
-+ * @flash_read: the mode of the read
-+ * @sst_write_second: used by the SST write operation
-+- * @cfg: used by the read_xfer/write_xfer
-++ * @flags: flag options for the current SPI-NOR (SNOR_F_*)
-+ * @cmd_buf: used by the write_reg
-+ * @prepare: [OPTIONAL] do some preparations for the
-+ * read/write/erase/lock/unlock operations
-+ * @unprepare: [OPTIONAL] do some post work after the
-+ * read/write/erase/lock/unlock operations
-+- * @read_xfer: [OPTIONAL] the read fundamental primitive
-+- * @write_xfer: [OPTIONAL] the writefundamental primitive
-+ * @read_reg: [DRIVER-SPECIFIC] read out the register
-+ * @write_reg: [DRIVER-SPECIFIC] write data to the register
-+- * @read_id: [REPLACEABLE] read out the ID data, and find
-+- * the proper spi_device_id
-+- * @wait_till_ready: [REPLACEABLE] wait till the NOR becomes ready
-+ * @read: [DRIVER-SPECIFIC] read data from the SPI NOR
-+ * @write: [DRIVER-SPECIFIC] write data to the SPI NOR
-+ * @erase: [DRIVER-SPECIFIC] erase a sector of the SPI NOR
-+ * at the offset @offs
-++ * @flash_lock: [FLASH-SPECIFIC] lock a region of the SPI NOR
-++ * @flash_unlock: [FLASH-SPECIFIC] unlock a region of the SPI NOR
-++ * @flash_is_locked: [FLASH-SPECIFIC] check if a region of the SPI NOR is
-++ * completely locked
-+ * @priv: the private data
-+ */
-+ struct spi_nor {
-+- struct mtd_info *mtd;
-++ struct mtd_info mtd;
-+ struct mutex lock;
-+ struct device *dev;
-++ struct device_node *flash_node;
-+ u32 page_size;
-+ u8 addr_width;
-+ u8 erase_opcode;
-+@@ -160,20 +164,13 @@ struct spi_nor {
-+ u8 program_opcode;
-+ enum read_mode flash_read;
-+ bool sst_write_second;
-+- struct spi_nor_xfer_cfg cfg;
-++ u32 flags;
-+ u8 cmd_buf[SPI_NOR_MAX_CMD_SIZE];
-+
-+ int (*prepare)(struct spi_nor *nor, enum spi_nor_ops ops);
-+ void (*unprepare)(struct spi_nor *nor, enum spi_nor_ops ops);
-+- int (*read_xfer)(struct spi_nor *nor, struct spi_nor_xfer_cfg *cfg,
-+- u8 *buf, size_t len);
-+- int (*write_xfer)(struct spi_nor *nor, struct spi_nor_xfer_cfg *cfg,
-+- u8 *buf, size_t len);
-+ int (*read_reg)(struct spi_nor *nor, u8 opcode, u8 *buf, int len);
-+- int (*write_reg)(struct spi_nor *nor, u8 opcode, u8 *buf, int len,
-+- int write_enable);
-+- const struct spi_device_id *(*read_id)(struct spi_nor *nor);
-+- int (*wait_till_ready)(struct spi_nor *nor);
-++ int (*write_reg)(struct spi_nor *nor, u8 opcode, u8 *buf, int len);
-+
-+ int (*read)(struct spi_nor *nor, loff_t from,
-+ size_t len, size_t *retlen, u_char *read_buf);
-+@@ -181,6 +178,10 @@ struct spi_nor {
-+ size_t len, size_t *retlen, const u_char *write_buf);
-+ int (*erase)(struct spi_nor *nor, loff_t offs);
-+
-++ int (*flash_lock)(struct spi_nor *nor, loff_t ofs, uint64_t len);
-++ int (*flash_unlock)(struct spi_nor *nor, loff_t ofs, uint64_t len);
-++ int (*flash_is_locked)(struct spi_nor *nor, loff_t ofs, uint64_t len);
-++
-+ void *priv;
-+ };
-+
-diff --git a/target/linux/generic/patches-3.18/462-m25p80-mx-disable-software-protection.patch b/target/linux/generic/patches-3.18/462-m25p80-mx-disable-software-protection.patch
-index fef483a67d0f7c3f25a105f5f1d0faef4dfd1a38..eb99609fe29b136a2283ef347af6b1db97ad4978 100644
---- a/target/linux/generic/patches-3.18/462-m25p80-mx-disable-software-protection.patch
-+++ b/target/linux/generic/patches-3.18/462-m25p80-mx-disable-software-protection.patch
-@@ -1,10 +1,14 @@
-+Disable software protection bits for Macronix flashes.
-+
-+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
-+
- --- a/drivers/mtd/spi-nor/spi-nor.c
- +++ b/drivers/mtd/spi-nor/spi-nor.c
--@@ -963,6 +963,7 @@ int spi_nor_scan(struct spi_nor *nor, co
-+@@ -1164,6 +1164,7 @@ int spi_nor_scan(struct spi_nor *nor, co
-
-- if (JEDEC_MFR(info->jedec_id) == CFI_MFR_ATMEL ||
-- JEDEC_MFR(info->jedec_id) == CFI_MFR_INTEL ||
--+ JEDEC_MFR(info->jedec_id) == CFI_MFR_MACRONIX ||
-- JEDEC_MFR(info->jedec_id) == CFI_MFR_SST) {
-+ if (JEDEC_MFR(info) == SNOR_MFR_ATMEL ||
-+ JEDEC_MFR(info) == SNOR_MFR_INTEL ||
-++ JEDEC_MFR(info) == SNOR_MFR_MACRONIX ||
-+ JEDEC_MFR(info) == SNOR_MFR_SST) {
- write_enable(nor);
- write_sr(nor, 0);
-diff --git a/target/linux/generic/patches-3.18/472-mtd-m25p80-add-support-for-Winbond-W25X05-flash.patch b/target/linux/generic/patches-3.18/472-mtd-m25p80-add-support-for-Winbond-W25X05-flash.patch
-deleted file mode 100644
-index dca6895c1448a302f829bcfdde4842f0a000061d..0000000000000000000000000000000000000000
---- a/target/linux/generic/patches-3.18/472-mtd-m25p80-add-support-for-Winbond-W25X05-flash.patch
-+++ /dev/null
-@@ -1,20 +0,0 @@
--From eef9dfc4e821408af1af13aa0cc707fc496fb7c6 Mon Sep 17 00:00:00 2001
--From: Gabor Juhos <juhosg@openwrt.org>
--Date: Wed, 11 Dec 2013 19:05:59 +0100
--Subject: [PATCH] m25p80: add support for the Winbond W25X05 flash
--
--Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
-----
-- drivers/mtd/devices/m25p80.c | 1 +
-- 1 file changed, 1 insertion(+)
--
----- a/drivers/mtd/spi-nor/spi-nor.c
--+++ b/drivers/mtd/spi-nor/spi-nor.c
--@@ -617,6 +617,7 @@ static const struct spi_device_id spi_no
-- { "m25px80", INFO(0x207114, 0, 64 * 1024, 16, 0) },
--
-- /* Winbond -- w25x "blocks" are 64K, "sectors" are 4KiB */
--+ { "w25x05", INFO(0xef3010, 0, 64 * 1024, 1, SECT_4K) },
-- { "w25x10", INFO(0xef3011, 0, 64 * 1024, 2, SECT_4K) },
-- { "w25x20", INFO(0xef3012, 0, 64 * 1024, 4, SECT_4K) },
-- { "w25x40", INFO(0xef3013, 0, 64 * 1024, 8, SECT_4K) },
-diff --git a/target/linux/generic/patches-3.18/473-mtd-spi-nor-add-support-for-the-Macronix-MX25L512E-S.patch b/target/linux/generic/patches-3.18/473-mtd-spi-nor-add-support-for-the-Macronix-MX25L512E-S.patch
-deleted file mode 100644
-index 9ba7a4ab2f701440e78da0f9a2e2845f68652267..0000000000000000000000000000000000000000
---- a/target/linux/generic/patches-3.18/473-mtd-spi-nor-add-support-for-the-Macronix-MX25L512E-S.patch
-+++ /dev/null
-@@ -1,21 +0,0 @@
--From 0d7388de0911c1a4fc4a8a3898ef9d0ab818ca08 Mon Sep 17 00:00:00 2001
--From: Gabor Juhos <juhosg@openwrt.org>
--Date: Tue, 7 Apr 2015 18:35:15 +0200
--Subject: [PATCH] mtd: spi-nor: add support for the Macronix MX25L512E SPI
-- flash chip
--
--Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
-----
-- drivers/mtd/spi-nor/spi-nor.c | 1 +
-- 1 file changed, 1 insertion(+)
--
----- a/drivers/mtd/spi-nor/spi-nor.c
--+++ b/drivers/mtd/spi-nor/spi-nor.c
--@@ -518,6 +518,7 @@ static const struct spi_device_id spi_no
-- { "640s33b", INFO(0x898913, 0, 64 * 1024, 128, 0) },
--
-- /* Macronix */
--+ { "mx25l512e", INFO(0xc22010, 0, 64 * 1024, 1, SECT_4K) },
-- { "mx25l2005a", INFO(0xc22012, 0, 64 * 1024, 4, SECT_4K) },
-- { "mx25l4005a", INFO(0xc22013, 0, 64 * 1024, 8, SECT_4K) },
-- { "mx25l8005", INFO(0xc22014, 0, 64 * 1024, 16, 0) },
-diff --git a/target/linux/generic/patches-3.18/474-mtd-spi-nor-add-support-for-the-ISSI-SI25CD512-SPI-f.patch b/target/linux/generic/patches-3.18/474-mtd-spi-nor-add-support-for-the-ISSI-SI25CD512-SPI-f.patch
-deleted file mode 100644
-index b06ac73fae3fac808067b8643ac939adc56d35cb..0000000000000000000000000000000000000000
---- a/target/linux/generic/patches-3.18/474-mtd-spi-nor-add-support-for-the-ISSI-SI25CD512-SPI-f.patch
-+++ /dev/null
-@@ -1,22 +0,0 @@
--From 34e2b403040a2f9d3ba071d95a7f42457e2950f9 Mon Sep 17 00:00:00 2001
--From: Gabor Juhos <juhosg@openwrt.org>
--Date: Tue, 7 Apr 2015 18:35:15 +0200
--Subject: [PATCH] mtd: spi-nor: add support for the ISSI SI25CD512 SPI flash
--
--Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
-----
-- drivers/mtd/spi-nor/spi-nor.c | 3 +++
-- 1 file changed, 3 insertions(+)
--
----- a/drivers/mtd/spi-nor/spi-nor.c
--+++ b/drivers/mtd/spi-nor/spi-nor.c
--@@ -517,6 +517,9 @@ static const struct spi_device_id spi_no
-- { "320s33b", INFO(0x898912, 0, 64 * 1024, 64, 0) },
-- { "640s33b", INFO(0x898913, 0, 64 * 1024, 128, 0) },
--
--+ /* ISSI */
--+ { "is25cd512", INFO(0x7f9d20, 0, 32 * 1024, 2, SECT_4K) },
--+
-- /* Macronix */
-- { "mx25l512e", INFO(0xc22010, 0, 64 * 1024, 1, SECT_4K) },
-- { "mx25l2005a", INFO(0xc22012, 0, 64 * 1024, 4, SECT_4K) },
-diff --git a/target/linux/lantiq/patches-3.18/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch b/target/linux/lantiq/patches-3.18/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch
-deleted file mode 100644
-index 203eb9495efe583abc1e7adc21f9c6d0e61e4e29..0000000000000000000000000000000000000000
---- a/target/linux/lantiq/patches-3.18/0022-MTD-m25p80-allow-loading-mtd-name-from-OF.patch
-+++ /dev/null
-@@ -1,44 +0,0 @@
--From 4400e1f593ea40a51912128adb4f53d59e62cad8 Mon Sep 17 00:00:00 2001
--From: John Crispin <blogic@openwrt.org>
--Date: Wed, 10 Sep 2014 22:40:18 +0200
--Subject: [PATCH 22/36] MTD: m25p80: allow loading mtd name from OF
--
--In accordance with the physmap flash we should honour the linux,mtd-name
--property when deciding what name the mtd device has.
--
--Signed-off-by: Thomas Langer <thomas.langer@lantiq.com>
--Signed-off-by: John Crispin <blogic@openwrt.org>
-----
-- drivers/mtd/devices/m25p80.c | 6 ++++++
-- 1 file changed, 6 insertions(+)
--
----- a/drivers/mtd/devices/m25p80.c
--+++ b/drivers/mtd/devices/m25p80.c
--@@ -19,6 +19,7 @@
-- #include <linux/errno.h>
-- #include <linux/module.h>
-- #include <linux/device.h>
--+#include <linux/of.h>
--
-- #include <linux/mtd/mtd.h>
-- #include <linux/mtd/partitions.h>
--@@ -198,6 +199,10 @@ static int m25p_probe(struct spi_device
-- enum read_mode mode = SPI_NOR_NORMAL;
-- char *flash_name = NULL;
-- int ret;
--+ const char __maybe_unused *of_mtd_name = NULL;
--+
--+ of_property_read_string(spi->dev.of_node,
--+ "linux,mtd-name", &of_mtd_name);
--
-- data = dev_get_platdata(&spi->dev);
--
--@@ -229,6 +234,8 @@ static int m25p_probe(struct spi_device
--
-- if (data && data->name)
-- flash->mtd.name = data->name;
--+ else if (of_mtd_name)
--+ flash->mtd.name = of_mtd_name;
--
-- /* For some (historical?) reason many platforms provide two different
-- * names in flash_platform_data: "name" and "type". Quite often name is
-diff --git a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/tl-wdr4900-v1.dts b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/tl-wdr4900-v1.dts
-index 2beb39cf1f2b22d99207b2298bd550a71c8d7666..21f823d57ca1b7b072e060dd0460ffd4b251ec77 100644
---- a/target/linux/mpc85xx/files/arch/powerpc/boot/dts/tl-wdr4900-v1.dts
-+++ b/target/linux/mpc85xx/files/arch/powerpc/boot/dts/tl-wdr4900-v1.dts
-@@ -37,7 +37,7 @@
- flash@0 {
- #address-cells = <1>;
- #size-cells = <1>;
-- compatible = "spansion,s25fl129p1";
-+ compatible = "jedec,spi-nor";
- reg = <0>;
- spi-max-frequency = <25000000>;
-
-diff --git a/target/linux/ramips/patches-3.18/0044-mtd-add-chunked-read-io-to-m25p80.patch b/target/linux/ramips/patches-3.18/0044-mtd-add-chunked-read-io-to-m25p80.patch
-index 1716e1cc499ede404c509a40370ff6fdeec0f1dc..8dc181afb84e4932b73b4a7a45daadb0da78ca20 100644
---- a/target/linux/ramips/patches-3.18/0044-mtd-add-chunked-read-io-to-m25p80.patch
-+++ b/target/linux/ramips/patches-3.18/0044-mtd-add-chunked-read-io-to-m25p80.patch
-@@ -1,33 +1,18 @@
----- a/drivers/mtd/devices/m25p80.c
--+++ b/drivers/mtd/devices/m25p80.c
--@@ -19,6 +19,7 @@
-- #include <linux/errno.h>
-- #include <linux/module.h>
-- #include <linux/device.h>
--+#include <linux/of.h>
--
-- #include <linux/mtd/mtd.h>
-- #include <linux/mtd/partitions.h>
--@@ -32,6 +33,7 @@ struct m25p {
-- struct spi_device *spi;
-- struct spi_nor spi_nor;
-- struct mtd_info mtd;
--+ u16 chunk_size;
-- u8 command[MAX_CMD_SIZE];
-- };
--
--@@ -157,6 +159,61 @@ static int m25p80_read(struct spi_nor *n
-- return 0;
-+--- a/drivers/mtd/spi-nor/spi-nor.c
-++++ b/drivers/mtd/spi-nor/spi-nor.c
-+@@ -1016,6 +1016,66 @@ write_err:
-+ return ret;
- }
-
--+static void m25p80_chunked_write(struct spi_nor *nor, loff_t _from, size_t _len,
--+ size_t *_retlen, const u_char *_buf)
-++static int spi_nor_chunked_write(struct mtd_info *mtd, loff_t _to, size_t _len,
-++ size_t *_retlen, const u_char *_buf)
- +{
--+ struct m25p *flash = nor->priv;
-++ struct spi_nor *nor = mtd_to_spi_nor(mtd);
- + int chunk_size;
- + int retlen = 0;
-++ int ret;
- +
--+ chunk_size = flash->chunk_size;
-++ chunk_size = nor->chunk_size;
- + if (!chunk_size)
- + chunk_size = _len;
- +
-@@ -37,35 +22,39 @@
- + while (retlen < _len) {
- + size_t len = min_t(int, chunk_size, _len - retlen);
- + const u_char *buf = _buf + retlen;
--+ loff_t from = _from + retlen;
--+
--+ nor->wait_till_ready(nor);
--+ nor->write_reg(nor, SPINOR_OP_WREN, NULL, 0, 0);
-++ loff_t to = _to + retlen;
- +
--+ m25p80_write(nor, from, len, &retlen, buf);
-++ if (nor->flags & SNOR_F_SST)
-++ ret = sst_write(mtd, to, len, &retlen, buf);
-++ else
-++ ret = spi_nor_write(mtd, to, len, &retlen, buf);
-++ if (ret)
-++ return ret;
- + }
-++
- + *_retlen += retlen;
-++ return 0;
- +}
- +
--+static int m25p80_chunked_read(struct spi_nor *nor, loff_t _from, size_t _len,
--+ size_t *_retlen, u_char *_buf)
-++static int spi_nor_chunked_read(struct mtd_info *mtd, loff_t _from, size_t _len,
-++ size_t *_retlen, u_char *_buf)
- +{
--+ struct m25p *flash = nor->priv;
-++ struct spi_nor *nor = mtd_to_spi_nor(mtd);
- + int chunk_size;
-++ int ret;
- +
--+ chunk_size = flash->chunk_size;
-++ chunk_size = nor->chunk_size;
- + if (!chunk_size)
- + chunk_size = _len;
- +
- + *_retlen = 0;
--+
- + while (*_retlen < _len) {
- + size_t len = min_t(int, chunk_size, _len - *_retlen);
- + u_char *buf = _buf + *_retlen;
- + loff_t from = _from + *_retlen;
- + int retlen = 0;
--+ int ret = m25p80_read(nor, from, len, &retlen, buf);
- +
-++ ret = spi_nor_read(mtd, from, len, &retlen, buf);
- + if (ret)
- + return ret;
- +
-@@ -75,29 +64,60 @@
- + return 0;
- +}
- +
-- static int m25p80_erase(struct spi_nor *nor, loff_t offset)
-+ static int macronix_quad_enable(struct spi_nor *nor)
- {
-- struct m25p *flash = nor->priv;
--@@ -197,6 +254,7 @@ static int m25p_probe(struct spi_device
-- struct spi_nor *nor;
-- enum read_mode mode = SPI_NOR_NORMAL;
-- char *flash_name = NULL;
--+ u32 val;
-- int ret;
--
-- data = dev_get_platdata(&spi->dev);
--@@ -244,6 +302,14 @@ static int m25p_probe(struct spi_device
-- if (ret)
-- return ret;
-+ int ret, val;
-+@@ -1197,10 +1257,12 @@ int spi_nor_scan(struct spi_nor *nor, co
-+ }
-
--+ if (spi->dev.of_node &&
--+ !of_property_read_u32(spi->dev.of_node, "m25p,chunked-io", &val)) {
--+ dev_warn(&spi->dev, "using chunked io\n");
--+ nor->read = m25p80_chunked_read;
--+ nor->write = m25p80_chunked_write;
--+ flash->chunk_size = val;
-+ /* sst nor chips use AAI word program */
-+- if (info->flags & SST_WRITE)
-++ if (info->flags & SST_WRITE) {
-+ mtd->_write = sst_write;
-+- else
-++ nor->flags |= SNOR_F_SST;
-++ } else {
-+ mtd->_write = spi_nor_write;
- + }
-+
-+ if (info->flags & USE_FSR)
-+ nor->flags |= SNOR_F_USE_FSR;
-+@@ -1228,11 +1290,20 @@ int spi_nor_scan(struct spi_nor *nor, co
-+ mtd->writebufsize = nor->page_size;
-+
-+ if (np) {
-++ u32 val;
- +
-- ppdata.of_node = spi->dev.of_node;
-+ /* If we were instantiated by DT, use it */
-+ if (of_property_read_bool(np, "m25p,fast-read"))
-+ nor->flash_read = SPI_NOR_FAST;
-+ else
-+ nor->flash_read = SPI_NOR_NORMAL;
-++
-++ if (!of_property_read_u32(np, "m25p,chunked-io", &val)) {
-++ dev_info(dev, "using chunked io (size=%d)\n", val);
-++ mtd->_read = spi_nor_chunked_read;
-++ mtd->_write = spi_nor_chunked_write;
-++ nor->chunk_size = val;
-++ }
-+ } else {
-+ /* If we weren't instantiated by DT, default to fast-read */
-+ nor->flash_read = SPI_NOR_FAST;
-+--- a/include/linux/mtd/spi-nor.h
-++++ b/include/linux/mtd/spi-nor.h
-+@@ -115,6 +115,7 @@ enum spi_nor_ops {
-+
-+ enum spi_nor_option_flags {
-+ SNOR_F_USE_FSR = BIT(0),
-++ SNOR_F_SST = BIT(1),
-+ };
-
-- return mtd_device_parse_register(&flash->mtd, NULL, &ppdata,
-+ struct mtd_info;
-+@@ -157,6 +158,7 @@ struct spi_nor {
-+ struct device *dev;
-+ struct device_node *flash_node;
-+ u32 page_size;
-++ u16 chunk_size;
-+ u8 addr_width;
-+ u8 erase_opcode;
-+ u8 read_opcode;
diff --git a/patches/openwrt/0030-kernel-mtd-spi-nor-wait-until-status-register-writes-are-ready.patch b/patches/openwrt/0030-kernel-mtd-spi-nor-wait-until-status-register-writes-are-ready.patch
deleted file mode 100644
index 4bab4beb5c23cd34bfb7d39e68e418e5f32b361c..0000000000000000000000000000000000000000
--- a/patches/openwrt/0030-kernel-mtd-spi-nor-wait-until-status-register-writes-are-ready.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Sat, 7 May 2016 00:17:55 +0200
-Subject: kernel: mtd: spi-nor: wait until status register writes are ready
-
-diff --git a/target/linux/generic/patches-3.18/094-0001-mtd-spi-nor-wait-until-lock-unlock-operations-are-re.patch b/target/linux/generic/patches-3.18/094-0001-mtd-spi-nor-wait-until-lock-unlock-operations-are-re.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..2c2e5f32259416f0cc7f342e420ffbd32c139d97
---- /dev/null
-+++ b/target/linux/generic/patches-3.18/094-0001-mtd-spi-nor-wait-until-lock-unlock-operations-are-re.patch
-@@ -0,0 +1,66 @@
-+From 32321e950d8a237d7e8f3a9b76220007dfa87544 Mon Sep 17 00:00:00 2001
-+Message-Id: <32321e950d8a237d7e8f3a9b76220007dfa87544.1462572686.git.mschiffer@universe-factory.net>
-+From: =?UTF-8?q?Ezequiel=20Garc=C3=ADa?= <ezequiel@vanguardiasur.com.ar>
-+Date: Mon, 28 Dec 2015 17:54:51 -0300
-+Subject: [PATCH] mtd: spi-nor: wait until lock/unlock operations are ready
-+
-+On Micron and Numonyx devices, the status register write command
-+(WRSR), raises a work-in-progress bit (WIP) on the status register.
-+The datasheets for these devices specify that while the status
-+register write is in progress, the status register WIP bit can still
-+be read to check the end of the operation.
-+
-+This commit adds a wait_till_ready call on lock/unlock operations,
-+which is required for Micron and Numonyx but should be harmless for
-+others. This is needed to prevent applications from issuing erase or
-+program operations before the unlock operation is completed.
-+
-+Reported-by: Stas Sergeev <stsp@list.ru>
-+Signed-off-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
-+Signed-off-by: Brian Norris <computersforpeace@gmail.com>
-+---
-+ drivers/mtd/spi-nor/spi-nor.c | 12 ++++++++++--
-+ 1 file changed, 10 insertions(+), 2 deletions(-)
-+
-+--- a/drivers/mtd/spi-nor/spi-nor.c
-++++ b/drivers/mtd/spi-nor/spi-nor.c
-+@@ -462,6 +462,7 @@ static int stm_lock(struct spi_nor *nor,
-+ u8 status_old, status_new;
-+ u8 mask = SR_BP2 | SR_BP1 | SR_BP0;
-+ u8 shift = ffs(mask) - 1, pow, val;
-++ int ret;
-+
-+ status_old = read_sr(nor);
-+
-+@@ -498,7 +499,10 @@ static int stm_lock(struct spi_nor *nor,
-+ return -EINVAL;
-+
-+ write_enable(nor);
-+- return write_sr(nor, status_new);
-++ ret = write_sr(nor, status_new);
-++ if (ret)
-++ return ret;
-++ return spi_nor_wait_till_ready(nor);
-+ }
-+
-+ /*
-+@@ -512,6 +516,7 @@ static int stm_unlock(struct spi_nor *no
-+ uint8_t status_old, status_new;
-+ u8 mask = SR_BP2 | SR_BP1 | SR_BP0;
-+ u8 shift = ffs(mask) - 1, pow, val;
-++ int ret;
-+
-+ status_old = read_sr(nor);
-+
-+@@ -546,7 +551,10 @@ static int stm_unlock(struct spi_nor *no
-+ return -EINVAL;
-+
-+ write_enable(nor);
-+- return write_sr(nor, status_new);
-++ ret = write_sr(nor, status_new);
-++ if (ret)
-++ return ret;
-++ return spi_nor_wait_till_ready(nor);
-+ }
-+
-+ /*
-diff --git a/target/linux/generic/patches-3.18/094-0002-mtd-spi-nor-wait-for-SR_WIP-to-clear-on-initial-unlo.patch b/target/linux/generic/patches-3.18/094-0002-mtd-spi-nor-wait-for-SR_WIP-to-clear-on-initial-unlo.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..a0573d5aea939c965cb44b2e72a2b7d498b0a5cd
---- /dev/null
-+++ b/target/linux/generic/patches-3.18/094-0002-mtd-spi-nor-wait-for-SR_WIP-to-clear-on-initial-unlo.patch
-@@ -0,0 +1,33 @@
-+From edf891ef9ab773363f8e58022a26d7d31604aed6 Mon Sep 17 00:00:00 2001
-+Message-Id: <edf891ef9ab773363f8e58022a26d7d31604aed6.1462572703.git.mschiffer@universe-factory.net>
-+From: Brian Norris <computersforpeace@gmail.com>
-+Date: Fri, 29 Jan 2016 11:25:30 -0800
-+Subject: [PATCH] mtd: spi-nor: wait for SR_WIP to clear on initial unlock
-+
-+Fixup a piece leftover by commit 32321e950d8a ("mtd: spi-nor: wait until
-+lock/unlock operations are ready"). That commit made us wait for the WIP
-+bit to settle after lock/unlock operations, but it missed the open-coded
-+"unlock" that happens at probe() time.
-+
-+We should probably have this code utilize the unlock() routines in the
-+future, to avoid duplication, but unfortunately, flash which need to be
-+unlocked don't all have a proper ->flash_unlock() callback.
-+
-+Signed-off-by: Brian Norris <computersforpeace@gmail.com>
-+Cc: Stas Sergeev <stsp@users.sourceforge.net>
-+Reviewed-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
-+Tested-by: Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
-+---
-+ drivers/mtd/spi-nor/spi-nor.c | 1 +
-+ 1 file changed, 1 insertion(+)
-+
-+--- a/drivers/mtd/spi-nor/spi-nor.c
-++++ b/drivers/mtd/spi-nor/spi-nor.c
-+@@ -1167,6 +1167,7 @@ int spi_nor_scan(struct spi_nor *nor, co
-+ JEDEC_MFR(info) == SNOR_MFR_SST) {
-+ write_enable(nor);
-+ write_sr(nor, 0);
-++ spi_nor_wait_till_ready(nor);
-+ }
-+
-+ if (!mtd->name)
diff --git a/patches/openwrt/0031-kernel-mtd-spi-nor-unlock-Winbond-flashs.patch b/patches/openwrt/0031-kernel-mtd-spi-nor-unlock-Winbond-flashs.patch
deleted file mode 100644
index 0a6bd961fbb6ddd6a414dd046dd9812a663dd1be..0000000000000000000000000000000000000000
--- a/patches/openwrt/0031-kernel-mtd-spi-nor-unlock-Winbond-flashs.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Sat, 7 May 2016 00:29:06 +0200
-Subject: kernel: mtd: spi-nor: unlock Winbond flashs
-
-diff --git a/target/linux/generic/patches-3.18/463-Revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch b/target/linux/generic/patches-3.18/463-Revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..4682b7a77b160a0814012d26f0edf1a7bfaf5312
---- /dev/null
-+++ b/target/linux/generic/patches-3.18/463-Revert-mtd-spi-nor-fix-Spansion-regressions-aliased-.patch
-@@ -0,0 +1,46 @@
-+From 20bbd73b6b04677a73933830363ab3178adc2ce9 Mon Sep 17 00:00:00 2001
-+Message-Id: <20bbd73b6b04677a73933830363ab3178adc2ce9.1462573588.git.mschiffer@universe-factory.net>
-+From: Matthias Schiffer <mschiffer@universe-factory.net>
-+Date: Sat, 7 May 2016 00:26:23 +0200
-+Subject: [PATCH] Revert "mtd: spi-nor: fix Spansion regressions (aliased with
-+ Winbond)"
-+
-+This reverts commit 67b9bcd36906e12a15ffec19463afbbd6a41660e.
-+---
-+ drivers/mtd/spi-nor/spi-nor.c | 6 ++++--
-+ include/linux/mtd/spi-nor.h | 2 +-
-+ 2 files changed, 5 insertions(+), 3 deletions(-)
-+
-+--- a/drivers/mtd/spi-nor/spi-nor.c
-++++ b/drivers/mtd/spi-nor/spi-nor.c
-+@@ -1165,7 +1165,8 @@ int spi_nor_scan(struct spi_nor *nor, co
-+ if (JEDEC_MFR(info) == SNOR_MFR_ATMEL ||
-+ JEDEC_MFR(info) == SNOR_MFR_INTEL ||
-+ JEDEC_MFR(info) == SNOR_MFR_MACRONIX ||
-+- JEDEC_MFR(info) == SNOR_MFR_SST) {
-++ JEDEC_MFR(info) == SNOR_MFR_SST ||
-++ JEDEC_MFR(info) == SNOR_MFR_WINBOND) {
-+ write_enable(nor);
-+ write_sr(nor, 0);
-+ spi_nor_wait_till_ready(nor);
-+@@ -1182,7 +1183,8 @@ int spi_nor_scan(struct spi_nor *nor, co
-+ mtd->_read = spi_nor_read;
-+
-+ /* NOR protection support for STmicro/Micron chips and similar */
-+- if (JEDEC_MFR(info) == SNOR_MFR_MICRON) {
-++ if (JEDEC_MFR(info) == SNOR_MFR_MICRON ||
-++ JEDEC_MFR(info) == SNOR_MFR_WINBOND) {
-+ nor->flash_lock = stm_lock;
-+ nor->flash_unlock = stm_unlock;
-+ nor->flash_is_locked = stm_is_locked;
-+--- a/include/linux/mtd/spi-nor.h
-++++ b/include/linux/mtd/spi-nor.h
-+@@ -25,7 +25,7 @@
-+ #define SNOR_MFR_MACRONIX CFI_MFR_MACRONIX
-+ #define SNOR_MFR_SPANSION CFI_MFR_AMD
-+ #define SNOR_MFR_SST CFI_MFR_SST
-+-#define SNOR_MFR_WINBOND 0xef /* Also used by some Spansion */
-++#define SNOR_MFR_WINBOND 0xef
-+
-+ /*
-+ * Note on opcode nomenclature: some opcodes have a format like
diff --git a/patches/openwrt/0032-ath79-dev-eth-fix-QCA9561-set-phy-interface-mode-and-mask.patch b/patches/openwrt/0032-ath79-dev-eth-fix-QCA9561-set-phy-interface-mode-and-mask.patch
deleted file mode 100644
index 6e0670cc8711fa46f0b266df01288188bfb89259..0000000000000000000000000000000000000000
--- a/patches/openwrt/0032-ath79-dev-eth-fix-QCA9561-set-phy-interface-mode-and-mask.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Fri, 13 May 2016 20:59:44 +0200
-Subject: ath79: dev-eth: fix QCA9561 set phy interface mode and mask
-
-QCA9563 and QCA9561 are two series of Qualcomm SoC Dragonfly. The only different
-is QCA9563 w/o internal switch. It has one GMAC with SGMII interface. But they
-have the same device ID(0x1150). So they share the same codes.
-
-Signed-off-by: Miaoqing Pan <miaoqing@codeaurora.org>
-
-Backport of OpenWrt r46971
-
-diff --git a/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c b/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c
-index ff94e2ec3733b9473c4c3191cb47bd4ba8ac784d..31d24388d274b92e01642ad6d7f59d22f80dc2a6 100644
---- a/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c
-+++ b/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c
-@@ -633,7 +633,6 @@ static int __init ath79_setup_phy_if_mode(unsigned int id,
- case ATH79_SOC_AR9330:
- case ATH79_SOC_AR9331:
- case ATH79_SOC_QCA9533:
-- case ATH79_SOC_QCA9561:
- case ATH79_SOC_TP9343:
- pdata->phy_if_mode = PHY_INTERFACE_MODE_MII;
- break;
-@@ -667,6 +666,11 @@ static int __init ath79_setup_phy_if_mode(unsigned int id,
- }
- break;
-
-+ case ATH79_SOC_QCA9561:
-+ if (!pdata->phy_if_mode)
-+ pdata->phy_if_mode = PHY_INTERFACE_MODE_MII;
-+ break;
-+
- default:
- BUG();
- }
-@@ -1035,7 +1039,8 @@ void __init ath79_register_eth(unsigned int id)
- AR933X_RESET_GE0_MDIO;
- pdata->set_speed = ath79_set_speed_dummy;
-
-- pdata->phy_mask = BIT(4);
-+ if (!pdata->phy_mask)
-+ pdata->phy_mask = BIT(4);
- } else {
- pdata->reset_bit = AR933X_RESET_GE1_MAC |
- AR933X_RESET_GE1_MDIO;
diff --git a/patches/openwrt/0033-ar71xx-use-correct-PLL-configuration-register-bitmask-for-QCA956x-SoC.patch b/patches/openwrt/0033-ar71xx-use-correct-PLL-configuration-register-bitmask-for-QCA956x-SoC.patch
deleted file mode 100644
index 32d9654f2cdc0828f831a4bfed7784ea3e7e4ec8..0000000000000000000000000000000000000000
--- a/patches/openwrt/0033-ar71xx-use-correct-PLL-configuration-register-bitmask-for-QCA956x-SoC.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Fri, 13 May 2016 22:58:50 +0200
-Subject: ar71xx: use correct PLL configuration register bitmask for QCA956x SoC.
-
-Incorrect value causes clock inaccuracy as huge as 1/60.
-
-Signed-off-by: Dmitry Ivanov <dima@ubnt.com>
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
-
-Backport of OpenWrt r47363
-
-diff --git a/target/linux/ar71xx/patches-3.18/735-MIPS-ath79-add-support-for-QCA956x-SoC.patch b/target/linux/ar71xx/patches-3.18/735-MIPS-ath79-add-support-for-QCA956x-SoC.patch
-index 0da81426ca7b1b1db46e869745f0ed00496bef78..2bb4286e5d805ff3c47486a1f091d2b5e6d78373 100644
---- a/target/linux/ar71xx/patches-3.18/735-MIPS-ath79-add-support-for-QCA956x-SoC.patch
-+++ b/target/linux/ar71xx/patches-3.18/735-MIPS-ath79-add-support-for-QCA956x-SoC.patch
-@@ -529,7 +529,7 @@
- +#define QCA956X_PLL_CPU_CONFIG1_NFRAC_L_SHIFT 0
- +#define QCA956X_PLL_CPU_CONFIG1_NFRAC_L_MASK 0x1f
- +#define QCA956X_PLL_CPU_CONFIG1_NFRAC_H_SHIFT 5
--+#define QCA956X_PLL_CPU_CONFIG1_NFRAC_H_MASK 0x3fff
-++#define QCA956X_PLL_CPU_CONFIG1_NFRAC_H_MASK 0x1fff
- +#define QCA956X_PLL_CPU_CONFIG1_NINT_SHIFT 18
- +#define QCA956X_PLL_CPU_CONFIG1_NINT_MASK 0x1ff
- +
-@@ -541,7 +541,7 @@
- +#define QCA956X_PLL_DDR_CONFIG1_NFRAC_L_SHIFT 0
- +#define QCA956X_PLL_DDR_CONFIG1_NFRAC_L_MASK 0x1f
- +#define QCA956X_PLL_DDR_CONFIG1_NFRAC_H_SHIFT 5
--+#define QCA956X_PLL_DDR_CONFIG1_NFRAC_H_MASK 0x3fff
-++#define QCA956X_PLL_DDR_CONFIG1_NFRAC_H_MASK 0x1fff
- +#define QCA956X_PLL_DDR_CONFIG1_NINT_SHIFT 18
- +#define QCA956X_PLL_DDR_CONFIG1_NINT_MASK 0x1ff
- +
diff --git a/patches/openwrt/0034-ar71xx-update-QCA956x-support.patch b/patches/openwrt/0034-ar71xx-update-QCA956x-support.patch
deleted file mode 100644
index 8e63c9d830bec0422d7a75a8431720eb31c15897..0000000000000000000000000000000000000000
--- a/patches/openwrt/0034-ar71xx-update-QCA956x-support.patch
+++ /dev/null
@@ -1,415 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Fri, 13 May 2016 22:18:40 +0200
-Subject: ar71xx: update QCA956x support
-
-- separate qca956x and tp9343 (they use different IDs)
-- rename qca9561->qca956x for consistency
-- add missing bits (device reset, gpio output select)
-- fix wmac setup
-
-Signed-off-by: Roman Yeryomin <roman@advem.lv>
-
-Backport of OpenWrt r47981
-
-diff --git a/target/linux/ar71xx/patches-3.18/735-MIPS-ath79-add-support-for-QCA956x-SoC.patch b/target/linux/ar71xx/patches-3.18/735-MIPS-ath79-add-support-for-QCA956x-SoC.patch
-index 2bb4286e5d805ff3c47486a1f091d2b5e6d78373..61b897690a03fd46d2ea95451a09598b272266f9 100644
---- a/target/linux/ar71xx/patches-3.18/735-MIPS-ath79-add-support-for-QCA956x-SoC.patch
-+++ b/target/linux/ar71xx/patches-3.18/735-MIPS-ath79-add-support-for-QCA956x-SoC.patch
-@@ -105,7 +105,7 @@
- qca953x_clocks_init();
- else if (soc_is_qca955x())
- qca955x_clocks_init();
--+ else if (soc_is_qca956x())
-++ else if (soc_is_qca956x() || soc_is_tp9343())
- + qca956x_clocks_init();
- else
- BUG();
-@@ -116,7 +116,7 @@
- reg = QCA953X_RESET_REG_RESET_MODULE;
- else if (soc_is_qca955x())
- reg = QCA955X_RESET_REG_RESET_MODULE;
--+ else if (soc_is_qca956x())
-++ else if (soc_is_qca956x() || soc_is_tp9343())
- + reg = QCA956X_RESET_REG_RESET_MODULE;
- else
- panic("Reset register not defined for this SOC");
-@@ -125,20 +125,30 @@
- reg = QCA953X_RESET_REG_RESET_MODULE;
- else if (soc_is_qca955x())
- reg = QCA955X_RESET_REG_RESET_MODULE;
--+ else if (soc_is_qca956x())
-++ else if (soc_is_qca956x() || soc_is_tp9343())
- + reg = QCA956X_RESET_REG_RESET_MODULE;
- else
- panic("Reset register not defined for this SOC");
-
-+@@ -133,6 +137,8 @@ u32 ath79_device_reset_get(u32 mask)
-+ reg = AR933X_RESET_REG_RESET_MODULE;
-+ else if (soc_is_ar934x())
-+ reg = AR934X_RESET_REG_RESET_MODULE;
-++ else if (soc_is_qca956x() || soc_is_tp9343())
-++ reg = QCA956X_RESET_REG_RESET_MODULE;
-+ else
-+ BUG();
-+
- --- a/arch/mips/ath79/dev-common.c
- +++ b/arch/mips/ath79/dev-common.c
--@@ -94,7 +94,8 @@ void __init ath79_register_uart(void)
-+@@ -94,7 +94,9 @@ void __init ath79_register_uart(void)
- soc_is_ar913x() ||
- soc_is_ar934x() ||
- soc_is_qca953x() ||
- - soc_is_qca955x()) {
- + soc_is_qca955x() ||
--+ soc_is_qca956x()) {
-++ soc_is_qca956x() ||
-++ soc_is_tp9343()) {
- ath79_uart_data[0].uartclk = uart_clk_rate;
- platform_device_register(&ath79_uart_device);
- } else if (soc_is_ar933x()) {
-@@ -168,14 +178,14 @@
- qca953x_usb_setup();
- else if (soc_is_qca955x())
- qca955x_usb_setup();
--+ else if (soc_is_qca9561())
-++ else if (soc_is_qca956x())
- + qca956x_usb_setup();
- else
- BUG();
- }
- --- a/arch/mips/ath79/dev-wmac.c
- +++ b/arch/mips/ath79/dev-wmac.c
--@@ -189,6 +189,24 @@ static void qca955x_wmac_setup(void)
-+@@ -189,6 +189,26 @@ static void qca955x_wmac_setup(void)
- ath79_wmac_data.is_clk_25mhz = true;
- }
-
-@@ -195,16 +205,18 @@
- + ath79_wmac_data.is_clk_25mhz = false;
- + else
- + ath79_wmac_data.is_clk_25mhz = true;
-++
-++ ath79_wmac_data.get_mac_revision = ar93xx_get_soc_revision;
- +}
- +
- static bool __init
- ar93xx_wmac_otp_read_word(void __iomem *base, int addr, u32 *data)
- {
--@@ -392,6 +410,8 @@ void __init ath79_register_wmac(u8 *cal_
-+@@ -392,6 +412,8 @@ void __init ath79_register_wmac(u8 *cal_
- qca953x_wmac_setup();
- else if (soc_is_qca955x())
- qca955x_wmac_setup();
--+ else if (soc_is_qca956x())
-++ else if (soc_is_qca956x() || soc_is_tp9343())
- + qca956x_wmac_setup();
- else
- BUG();
-@@ -216,27 +228,38 @@
- case REV_ID_MAJOR_QCA9556:
- case REV_ID_MAJOR_QCA9558:
- + case REV_ID_MAJOR_TP9343:
--+ case REV_ID_MAJOR_QCA9561:
-++ case REV_ID_MAJOR_QCA956X:
- _prom_putchar = prom_putchar_ar71xx;
- break;
-
- --- a/arch/mips/ath79/gpio.c
- +++ b/arch/mips/ath79/gpio.c
--@@ -148,7 +148,8 @@ static void __iomem *ath79_gpio_get_func
-+@@ -148,7 +148,10 @@ static void __iomem *ath79_gpio_get_func
- soc_is_ar913x() ||
- soc_is_ar933x())
- reg = AR71XX_GPIO_REG_FUNC;
- - else if (soc_is_ar934x() || soc_is_qca953x())
- + else if (soc_is_ar934x() ||
--+ soc_is_qca953x() || soc_is_qca956x())
-++ soc_is_qca953x() ||
-++ soc_is_qca956x() ||
-++ soc_is_tp9343())
- reg = AR934X_GPIO_REG_FUNC;
- else
- BUG();
--@@ -228,12 +229,15 @@ void __init ath79_gpio_init(void)
-+@@ -187,7 +190,7 @@ void __init ath79_gpio_output_select(uns
-+ unsigned int reg;
-+ u32 t, s;
-+
-+- BUG_ON(!soc_is_ar934x() && !soc_is_qca953x());
-++ BUG_ON(!soc_is_ar934x() && !soc_is_qca953x() && !soc_is_qca956x());
-+
-+ if (gpio >= AR934X_GPIO_COUNT)
-+ return;
-+@@ -228,12 +231,15 @@ void __init ath79_gpio_init(void)
- ath79_gpio_count = QCA953X_GPIO_COUNT;
- else if (soc_is_qca955x())
- ath79_gpio_count = QCA955X_GPIO_COUNT;
--+ else if (soc_is_qca956x())
-++ else if (soc_is_qca956x() || soc_is_tp9343())
- + ath79_gpio_count = QCA956X_GPIO_COUNT;
- else
- BUG();
-@@ -245,23 +268,24 @@
- ath79_gpio_chip.ngpio = ath79_gpio_count;
- - if (soc_is_ar934x() || soc_is_qca953x() || soc_is_qca955x()) {
- + if (soc_is_ar934x() || soc_is_qca953x() || soc_is_qca955x() ||
--+ soc_is_qca956x()) {
-++ soc_is_qca956x() || soc_is_tp9343()) {
- ath79_gpio_chip.direction_input = ar934x_gpio_direction_input;
- ath79_gpio_chip.direction_output = ar934x_gpio_direction_output;
- }
- --- a/arch/mips/ath79/irq.c
- +++ b/arch/mips/ath79/irq.c
--@@ -107,7 +107,8 @@ static void __init ath79_misc_irq_init(v
-+@@ -107,7 +107,9 @@ static void __init ath79_misc_irq_init(v
- soc_is_ar933x() ||
- soc_is_ar934x() ||
- soc_is_qca953x() ||
- - soc_is_qca955x())
- + soc_is_qca955x() ||
--+ soc_is_qca956x())
-++ soc_is_qca956x() ||
-++ soc_is_tp9343())
- ath79_misc_irq_chip.irq_ack = ar724x_misc_irq_ack;
- else
- BUG();
--@@ -268,6 +269,97 @@ static void qca955x_irq_init(void)
-+@@ -268,6 +270,97 @@ static void qca955x_irq_init(void)
- irq_set_chained_handler(ATH79_CPU_IRQ(3), qca955x_ip3_irq_dispatch);
- }
-
-@@ -359,21 +383,21 @@
- asmlinkage void plat_irq_dispatch(void)
- {
- unsigned long pending;
--@@ -397,6 +489,9 @@ void __init arch_init_irq(void)
-+@@ -397,6 +490,9 @@ void __init arch_init_irq(void)
- } else if (soc_is_qca955x()) {
- ath79_ip2_handler = ath79_default_ip2_handler;
- ath79_ip3_handler = ath79_default_ip3_handler;
--+ } else if (soc_is_qca956x()) {
-++ } else if (soc_is_qca956x() || soc_is_tp9343()) {
- + ath79_ip2_handler = ath79_default_ip2_handler;
- + ath79_ip3_handler = ath79_default_ip3_handler;
- } else {
- BUG();
- }
--@@ -411,4 +506,6 @@ void __init arch_init_irq(void)
-+@@ -411,4 +507,6 @@ void __init arch_init_irq(void)
- qca953x_irq_init();
- else if (soc_is_qca955x())
- qca955x_irq_init();
--+ else if (soc_is_qca956x())
-++ else if (soc_is_qca956x() || soc_is_tp9343())
- + qca956x_irq_init();
- }
- --- a/arch/mips/ath79/Kconfig
-@@ -428,7 +452,7 @@
- } else if (soc_is_qca955x()) {
- ath79_pci_irq_map = qca955x_pci_irq_map;
- ath79_pci_nr_irqs = ARRAY_SIZE(qca955x_pci_irq_map);
--+ } else if (soc_is_qca9561()) {
-++ } else if (soc_is_qca956x()) {
- + ath79_pci_irq_map = qca956x_pci_irq_map;
- + ath79_pci_nr_irqs = ARRAY_SIZE(qca956x_pci_irq_map);
- } else {
-@@ -438,7 +462,7 @@
- QCA955X_PCI_MEM_SIZE,
- 1,
- ATH79_IP3_IRQ(2));
--+ } else if (soc_is_qca9561()) {
-++ } else if (soc_is_qca956x()) {
- + pdev = ath79_register_pci_ar724x(0,
- + QCA956X_PCI_CFG_BASE1,
- + QCA956X_PCI_CTRL_BASE1,
-@@ -456,15 +480,15 @@
- rev = id & QCA955X_REV_ID_REVISION_MASK;
- break;
-
--+ case REV_ID_MAJOR_TP9343:
--+ ath79_soc = ATH79_SOC_TP9343;
--+ chip = "9343";
-++ case REV_ID_MAJOR_QCA956X:
-++ ath79_soc = ATH79_SOC_QCA956X;
-++ chip = "956X";
- + rev = id & QCA956X_REV_ID_REVISION_MASK;
- + break;
- +
--+ case REV_ID_MAJOR_QCA9561:
--+ ath79_soc = ATH79_SOC_QCA9561;
--+ chip = "9561";
-++ case REV_ID_MAJOR_TP9343:
-++ ath79_soc = ATH79_SOC_TP9343;
-++ chip = "9343";
- + rev = id & QCA956X_REV_ID_REVISION_MASK;
- + break;
- +
-@@ -476,7 +500,7 @@
- ath79_soc_rev = rev;
-
- - if (soc_is_qca953x() || soc_is_qca955x())
--+ if (soc_is_qca953x() || soc_is_qca955x() || soc_is_qca9561())
-++ if (soc_is_qca953x() || soc_is_qca955x() || soc_is_qca956x())
- sprintf(ath79_sys_type, "Qualcomm Atheros QCA%s ver %u rev %u",
- chip, ver, rev);
- + else if (soc_is_tp9343())
-@@ -511,7 +535,21 @@
- #define AR9300_OTP_BASE 0x14000
- #define AR9300_OTP_STATUS 0x15f18
- #define AR9300_OTP_STATUS_TYPE 0x7
--@@ -375,6 +392,49 @@
-+@@ -152,6 +169,13 @@
-+ #define AR9300_OTP_READ_DATA 0x15f1c
-+
-+ /*
-++ * Hidden Registers
-++ */
-++#define QCA956X_DAM_RESET_OFFSET 0xb90001bc
-++#define QCA956X_DAM_RESET_SIZE 0x4
-++#define QCA956X_INLINE_CHKSUM_ENG BIT(27)
-++
-++/*
-+ * DDR_CTRL block
-+ */
-+ #define AR71XX_DDR_REG_PCI_WIN0 0x7c
-+@@ -375,6 +399,49 @@
- #define QCA955X_PLL_CLK_CTRL_DDRCLK_FROM_DDRPLL BIT(21)
- #define QCA955X_PLL_CLK_CTRL_AHBCLK_FROM_DDRPLL BIT(24)
-
-@@ -561,7 +599,7 @@
- /*
- * USB_CONFIG block
- */
--@@ -422,6 +482,11 @@
-+@@ -422,6 +489,11 @@
- #define QCA955X_RESET_REG_BOOTSTRAP 0xb0
- #define QCA955X_RESET_REG_EXT_INT_STATUS 0xac
-
-@@ -573,7 +611,7 @@
- #define MISC_INT_ETHSW BIT(12)
- #define MISC_INT_TIMER4 BIT(10)
- #define MISC_INT_TIMER3 BIT(9)
--@@ -596,6 +661,8 @@
-+@@ -596,6 +668,8 @@
-
- #define QCA955X_BOOTSTRAP_REF_CLK_40 BIT(4)
-
-@@ -582,7 +620,7 @@
- #define AR934X_PCIE_WMAC_INT_WMAC_MISC BIT(0)
- #define AR934X_PCIE_WMAC_INT_WMAC_TX BIT(1)
- #define AR934X_PCIE_WMAC_INT_WMAC_RXLP BIT(2)
--@@ -663,6 +730,37 @@
-+@@ -663,6 +737,37 @@
- QCA955X_EXT_INT_PCIE_RC2_INT1 | QCA955X_EXT_INT_PCIE_RC2_INT2 | \
- QCA955X_EXT_INT_PCIE_RC2_INT3)
-
-@@ -620,16 +658,16 @@
- #define REV_ID_MAJOR_MASK 0xfff0
- #define REV_ID_MAJOR_AR71XX 0x00a0
- #define REV_ID_MAJOR_AR913X 0x00b0
--@@ -678,6 +776,8 @@
-+@@ -678,6 +783,8 @@
- #define REV_ID_MAJOR_QCA9533_V2 0x0160
- #define REV_ID_MAJOR_QCA9556 0x0130
- #define REV_ID_MAJOR_QCA9558 0x1130
- +#define REV_ID_MAJOR_TP9343 0x0150
--+#define REV_ID_MAJOR_QCA9561 0x1150
-++#define REV_ID_MAJOR_QCA956X 0x1150
-
- #define AR71XX_REV_ID_MINOR_MASK 0x3
- #define AR71XX_REV_ID_MINOR_AR7130 0x0
--@@ -702,6 +802,8 @@
-+@@ -702,6 +809,8 @@
-
- #define QCA955X_REV_ID_REVISION_MASK 0xf
-
-@@ -638,7 +676,7 @@
- /*
- * SPI block
- */
--@@ -774,6 +876,19 @@
-+@@ -766,6 +875,19 @@
- #define QCA953X_GPIO_OUT_MUX_LED_LINK4 44
- #define QCA953X_GPIO_OUT_MUX_LED_LINK5 45
-
-@@ -658,7 +696,7 @@
- #define AR71XX_GPIO_COUNT 16
- #define AR7240_GPIO_COUNT 18
- #define AR7241_GPIO_COUNT 20
--@@ -782,6 +897,7 @@
-+@@ -774,6 +896,7 @@
- #define AR934X_GPIO_COUNT 23
- #define QCA953X_GPIO_COUNT 18
- #define QCA955X_GPIO_COUNT 24
-@@ -673,11 +711,11 @@
- ATH79_SOC_QCA9556,
- ATH79_SOC_QCA9558,
- + ATH79_SOC_TP9343,
--+ ATH79_SOC_QCA9561,
-++ ATH79_SOC_QCA956X,
- };
-
- extern enum ath79_soc_type ath79_soc;
--@@ -126,6 +128,21 @@ static inline int soc_is_qca955x(void)
-+@@ -126,6 +128,26 @@ static inline int soc_is_qca955x(void)
- return soc_is_qca9556() || soc_is_qca9558();
- }
-
-@@ -685,15 +723,20 @@
- +{
- + return ath79_soc == ATH79_SOC_TP9343;
- +}
--+
-++
- +static inline int soc_is_qca9561(void)
- +{
--+ return ath79_soc == ATH79_SOC_QCA9561;
-++ return ath79_soc == ATH79_SOC_QCA956X;
-++}
-++
-++static inline int soc_is_qca9563(void)
-++{
-++ return ath79_soc == ATH79_SOC_QCA956X;
- +}
- +
- +static inline int soc_is_qca956x(void)
- +{
--+ return soc_is_tp9343() || soc_is_qca9561();
-++ return soc_is_qca9561() || soc_is_qca9563();
- +}
- +
- extern void __iomem *ath79_ddr_base;
-diff --git a/target/linux/ar71xx/patches-3.18/739-MIPS-ath79-add-gpio-func-register-for-QCA955x-SoC.patch b/target/linux/ar71xx/patches-3.18/739-MIPS-ath79-add-gpio-func-register-for-QCA955x-SoC.patch
-index a36b8c319f7d08fe5daab867a10edca4dfcd4706..44c9c6281e683792af37b6f9b32357b2a4ec2fd4 100644
---- a/target/linux/ar71xx/patches-3.18/739-MIPS-ath79-add-gpio-func-register-for-QCA955x-SoC.patch
-+++ b/target/linux/ar71xx/patches-3.18/739-MIPS-ath79-add-gpio-func-register-for-QCA955x-SoC.patch
-@@ -9,8 +9,8 @@
- + soc_is_qca955x())
- reg = AR71XX_GPIO_REG_FUNC;
- else if (soc_is_ar934x() ||
-- soc_is_qca953x() || soc_is_qca956x())
--@@ -185,15 +186,27 @@ void __init ath79_gpio_output_select(uns
-+ soc_is_qca953x() ||
-+@@ -187,15 +188,30 @@ void __init ath79_gpio_output_select(uns
- {
- void __iomem *base = ath79_gpio_base;
- unsigned long flags;
-@@ -19,7 +19,7 @@
- + unsigned long gpio_count;
- u32 t, s;
-
--- BUG_ON(!soc_is_ar934x() && !soc_is_qca953x());
-+- BUG_ON(!soc_is_ar934x() && !soc_is_qca953x() && !soc_is_qca956x());
- + if (soc_is_ar934x()) {
- + gpio_count = AR934X_GPIO_COUNT;
- + reg_base = AR934X_GPIO_REG_OUT_FUNC0;
-@@ -29,6 +29,9 @@
- + } else if (soc_is_qca955x()) {
- + gpio_count = QCA955X_GPIO_COUNT;
- + reg_base = QCA955X_GPIO_REG_OUT_FUNC0;
-++ } else if (soc_is_qca956x()) {
-++ gpio_count = QCA956X_GPIO_COUNT;
-++ reg_base = QCA956X_GPIO_REG_OUT_FUNC0;
- + } else {
- + BUG();
- + }
diff --git a/patches/openwrt/0035-ar71xx-fold-patch-622-MIPS-ath79-add-support-for-QCA956x-ethernet.patch-into-files.patch b/patches/openwrt/0035-ar71xx-fold-patch-622-MIPS-ath79-add-support-for-QCA956x-ethernet.patch-into-files.patch
deleted file mode 100644
index 3b79882d9ff6b9283dad7ceadd74f784a0bbf4ca..0000000000000000000000000000000000000000
--- a/patches/openwrt/0035-ar71xx-fold-patch-622-MIPS-ath79-add-support-for-QCA956x-ethernet.patch-into-files.patch
+++ /dev/null
@@ -1,176 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Fri, 13 May 2016 21:00:16 +0200
-Subject: ar71xx: fold patch 622-MIPS-ath79-add-support-for-QCA956x-ethernet.patch into files/
-
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
-
-Backport of OpenWrt r48650
-
-diff --git a/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c b/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c
-index 31d24388d274b92e01642ad6d7f59d22f80dc2a6..2efb9c70ff31f5c11bcdff6c6326743e4d5b5a11 100644
---- a/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c
-+++ b/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c
-@@ -198,7 +198,6 @@ void __init ath79_register_mdio(unsigned int id, u32 phy_mask)
- case ATH79_SOC_AR9330:
- case ATH79_SOC_AR9331:
- case ATH79_SOC_QCA9533:
-- case ATH79_SOC_QCA9561:
- case ATH79_SOC_TP9343:
- mdio_dev = &ath79_mdio1_device;
- mdio_data = &ath79_mdio1_data;
-@@ -209,6 +208,7 @@ void __init ath79_register_mdio(unsigned int id, u32 phy_mask)
- case ATH79_SOC_AR9344:
- case ATH79_SOC_QCA9556:
- case ATH79_SOC_QCA9558:
-+ case ATH79_SOC_QCA956X:
- if (id == 0) {
- mdio_dev = &ath79_mdio0_device;
- mdio_data = &ath79_mdio0_data;
-@@ -258,7 +258,6 @@ void __init ath79_register_mdio(unsigned int id, u32 phy_mask)
- break;
-
- case ATH79_SOC_QCA9533:
-- case ATH79_SOC_QCA9561:
- case ATH79_SOC_TP9343:
- mdio_data->builtin_switch = 1;
- break;
-@@ -268,6 +267,11 @@ void __init ath79_register_mdio(unsigned int id, u32 phy_mask)
- mdio_data->is_ar934x = 1;
- break;
-
-+ case ATH79_SOC_QCA956X:
-+ if (id == 1)
-+ mdio_data->builtin_switch = 1;
-+ break;
-+
- default:
- break;
- }
-@@ -387,6 +391,16 @@ static void qca955x_set_speed_sgmii(int speed)
- iounmap(base);
- }
-
-+static void qca956x_set_speed_sgmii(int speed)
-+{
-+ void __iomem *base;
-+ u32 val = ath79_get_eth_pll(0, speed);
-+
-+ base = ioremap_nocache(AR71XX_PLL_BASE, AR71XX_PLL_SIZE);
-+ __raw_writel(val, base + QCA955X_PLL_ETH_SGMII_CONTROL_REG);
-+ iounmap(base);
-+}
-+
- static void ath79_set_speed_dummy(int speed)
- {
- }
-@@ -517,6 +531,10 @@ struct ag71xx_switch_platform_data ath79_switch_data;
- #define AR934X_PLL_VAL_100 0x00000101
- #define AR934X_PLL_VAL_10 0x00001616
-
-+#define QCA956X_PLL_VAL_1000 0x03000000
-+#define QCA956X_PLL_VAL_100 0x00000101
-+#define QCA956X_PLL_VAL_10 0x00001919
-+
- static void __init ath79_init_eth_pll_data(unsigned int id)
- {
- struct ath79_eth_pll_data *pll_data;
-@@ -575,13 +593,18 @@ static void __init ath79_init_eth_pll_data(unsigned int id)
- case ATH79_SOC_QCA9533:
- case ATH79_SOC_QCA9556:
- case ATH79_SOC_QCA9558:
-- case ATH79_SOC_QCA9561:
- case ATH79_SOC_TP9343:
- pll_10 = AR934X_PLL_VAL_10;
- pll_100 = AR934X_PLL_VAL_100;
- pll_1000 = AR934X_PLL_VAL_1000;
- break;
-
-+ case ATH79_SOC_QCA956X:
-+ pll_10 = QCA956X_PLL_VAL_10;
-+ pll_100 = QCA956X_PLL_VAL_100;
-+ pll_1000 = QCA956X_PLL_VAL_1000;
-+ break;
-+
- default:
- BUG();
- }
-@@ -656,6 +679,7 @@ static int __init ath79_setup_phy_if_mode(unsigned int id,
-
- case ATH79_SOC_QCA9556:
- case ATH79_SOC_QCA9558:
-+ case ATH79_SOC_QCA956X:
- switch (pdata->phy_if_mode) {
- case PHY_INTERFACE_MODE_MII:
- case PHY_INTERFACE_MODE_RGMII:
-@@ -666,11 +690,6 @@ static int __init ath79_setup_phy_if_mode(unsigned int id,
- }
- break;
-
-- case ATH79_SOC_QCA9561:
-- if (!pdata->phy_if_mode)
-- pdata->phy_if_mode = PHY_INTERFACE_MODE_MII;
-- break;
--
- default:
- BUG();
- }
-@@ -699,7 +718,7 @@ static int __init ath79_setup_phy_if_mode(unsigned int id,
- case ATH79_SOC_AR7241:
- case ATH79_SOC_AR9330:
- case ATH79_SOC_AR9331:
-- case ATH79_SOC_QCA9561:
-+ case ATH79_SOC_QCA956X:
- case ATH79_SOC_TP9343:
- pdata->phy_if_mode = PHY_INTERFACE_MODE_GMII;
- break;
-@@ -1032,7 +1051,6 @@ void __init ath79_register_eth(unsigned int id)
- pdata->fifo_cfg3 = 0x01f00140;
- break;
-
-- case ATH79_SOC_QCA9561:
- case ATH79_SOC_TP9343:
- if (id == 0) {
- pdata->reset_bit = AR933X_RESET_GE0_MAC |
-@@ -1100,6 +1118,34 @@ void __init ath79_register_eth(unsigned int id)
- pdata->fifo_cfg3 = 0x01f00140;
- break;
-
-+ case ATH79_SOC_QCA956X:
-+ if (id == 0) {
-+ pdata->reset_bit = QCA955X_RESET_GE0_MAC |
-+ QCA955X_RESET_GE0_MDIO;
-+ if (pdata->phy_if_mode == PHY_INTERFACE_MODE_SGMII)
-+ pdata->set_speed = qca956x_set_speed_sgmii;
-+ else
-+ /* FIXME */
-+ pdata->set_speed = ath79_set_speed_dummy;
-+ } else {
-+ pdata->reset_bit = QCA955X_RESET_GE1_MAC |
-+ QCA955X_RESET_GE1_MDIO;
-+ /* FIXME */
-+ pdata->set_speed = ath79_set_speed_dummy;
-+ }
-+
-+ pdata->ddr_flush = ath79_ddr_no_flush;
-+ pdata->has_gbit = 1;
-+ pdata->is_ar724x = 1;
-+
-+ if (!pdata->fifo_cfg1)
-+ pdata->fifo_cfg1 = 0x0010ffff;
-+ if (!pdata->fifo_cfg2)
-+ pdata->fifo_cfg2 = 0x015500aa;
-+ if (!pdata->fifo_cfg3)
-+ pdata->fifo_cfg3 = 0x01f00140;
-+ break;
-+
- default:
- BUG();
- }
-@@ -1140,7 +1186,6 @@ void __init ath79_register_eth(unsigned int id)
- case ATH79_SOC_AR9330:
- case ATH79_SOC_AR9331:
- case ATH79_SOC_QCA9533:
-- case ATH79_SOC_QCA9561:
- case ATH79_SOC_TP9343:
- pdata->mii_bus_dev = &ath79_mdio1_device.dev;
- break;
diff --git a/patches/openwrt/0036-ar71xx-fix-MDIO-bus-probe-on-QCA956x.patch b/patches/openwrt/0036-ar71xx-fix-MDIO-bus-probe-on-QCA956x.patch
deleted file mode 100644
index a0aaccb7934de5048a948f8540d23cf85b1d9bf5..0000000000000000000000000000000000000000
--- a/patches/openwrt/0036-ar71xx-fix-MDIO-bus-probe-on-QCA956x.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Fri, 13 May 2016 21:00:41 +0200
-Subject: ar71xx: fix MDIO bus probe on QCA956x
-
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
-
-Backport of OpenWrt r48651
-
-diff --git a/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c b/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c
-index 2efb9c70ff31f5c11bcdff6c6326743e4d5b5a11..12a376e1322ae14dd714297ed5f8319ae09eeb64 100644
---- a/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c
-+++ b/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c
-@@ -183,7 +183,8 @@ void __init ath79_register_mdio(unsigned int id, u32 phy_mask)
- ath79_soc == ATH79_SOC_AR9342 ||
- ath79_soc == ATH79_SOC_AR9344 ||
- ath79_soc == ATH79_SOC_QCA9556 ||
-- ath79_soc == ATH79_SOC_QCA9558)
-+ ath79_soc == ATH79_SOC_QCA9558 ||
-+ ath79_soc == ATH79_SOC_QCA956X)
- max_id = 1;
- else
- max_id = 0;
diff --git a/patches/openwrt/0037-ar71xx-fix-qca956x-ethernet-initialization.patch b/patches/openwrt/0037-ar71xx-fix-qca956x-ethernet-initialization.patch
deleted file mode 100644
index 28481f4b7ce700fd01689789476b8bc59115ae30..0000000000000000000000000000000000000000
--- a/patches/openwrt/0037-ar71xx-fix-qca956x-ethernet-initialization.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Fri, 13 May 2016 21:01:19 +0200
-Subject: ar71xx: fix qca956x ethernet initialization
-
-Complete internal switch initialization for QCA956X.
-Set default mdio device if the interface mode of GE0 is not SGMII (fix ticket #21520).
-
-Signed-off-by: Weijie Gao <hackpascal@gmail.com>
-
-Backport of OpenWrt r48937
-
-diff --git a/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c b/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c
-index 12a376e1322ae14dd714297ed5f8319ae09eeb64..b43c80a3762ddebe46d8443660714922165a2287 100644
---- a/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c
-+++ b/target/linux/ar71xx/files/arch/mips/ath79/dev-eth.c
-@@ -271,6 +271,7 @@ void __init ath79_register_mdio(unsigned int id, u32 phy_mask)
- case ATH79_SOC_QCA956X:
- if (id == 1)
- mdio_data->builtin_switch = 1;
-+ mdio_data->is_ar934x = 1;
- break;
-
- default:
-@@ -1123,16 +1124,25 @@ void __init ath79_register_eth(unsigned int id)
- if (id == 0) {
- pdata->reset_bit = QCA955X_RESET_GE0_MAC |
- QCA955X_RESET_GE0_MDIO;
-+
- if (pdata->phy_if_mode == PHY_INTERFACE_MODE_SGMII)
- pdata->set_speed = qca956x_set_speed_sgmii;
- else
-- /* FIXME */
-- pdata->set_speed = ath79_set_speed_dummy;
-+ pdata->set_speed = ath79_set_speed_ge0;
- } else {
- pdata->reset_bit = QCA955X_RESET_GE1_MAC |
- QCA955X_RESET_GE1_MDIO;
-- /* FIXME */
-+
- pdata->set_speed = ath79_set_speed_dummy;
-+
-+ pdata->switch_data = &ath79_switch_data;
-+
-+ pdata->speed = SPEED_1000;
-+ pdata->duplex = DUPLEX_FULL;
-+
-+ /* reset the built-in switch */
-+ ath79_device_reset_set(AR934X_RESET_ETH_SWITCH);
-+ ath79_device_reset_clear(AR934X_RESET_ETH_SWITCH);
- }
-
- pdata->ddr_flush = ath79_ddr_no_flush;
-@@ -1196,6 +1206,11 @@ void __init ath79_register_eth(unsigned int id)
- /* don't assign any MDIO device by default */
- break;
-
-+ case ATH79_SOC_QCA956X:
-+ if (pdata->phy_if_mode != PHY_INTERFACE_MODE_SGMII)
-+ pdata->mii_bus_dev = &ath79_mdio1_device.dev;
-+ break;
-+
- default:
- pdata->mii_bus_dev = &ath79_mdio0_device.dev;
- break;
diff --git a/patches/openwrt/0038-ar71xx-Support-for-Ubiquiti-UniFi-AP-AC-LITE.patch b/patches/openwrt/0038-ar71xx-Support-for-Ubiquiti-UniFi-AP-AC-LITE.patch
deleted file mode 100644
index 3e83f2bee0d1a96081e7f8a57b6bc3f562d7962a..0000000000000000000000000000000000000000
--- a/patches/openwrt/0038-ar71xx-Support-for-Ubiquiti-UniFi-AP-AC-LITE.patch
+++ /dev/null
@@ -1,562 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Fri, 13 May 2016 20:47:26 +0200
-Subject: ar71xx: Support for Ubiquiti UniFi AP AC LITE
-
-Add support for the Ubiquiti UniFi AP AC LITE
-Signed-off-by: P.Wassi <p.wassi at gmx.at>
-
-Backport of OpenWrt r48711
-
-diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh
-index 486879f512cd28f1b80e828809359b55956fbcc3..3adc449b23e9c590d57cdd914b6c8d990a50e0b0 100644
---- a/target/linux/ar71xx/base-files/etc/diag.sh
-+++ b/target/linux/ar71xx/base-files/etc/diag.sh
-@@ -309,7 +309,8 @@ get_status_led() {
- unifi)
- status_led="ubnt:green:dome"
- ;;
-- uap-pro)
-+ uap-pro | \
-+ unifiac)
- status_led="ubnt:white:dome"
- ;;
- unifi-outdoor-plus)
-diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
-index 032c671341fd526c7e4e32cb9cba42217165cf5c..a79376a8cff56b144268130a24a930ff2bee95cd 100755
---- a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
-+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
-@@ -369,6 +369,7 @@ tl-wa901nd-v3 |\
- tl-wa901nd-v4 |\
- tl-wr703n |\
- tube2h |\
-+unifiac |\
- wndap360 |\
- mynet-rext |\
- wp543)
-diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
-index 6c106179bfa0c01308a03678aef1b7cf4caaf05b..ecf584d30ecae7a0e2601bed38c6cfad42cab124 100755
---- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
-+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
-@@ -902,6 +902,9 @@ ar71xx_board_detect() {
- *UniFi)
- name="unifi"
- ;;
-+ *"UniFi-AC")
-+ name="unifiac"
-+ ;;
- *"UniFi AP Pro")
- name="uap-pro"
- ;;
-diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
-index 024e4930949c927efd36c3ac67cd351dcaa4bf7b..fff1c3c912cee678ea88e225958b28ceb4c4b742 100755
---- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
-+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
-@@ -252,6 +252,7 @@ platform_check_image() {
- wlae-ag300n | \
- nbg460n_550n_550nh | \
- unifi | \
-+ unifiac | \
- unifi-outdoor | \
- carambola2 | \
- weio )
-diff --git a/target/linux/ar71xx/config-3.18 b/target/linux/ar71xx/config-3.18
-index e0d52d9fcbad980f7220dd1f93388359e52dc8f9..a068cc5768aed6f29a67de27d24f00dc57e0695a 100644
---- a/target/linux/ar71xx/config-3.18
-+++ b/target/linux/ar71xx/config-3.18
-@@ -141,6 +141,7 @@ CONFIG_ATH79_MACH_TL_WR941ND=y
- CONFIG_ATH79_MACH_TL_WR941ND_V6=y
- CONFIG_ATH79_MACH_TUBE2H=y
- CONFIG_ATH79_MACH_UBNT=y
-+CONFIG_ATH79_MACH_UBNT_UNIFIAC=y
- CONFIG_ATH79_MACH_UBNT_XM=y
- CONFIG_ATH79_MACH_WEIO=y
- CONFIG_ATH79_MACH_WHR_HP_G300N=y
-@@ -324,7 +325,7 @@ CONFIG_SOC_AR933X=y
- CONFIG_SOC_AR934X=y
- CONFIG_SOC_QCA953X=y
- CONFIG_SOC_QCA955X=y
--# CONFIG_SOC_QCA956X is not set
-+CONFIG_SOC_QCA956X=y
- CONFIG_SPI=y
- CONFIG_SPI_AP83=y
- CONFIG_SPI_ATH79=y
-diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-ubnt-unifiac.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-ubnt-unifiac.c
-new file mode 100644
-index 0000000000000000000000000000000000000000..3617ca7d5fc0fff00fce9741b5d9169fac8c83c8
---- /dev/null
-+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-ubnt-unifiac.c
-@@ -0,0 +1,109 @@
-+/*
-+ * Ubiquiti UniFi AC (LITE) board support
-+ *
-+ * Copyright (C) 2015-2016 P. Wassi <p.wassi at gmx.at>
-+ *
-+ * Derived from: mach-ubnt-xm.c
-+ *
-+ * This program is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 as published
-+ * by the Free Software Foundation.
-+ */
-+
-+#include <linux/init.h>
-+#include <linux/pci.h>
-+#include <linux/platform_device.h>
-+#include <linux/ath9k_platform.h>
-+#include <linux/etherdevice.h>
-+
-+#include <asm/mach-ath79/ath79.h>
-+#include <asm/mach-ath79/irq.h>
-+#include <asm/mach-ath79/ar71xx_regs.h>
-+
-+#include <linux/platform_data/phy-at803x.h>
-+
-+#include "common.h"
-+#include "dev-ap9x-pci.h"
-+#include "dev-eth.h"
-+#include "dev-gpio-buttons.h"
-+#include "dev-leds-gpio.h"
-+#include "dev-m25p80.h"
-+#include "dev-wmac.h"
-+#include "machtypes.h"
-+
-+
-+#define UNIFIAC_KEYS_POLL_INTERVAL 20
-+#define UNIFIAC_KEYS_DEBOUNCE_INTERVAL (3 * UNIFIAC_KEYS_POLL_INTERVAL)
-+
-+#define UNIFIAC_GPIO_LED_WHITE 7
-+#define UNIFIAC_GPIO_LED_BLUE 8
-+
-+#define UNIFIAC_GPIO_BTN_RESET 2
-+
-+#define UNIFIAC_MAC0_OFFSET 0x0000
-+#define UNIFIAC_WMAC_CALDATA_OFFSET 0x1000
-+#define UNIFIAC_PCI_CALDATA_OFFSET 0x5000
-+
-+
-+static struct flash_platform_data ubnt_unifiac_flash_data = {
-+ /* mx25l12805d and mx25l12835f have the same JEDEC ID */
-+ .type = "mx25l12805d",
-+};
-+
-+static struct gpio_led ubnt_unifiac_leds_gpio[] __initdata = {
-+ {
-+ .name = "ubnt:white:dome",
-+ .gpio = UNIFIAC_GPIO_LED_WHITE,
-+ .active_low = 0,
-+ }, {
-+ .name = "ubnt:blue:dome",
-+ .gpio = UNIFIAC_GPIO_LED_BLUE,
-+ .active_low = 0,
-+ }
-+};
-+
-+static struct gpio_keys_button ubnt_unifiac_gpio_keys[] __initdata = {
-+ {
-+ .desc = "reset",
-+ .type = EV_KEY,
-+ .code = KEY_RESTART,
-+ .debounce_interval = UNIFIAC_KEYS_DEBOUNCE_INTERVAL,
-+ .gpio = UNIFIAC_GPIO_BTN_RESET,
-+ .active_low = 1,
-+ }
-+};
-+
-+static void __init ubnt_unifiac_setup(void)
-+{
-+ u8 *eeprom = (u8 *) KSEG1ADDR(0x1fff0000);
-+
-+ ath79_register_m25p80(&ubnt_unifiac_flash_data);
-+
-+
-+ ath79_init_mac(ath79_eth0_data.mac_addr,
-+ eeprom + UNIFIAC_MAC0_OFFSET, 0);
-+
-+ ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_SGMII;
-+ ath79_eth0_data.phy_mask = BIT(4);
-+ ath79_eth0_pll_data.pll_10 = 0x00001313;
-+
-+ ath79_register_mdio(0, ~BIT(4));
-+ ath79_register_eth(0);
-+
-+
-+ ath79_register_wmac(eeprom + UNIFIAC_WMAC_CALDATA_OFFSET, NULL);
-+
-+
-+ ap91_pci_init(eeprom + UNIFIAC_PCI_CALDATA_OFFSET, NULL);
-+
-+
-+ ath79_register_leds_gpio(-1, ARRAY_SIZE(ubnt_unifiac_leds_gpio),
-+ ubnt_unifiac_leds_gpio);
-+
-+ ath79_register_gpio_keys_polled(-1, UNIFIAC_KEYS_POLL_INTERVAL,
-+ ARRAY_SIZE(ubnt_unifiac_gpio_keys),
-+ ubnt_unifiac_gpio_keys);
-+}
-+
-+MIPS_MACHINE(ATH79_MACH_UBNT_UNIFIAC, "UBNT-UF-AC", "Ubiquiti UniFi-AC",
-+ ubnt_unifiac_setup);
-diff --git a/target/linux/ar71xx/generic/profiles/ubnt.mk b/target/linux/ar71xx/generic/profiles/ubnt.mk
-index d8e24d0032d75231d27be8207fe55294fd108282..94eff18318264de85ea459e94280c88726404888 100644
---- a/target/linux/ar71xx/generic/profiles/ubnt.mk
-+++ b/target/linux/ar71xx/generic/profiles/ubnt.mk
-@@ -38,6 +38,17 @@ endef
-
- $(eval $(call Profile,UBNTUNIFI))
-
-+define Profile/UBNTUNIFIAC
-+ NAME:=Ubiquiti UniFi AP AC
-+ PACKAGES:=kmod-ath10k ath10k-firmware-qca988x
-+endef
-+
-+define Profile/UBNTUNIFIAC/Description
-+ Package set optimized for the Ubiquiti UniFi AP AC.
-+endef
-+
-+$(eval $(call Profile,UBNTUNIFIAC))
-+
- define Profile/UBNTUNIFIOUTDOOR
- NAME:=Ubiquiti UniFiAP Outdoor
- PACKAGES:=
-diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
-index 0783381baeddef2064df8faff89c49c2bed6a28b..aaaf89ac1a369431cf9bc15c13e774ba6826bbf3 100644
---- a/target/linux/ar71xx/image/Makefile
-+++ b/target/linux/ar71xx/image/Makefile
-@@ -740,6 +740,16 @@ define Device/oolite
- endef
- TARGET_DEVICES += oolite
-
-+define Device/ubnt-unifiac
-+ DEVICE_PROFILE := UBNT UBNTUNIFIAC
-+ IMAGE_SIZE := 7744k
-+ MTDPARTS = spi0.0:384k(u-boot)ro,64k(u-boot-env)ro,7744k(firmware),7744k(ubnt-airos)ro,128k(bs)ro,256k(cfg)ro,64k(EEPROM)ro
-+ IMAGES := sysupgrade.bin
-+ IMAGE/sysupgrade.bin = append-kernel $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE)
-+ BOARDNAME := UBNT-UF-AC
-+endef
-+TARGET_DEVICES += ubnt-unifiac
-+
- rootfs_type=$(patsubst jffs2-%,jffs2,$(patsubst squashfs-%,squashfs,$(1)))
-
- # $(1): rootfs type.
-diff --git a/target/linux/ar71xx/mikrotik/config-default b/target/linux/ar71xx/mikrotik/config-default
-index b8a7bf13f2582b0b458d17f5e4b266a6e110faa1..2b1fe2491c7a00449453efdc4969015ec1b28291 100644
---- a/target/linux/ar71xx/mikrotik/config-default
-+++ b/target/linux/ar71xx/mikrotik/config-default
-@@ -97,6 +97,7 @@ CONFIG_ATH79_MACH_RBSXTLITE=y
- # CONFIG_ATH79_MACH_TUBE2H is not set
- # CONFIG_ATH79_MACH_UBNT is not set
- # CONFIG_ATH79_MACH_UBNT_XM is not set
-+# CONFIG_ATH79_MACH_UBNT_UNIFIAC is not set
- # CONFIG_ATH79_MACH_WHR_HP_G300N is not set
- # CONFIG_ATH79_MACH_WLAE_AG300N is not set
- # CONFIG_ATH79_MACH_WLR8100 is not set
-diff --git a/target/linux/ar71xx/nand/config-default b/target/linux/ar71xx/nand/config-default
-index 626d676c621b90feb31a88e7b8c2daa587a8f603..f62cf1a4399718b2f4e94a974d26ddaf8d46a8ec 100644
---- a/target/linux/ar71xx/nand/config-default
-+++ b/target/linux/ar71xx/nand/config-default
-@@ -59,6 +59,7 @@
- # CONFIG_ATH79_MACH_TL_WR941ND is not set
- # CONFIG_ATH79_MACH_UBNT is not set
- # CONFIG_ATH79_MACH_UBNT_XM is not set
-+# CONFIG_ATH79_MACH_UBNT_UNIFIAC is not set
- # CONFIG_ATH79_MACH_WHR_HP_G300N is not set
- # CONFIG_ATH79_MACH_WLAE_AG300N is not set
- # CONFIG_ATH79_MACH_WNDAP360 is not set
-diff --git a/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch b/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch
-index 76aeb94412e6f44b9a81fc44858e9c4540a08845..27dc73ffa239979a799bbede72440907e9d0e187 100644
---- a/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch
-+++ b/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch
-@@ -1,6 +1,6 @@
- --- a/arch/mips/ath79/machtypes.h
- +++ b/arch/mips/ath79/machtypes.h
--@@ -16,22 +16,200 @@
-+@@ -16,22 +16,201 @@
-
- enum ath79_mach_type {
- ATH79_MACH_GENERIC = 0,
-@@ -165,6 +165,7 @@
- + ATH79_MACH_UBNT_RS, /* Ubiquiti RouterStation */
- ATH79_MACH_UBNT_UAP_PRO, /* Ubiquiti UniFi AP Pro */
- ATH79_MACH_UBNT_UNIFI, /* Ubiquiti Unifi */
-++ ATH79_MACH_UBNT_UNIFIAC, /* Ubiquiti Unifi AC */
- ATH79_MACH_UBNT_UNIFI_OUTDOOR, /* Ubiquiti UnifiAP Outdoor */
- + ATH79_MACH_UBNT_UNIFI_OUTDOOR_PLUS, /* Ubiquiti UnifiAP Outdoor+ */
- ATH79_MACH_UBNT_XM, /* Ubiquiti Networks XM board rev 1.0 */
-@@ -1098,10 +1099,7 @@
- + select ATH79_DEV_M25P80
- + select ATH79_DEV_USB
- + select ATH79_DEV_WMAC
--
---config ATH79_MACH_AP136
--- bool "Atheros AP136/AP135 reference board"
--- select SOC_QCA955X
-++
- +config ATH79_MACH_TL_WA7210N_V2
- + bool "TP-LINK TL-WA7210N v2 support"
- + select SOC_AR724X
-@@ -1116,19 +1114,12 @@
- + bool "TP-LINK TL-WA830RE v2 support"
- + select SOC_AR934X
- + select ATH79_DEV_ETH
-- select ATH79_DEV_GPIO_BUTTONS
-- select ATH79_DEV_LEDS_GPIO
--- select ATH79_DEV_NFC
--- select ATH79_DEV_SPI
-++ select ATH79_DEV_GPIO_BUTTONS
-++ select ATH79_DEV_LEDS_GPIO
- + select ATH79_DEV_M25P80
-- select ATH79_DEV_USB
-- select ATH79_DEV_WMAC
--- help
--- Say 'Y' here if you want your kernel to support the
--- Atheros AP136 or AP135 reference boards.
--
---config ATH79_MACH_AP81
--- bool "Atheros AP81 reference board"
-++ select ATH79_DEV_USB
-++ select ATH79_DEV_WMAC
-++
- +config ATH79_MACH_TL_WA901ND
- + bool "TP-LINK TL-WA901ND/TL-WA7510N support"
- + select SOC_AR724X
-@@ -1140,11 +1131,11 @@
- +
- +config ATH79_MACH_TL_WA901ND_V2
- + bool "TP-LINK TL-WA901ND v2 support"
-- select SOC_AR913X
-- select ATH79_DEV_ETH
-- select ATH79_DEV_GPIO_BUTTONS
-- select ATH79_DEV_LEDS_GPIO
-- select ATH79_DEV_M25P80
-++ select SOC_AR913X
-++ select ATH79_DEV_ETH
-++ select ATH79_DEV_GPIO_BUTTONS
-++ select ATH79_DEV_LEDS_GPIO
-++ select ATH79_DEV_M25P80
- + select ATH79_DEV_WMAC
- +
- +config ATH79_MACH_TL_WDR3500
-@@ -1155,34 +1146,13 @@
- + select ATH79_DEV_GPIO_BUTTONS
- + select ATH79_DEV_LEDS_GPIO
- + select ATH79_DEV_M25P80
-- select ATH79_DEV_USB
-- select ATH79_DEV_WMAC
--- help
--- Say 'Y' here if you want your kernel to support the
--- Atheros AP81 reference board.
--
---config ATH79_MACH_DB120
--- bool "Atheros DB120 reference board"
-++ select ATH79_DEV_USB
-++ select ATH79_DEV_WMAC
-++
- +config ATH79_MACH_TL_WDR4300
- + bool "TP-LINK TL-WDR3600/4300/4310 board support"
-- select SOC_AR934X
-- select ATH79_DEV_AP9X_PCI if PCI
-- select ATH79_DEV_ETH
-- select ATH79_DEV_GPIO_BUTTONS
-- select ATH79_DEV_LEDS_GPIO
-- select ATH79_DEV_M25P80
--- select ATH79_DEV_NFC
-- select ATH79_DEV_USB
-- select ATH79_DEV_WMAC
--- help
--- Say 'Y' here if you want your kernel to support the
--- Atheros DB120 reference board.
--
---config ATH79_MACH_PB44
--- bool "Atheros PB44 reference board"
--+config ATH79_MACH_TL_WR703N
--+ bool "TP-LINK TL-WR703N/TL-WR710N/TL-MR10U support"
--+ select SOC_AR933X
-++ select SOC_AR934X
-++ select ATH79_DEV_AP9X_PCI if PCI
- + select ATH79_DEV_ETH
- + select ATH79_DEV_GPIO_BUTTONS
- + select ATH79_DEV_LEDS_GPIO
-@@ -1190,8 +1160,8 @@
- + select ATH79_DEV_USB
- + select ATH79_DEV_WMAC
- +
--+config ATH79_MACH_TL_WR720N_V3
--+ bool "TP-LINK TL-WR720N v3/v4 support"
-++config ATH79_MACH_TL_WR703N
-++ bool "TP-LINK TL-WR703N/TL-WR710N/TL-MR10U support"
- + select SOC_AR933X
- + select ATH79_DEV_ETH
- + select ATH79_DEV_GPIO_BUTTONS
-@@ -1199,7 +1169,28 @@
- + select ATH79_DEV_M25P80
- + select ATH79_DEV_USB
- + select ATH79_DEV_WMAC
--+
-+
-+-config ATH79_MACH_AP136
-+- bool "Atheros AP136/AP135 reference board"
-+- select SOC_QCA955X
-++config ATH79_MACH_TL_WR720N_V3
-++ bool "TP-LINK TL-WR720N v3/v4 support"
-++ select SOC_AR933X
-++ select ATH79_DEV_ETH
-+ select ATH79_DEV_GPIO_BUTTONS
-+ select ATH79_DEV_LEDS_GPIO
-+- select ATH79_DEV_NFC
-+- select ATH79_DEV_SPI
-++ select ATH79_DEV_M25P80
-+ select ATH79_DEV_USB
-+ select ATH79_DEV_WMAC
-+- help
-+- Say 'Y' here if you want your kernel to support the
-+- Atheros AP136 or AP135 reference boards.
-+
-+-config ATH79_MACH_AP81
-+- bool "Atheros AP81 reference board"
-+- select SOC_AR913X
- +config ATH79_MACH_TL_WR741ND
- + bool "TP-LINK TL-WR741ND support"
- + select SOC_AR724X
-@@ -1212,21 +1203,25 @@
- +config ATH79_MACH_TL_WR741ND_V4
- + bool "TP-LINK TL-WR741ND v4/TL-MR3220 v2 support"
- + select SOC_AR933X
--+ select ATH79_DEV_ETH
--+ select ATH79_DEV_GPIO_BUTTONS
--+ select ATH79_DEV_LEDS_GPIO
--+ select ATH79_DEV_M25P80
--+ select ATH79_DEV_USB
--+ select ATH79_DEV_WMAC
--+
--+config ATH79_MACH_TL_WR841N_V1
--+ bool "TP-LINK TL-WR841N v1 support"
-- select SOC_AR71XX
--+ select ATH79_DEV_DSA
- select ATH79_DEV_ETH
- select ATH79_DEV_GPIO_BUTTONS
- select ATH79_DEV_LEDS_GPIO
--- select ATH79_DEV_SPI
-+ select ATH79_DEV_M25P80
-+ select ATH79_DEV_USB
-+ select ATH79_DEV_WMAC
-+- help
-+- Say 'Y' here if you want your kernel to support the
-+- Atheros AP81 reference board.
-+
-+-config ATH79_MACH_DB120
-+- bool "Atheros DB120 reference board"
-++config ATH79_MACH_TL_WR841N_V1
-++ bool "TP-LINK TL-WR841N v1 support"
-++ select SOC_AR71XX
-++ select ATH79_DEV_DSA
-++ select ATH79_DEV_ETH
-++ select ATH79_DEV_GPIO_BUTTONS
-++ select ATH79_DEV_LEDS_GPIO
- + select ATH79_DEV_M25P80
- +
- +config ATH79_MACH_TL_WR841N_V8
-@@ -1269,15 +1264,21 @@
- +
- +config ATH79_MACH_TL_WR1041N_V2
- + bool "TP-LINK TL-WR1041N v2 support"
--+ select SOC_AR934X
--+ select ATH79_DEV_AP9X_PCI if PCI
--+ select ATH79_DEV_ETH
--+ select ATH79_DEV_GPIO_BUTTONS
--+ select ATH79_DEV_LEDS_GPIO
--+ select ATH79_DEV_M25P80
--+ select ATH79_DEV_USB
--+ select ATH79_DEV_WMAC
--+
-+ select SOC_AR934X
-+ select ATH79_DEV_AP9X_PCI if PCI
-+ select ATH79_DEV_ETH
-+ select ATH79_DEV_GPIO_BUTTONS
-+ select ATH79_DEV_LEDS_GPIO
-+ select ATH79_DEV_M25P80
-+- select ATH79_DEV_NFC
-+ select ATH79_DEV_USB
-+ select ATH79_DEV_WMAC
-+- help
-+- Say 'Y' here if you want your kernel to support the
-+- Atheros DB120 reference board.
-+
-+-config ATH79_MACH_PB44
-+- bool "Atheros PB44 reference board"
- +config ATH79_MACH_TL_WR1043ND
- + bool "TP-LINK TL-WR1043ND support"
- + select SOC_AR913X
-@@ -1320,11 +1321,12 @@
- +
- +config ATH79_MACH_TEW_673GRU
- + bool "TRENDnet TEW-673GRU support"
--+ select SOC_AR71XX
-+ select SOC_AR71XX
- + select ATH79_DEV_AP9X_PCI if PCI
--+ select ATH79_DEV_ETH
--+ select ATH79_DEV_GPIO_BUTTONS
--+ select ATH79_DEV_LEDS_GPIO
-+ select ATH79_DEV_ETH
-+ select ATH79_DEV_GPIO_BUTTONS
-+ select ATH79_DEV_LEDS_GPIO
-+- select ATH79_DEV_SPI
- + select ATH79_DEV_M25P80
- + select ATH79_DEV_USB
- + select ATH79_NVRAM
-@@ -1362,10 +1364,20 @@
-
- config ATH79_MACH_UBNT_XM
- bool "Ubiquiti Networks XM/UniFi boards"
--@@ -83,6 +1144,106 @@ config ATH79_MACH_UBNT_XM
-+@@ -83,6 +1144,116 @@ config ATH79_MACH_UBNT_XM
- Say 'Y' here if you want your kernel to support the
- Ubiquiti Networks XM (rev 1.0) board.
-
-++config ATH79_MACH_UBNT_UNIFIAC
-++ bool "Ubiquiti UniFi AC (LITE) support"
-++ select SOC_QCA956X
-++ select ATH79_DEV_AP9X_PCI if PCI
-++ select ATH79_DEV_ETH
-++ select ATH79_DEV_GPIO_BUTTONS
-++ select ATH79_DEV_LEDS_GPIO
-++ select ATH79_DEV_M25P80
-++ select ATH79_DEV_WMAC
-++
- +config ATH79_MACH_WEIO
- + bool "WeIO board"
- + select SOC_AR933X
-@@ -1469,7 +1481,7 @@
- endmenu
-
- config SOC_AR71XX
--@@ -124,7 +1285,10 @@ config ATH79_DEV_DSA
-+@@ -124,7 +1295,10 @@ config ATH79_DEV_DSA
- config ATH79_DEV_ETH
- def_bool n
-
-@@ -1481,7 +1493,7 @@
- def_bool n
-
- config ATH79_DEV_GPIO_BUTTONS
--@@ -154,6 +1318,11 @@ config ATH79_PCI_ATH9K_FIXUP
-+@@ -154,6 +1328,11 @@ config ATH79_PCI_ATH9K_FIXUP
- def_bool n
-
- config ATH79_ROUTERBOOT
-@@ -1495,7 +1507,7 @@
- endif
- --- a/arch/mips/ath79/Makefile
- +++ b/arch/mips/ath79/Makefile
--@@ -38,9 +38,128 @@ obj-$(CONFIG_ATH79_ROUTERBOOT) += route
-+@@ -38,9 +38,129 @@ obj-$(CONFIG_ATH79_ROUTERBOOT) += route
- #
- # Machines
- #
-@@ -1597,6 +1609,7 @@
- +obj-$(CONFIG_ATH79_MACH_TL_WR720N_V3) += mach-tl-wr720n-v3.o
- +obj-$(CONFIG_ATH79_MACH_TUBE2H) += mach-tube2h.o
- +obj-$(CONFIG_ATH79_MACH_UBNT) += mach-ubnt.o
-++obj-$(CONFIG_ATH79_MACH_UBNT_UNIFIAC) += mach-ubnt-unifiac.o
- obj-$(CONFIG_ATH79_MACH_UBNT_XM) += mach-ubnt-xm.o
- +obj-$(CONFIG_ATH79_MACH_WEIO) += mach-weio.o
- +obj-$(CONFIG_ATH79_MACH_WHR_HP_G300N) += mach-whr-hp-g300n.o
diff --git a/patches/openwrt/0039-ar71xx-Fix-eth0-support-for-Ubiquiti-UniFi-AP-AC.patch b/patches/openwrt/0039-ar71xx-Fix-eth0-support-for-Ubiquiti-UniFi-AP-AC.patch
deleted file mode 100644
index 66b1a52a08c8c28c546f042b6d3c62d9719af530..0000000000000000000000000000000000000000
--- a/patches/openwrt/0039-ar71xx-Fix-eth0-support-for-Ubiquiti-UniFi-AP-AC.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Fri, 13 May 2016 21:02:55 +0200
-Subject: ar71xx: Fix eth0 support for Ubiquiti UniFi AP AC
-
-Fix eth0 support for the Ubiquiti UniFi AP AC
-Signed-off-by: Paul Wassi <p.wassi at gmx.at>
-
-Backport of OpenWrt r49277
-
-diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-ubnt-unifiac.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-ubnt-unifiac.c
-index 3617ca7d5fc0fff00fce9741b5d9169fac8c83c8..072cf12a31a0921a8e9b90689864f5d981cd2c32 100644
---- a/target/linux/ar71xx/files/arch/mips/ath79/mach-ubnt-unifiac.c
-+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-ubnt-unifiac.c
-@@ -84,6 +84,7 @@ static void __init ubnt_unifiac_setup(void)
- eeprom + UNIFIAC_MAC0_OFFSET, 0);
-
- ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_SGMII;
-+ ath79_eth0_data.mii_bus_dev = &ath79_mdio0_device.dev;
- ath79_eth0_data.phy_mask = BIT(4);
- ath79_eth0_pll_data.pll_10 = 0x00001313;
-
diff --git a/patches/openwrt/0040-ar71xx-Rename-unifiac-to-unifiac-lite.patch b/patches/openwrt/0040-ar71xx-Rename-unifiac-to-unifiac-lite.patch
deleted file mode 100644
index e867717e9cb5cf2c4c97df20472c4eb6f519003b..0000000000000000000000000000000000000000
--- a/patches/openwrt/0040-ar71xx-Rename-unifiac-to-unifiac-lite.patch
+++ /dev/null
@@ -1,193 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Fri, 13 May 2016 21:24:44 +0200
-Subject: ar71xx: Rename unifiac to unifiac-lite
-
-To avoid confusion with different unifiac devices, rename existing target
-"unifiac" to "unifiac-lite", before "unifiac-pro" is introduced.
-
-Signed-off-by: P.Wassi <p.wassi at gmx.at>
-
-Backport of LEDE c855e70491fbd5d432915c4cbeb3b80f3a117e30
-
-diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh
-index 3adc449b23e9c590d57cdd914b6c8d990a50e0b0..924c1163e26eb84b71e4734b95221104674bfe3e 100644
---- a/target/linux/ar71xx/base-files/etc/diag.sh
-+++ b/target/linux/ar71xx/base-files/etc/diag.sh
-@@ -310,7 +310,7 @@ get_status_led() {
- status_led="ubnt:green:dome"
- ;;
- uap-pro | \
-- unifiac)
-+ unifiac-lite)
- status_led="ubnt:white:dome"
- ;;
- unifi-outdoor-plus)
-diff --git a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-index ab7d93c693f8422bbb518c6accd4ffed169398cd..7777734ae3899840c1c47e7b24373b4bceee0adc 100644
---- a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-+++ b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-@@ -81,7 +81,7 @@ case "$FIRMWARE" in
- ath10kcal_extract "ART" 20480 2116
- ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) +16)
- ;;
-- unifiac)
-+ unifiac-lite)
- ath10kcal_extract "EEPROM" 20480 2116
- ;;
- esac
-diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
-index a79376a8cff56b144268130a24a930ff2bee95cd..20070426fd033e4ff2e904f9247deed9eb48c3c3 100755
---- a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
-+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
-@@ -369,7 +369,7 @@ tl-wa901nd-v3 |\
- tl-wa901nd-v4 |\
- tl-wr703n |\
- tube2h |\
--unifiac |\
-+unifiac-lite |\
- wndap360 |\
- mynet-rext |\
- wp543)
-diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
-index ecf584d30ecae7a0e2601bed38c6cfad42cab124..6bc0b868423ef68fb83147c13b00163b29cf2aec 100755
---- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
-+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
-@@ -902,8 +902,8 @@ ar71xx_board_detect() {
- *UniFi)
- name="unifi"
- ;;
-- *"UniFi-AC")
-- name="unifiac"
-+ *"UniFi-AC-LITE")
-+ name="unifiac-lite"
- ;;
- *"UniFi AP Pro")
- name="uap-pro"
-diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
-index fff1c3c912cee678ea88e225958b28ceb4c4b742..90f961f3f0aaf3c76a0a8022258fbf5404165ca8 100755
---- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
-+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
-@@ -252,7 +252,7 @@ platform_check_image() {
- wlae-ag300n | \
- nbg460n_550n_550nh | \
- unifi | \
-- unifiac | \
-+ unifiac-lite | \
- unifi-outdoor | \
- carambola2 | \
- weio )
-diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-ubnt-unifiac.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-ubnt-unifiac.c
-index 072cf12a31a0921a8e9b90689864f5d981cd2c32..31cbe30d3ff9b323cb336c62d6fe0d7a0c67ba42 100644
---- a/target/linux/ar71xx/files/arch/mips/ath79/mach-ubnt-unifiac.c
-+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-ubnt-unifiac.c
-@@ -73,7 +73,7 @@ static struct gpio_keys_button ubnt_unifiac_gpio_keys[] __initdata = {
- }
- };
-
--static void __init ubnt_unifiac_setup(void)
-+static void __init ubnt_unifiac_lite_setup(void)
- {
- u8 *eeprom = (u8 *) KSEG1ADDR(0x1fff0000);
-
-@@ -81,7 +81,7 @@ static void __init ubnt_unifiac_setup(void)
-
-
- ath79_init_mac(ath79_eth0_data.mac_addr,
-- eeprom + UNIFIAC_MAC0_OFFSET, 0);
-+ eeprom + UNIFIAC_MAC0_OFFSET, 0);
-
- ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_SGMII;
- ath79_eth0_data.mii_bus_dev = &ath79_mdio0_device.dev;
-@@ -99,12 +99,12 @@ static void __init ubnt_unifiac_setup(void)
-
-
- ath79_register_leds_gpio(-1, ARRAY_SIZE(ubnt_unifiac_leds_gpio),
-- ubnt_unifiac_leds_gpio);
-+ ubnt_unifiac_leds_gpio);
-
- ath79_register_gpio_keys_polled(-1, UNIFIAC_KEYS_POLL_INTERVAL,
-- ARRAY_SIZE(ubnt_unifiac_gpio_keys),
-- ubnt_unifiac_gpio_keys);
-+ ARRAY_SIZE(ubnt_unifiac_gpio_keys),
-+ ubnt_unifiac_gpio_keys);
- }
-
--MIPS_MACHINE(ATH79_MACH_UBNT_UNIFIAC, "UBNT-UF-AC", "Ubiquiti UniFi-AC",
-- ubnt_unifiac_setup);
-+MIPS_MACHINE(ATH79_MACH_UBNT_UNIFIAC_LITE, "UBNT-UF-AC-LITE", "Ubiquiti UniFi-AC-LITE",
-+ ubnt_unifiac_lite_setup);
-diff --git a/target/linux/ar71xx/generic/profiles/ubnt.mk b/target/linux/ar71xx/generic/profiles/ubnt.mk
-index 94eff18318264de85ea459e94280c88726404888..eac02406bbbffebbcb20962929fb8254edba520e 100644
---- a/target/linux/ar71xx/generic/profiles/ubnt.mk
-+++ b/target/linux/ar71xx/generic/profiles/ubnt.mk
-@@ -38,16 +38,16 @@ endef
-
- $(eval $(call Profile,UBNTUNIFI))
-
--define Profile/UBNTUNIFIAC
-- NAME:=Ubiquiti UniFi AP AC
-+define Profile/UBNTUNIFIACLITE
-+ NAME:=Ubiquiti UniFi AP AC LITE/LR
- PACKAGES:=kmod-ath10k ath10k-firmware-qca988x
- endef
-
--define Profile/UBNTUNIFIAC/Description
-- Package set optimized for the Ubiquiti UniFi AP AC.
-+define Profile/UBNTUNIFIACLITE/Description
-+ Package set optimized for the Ubiquiti UniFi AP AC LITE/LR.
- endef
-
--$(eval $(call Profile,UBNTUNIFIAC))
-+$(eval $(call Profile,UBNTUNIFIACLITE))
-
- define Profile/UBNTUNIFIOUTDOOR
- NAME:=Ubiquiti UniFiAP Outdoor
-diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
-index aaaf89ac1a369431cf9bc15c13e774ba6826bbf3..42ffc69ca3f9b1cffa542fc2d06ead2ef224d6b2 100644
---- a/target/linux/ar71xx/image/Makefile
-+++ b/target/linux/ar71xx/image/Makefile
-@@ -741,14 +741,19 @@ endef
- TARGET_DEVICES += oolite
-
- define Device/ubnt-unifiac
-- DEVICE_PROFILE := UBNT UBNTUNIFIAC
-+ DEVICE_PROFILE := UBNT
- IMAGE_SIZE := 7744k
- MTDPARTS = spi0.0:384k(u-boot)ro,64k(u-boot-env)ro,7744k(firmware),7744k(ubnt-airos)ro,128k(bs)ro,256k(cfg)ro,64k(EEPROM)ro
- IMAGES := sysupgrade.bin
- IMAGE/sysupgrade.bin = append-kernel $$$$(BLOCKSIZE) | append-rootfs | pad-rootfs | check-size $$$$(IMAGE_SIZE)
-- BOARDNAME := UBNT-UF-AC
- endef
--TARGET_DEVICES += ubnt-unifiac
-+
-+define Device/ubnt-unifiac-lite
-+ $(Device/ubnt-unifiac)
-+ DEVICE_PROFILE := UBNT UBNTUNIFIACLITE
-+ BOARDNAME := UBNT-UF-AC-LITE
-+endef
-+TARGET_DEVICES += ubnt-unifiac-lite
-
- rootfs_type=$(patsubst jffs2-%,jffs2,$(patsubst squashfs-%,squashfs,$(1)))
-
-diff --git a/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch b/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch
-index 27dc73ffa239979a799bbede72440907e9d0e187..9a28f58f67d5f98fcd4aa83dc09698705e2dfa3e 100644
---- a/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch
-+++ b/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch
-@@ -165,7 +165,7 @@
- + ATH79_MACH_UBNT_RS, /* Ubiquiti RouterStation */
- ATH79_MACH_UBNT_UAP_PRO, /* Ubiquiti UniFi AP Pro */
- ATH79_MACH_UBNT_UNIFI, /* Ubiquiti Unifi */
--+ ATH79_MACH_UBNT_UNIFIAC, /* Ubiquiti Unifi AC */
-++ ATH79_MACH_UBNT_UNIFIAC_LITE, /* Ubiquiti Unifi AC LITE/LR */
- ATH79_MACH_UBNT_UNIFI_OUTDOOR, /* Ubiquiti UnifiAP Outdoor */
- + ATH79_MACH_UBNT_UNIFI_OUTDOOR_PLUS, /* Ubiquiti UnifiAP Outdoor+ */
- ATH79_MACH_UBNT_XM, /* Ubiquiti Networks XM board rev 1.0 */
-@@ -1369,7 +1369,7 @@
- Ubiquiti Networks XM (rev 1.0) board.
-
- +config ATH79_MACH_UBNT_UNIFIAC
--+ bool "Ubiquiti UniFi AC (LITE) support"
-++ bool "Ubiquiti UniFi AC (LITE/LR) support"
- + select SOC_QCA956X
- + select ATH79_DEV_AP9X_PCI if PCI
- + select ATH79_DEV_ETH
diff --git a/patches/openwrt/0041-ar71xx-Add-support-for-Ubiquiti-UniFi-AP-AC-PRO.patch b/patches/openwrt/0041-ar71xx-Add-support-for-Ubiquiti-UniFi-AP-AC-PRO.patch
deleted file mode 100644
index 2e2e7900eb9553ea7bd2213c91108e3fd8553628..0000000000000000000000000000000000000000
--- a/patches/openwrt/0041-ar71xx-Add-support-for-Ubiquiti-UniFi-AP-AC-PRO.patch
+++ /dev/null
@@ -1,274 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Fri, 13 May 2016 21:34:05 +0200
-Subject: ar71xx: Add support for Ubiquiti UniFi AP AC PRO
-
-Add support for the Ubiquiti UniFi AP AC PRO
-Signed-off-by: P.Wassi <p.wassi at gmx.at>
-
-Backport of LEDE 8307c2fe686ded345c80318359d5b6679e581fa2
-
-diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh
-index 924c1163e26eb84b71e4734b95221104674bfe3e..cb92349cab833179a87a195b94e2539cc5ce3e79 100644
---- a/target/linux/ar71xx/base-files/etc/diag.sh
-+++ b/target/linux/ar71xx/base-files/etc/diag.sh
-@@ -310,7 +310,8 @@ get_status_led() {
- status_led="ubnt:green:dome"
- ;;
- uap-pro | \
-- unifiac-lite)
-+ unifiac-lite | \
-+ unifiac-pro)
- status_led="ubnt:white:dome"
- ;;
- unifi-outdoor-plus)
-diff --git a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-index 7777734ae3899840c1c47e7b24373b4bceee0adc..5eb20bb26521258599898125d42f6b73b9c81f94 100644
---- a/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-+++ b/target/linux/ar71xx/base-files/etc/hotplug.d/firmware/11-ath10k-caldata
-@@ -81,7 +81,8 @@ case "$FIRMWARE" in
- ath10kcal_extract "ART" 20480 2116
- ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) +16)
- ;;
-- unifiac-lite)
-+ unifiac-lite | \
-+ unifiac-pro)
- ath10kcal_extract "EEPROM" 20480 2116
- ;;
- esac
-diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
-index 20070426fd033e4ff2e904f9247deed9eb48c3c3..b59844eac49a1269edb88890d89b0b4d8a7121d0 100755
---- a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
-+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
-@@ -401,6 +401,13 @@ wpj344)
- ucidef_add_switch_vlan "switch0" "2" "0t 2"
- ;;
-
-+unifiac-pro)
-+ ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
-+ ucidef_add_switch "switch0" "1" "1"
-+ ucidef_add_switch_vlan "switch0" "1" "0t 2"
-+ ucidef_add_switch_vlan "switch0" "2" "0t 3"
-+ ;;
-+
- wpj531)
- ucidef_set_interfaces_lan_wan "eth0" "eth1"
- ;;
-diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
-index 6bc0b868423ef68fb83147c13b00163b29cf2aec..aded7ad117ffa1c1347c6f457c210d60b8e4df58 100755
---- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
-+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
-@@ -905,6 +905,9 @@ ar71xx_board_detect() {
- *"UniFi-AC-LITE")
- name="unifiac-lite"
- ;;
-+ *"UniFi-AC-PRO")
-+ name="unifiac-pro"
-+ ;;
- *"UniFi AP Pro")
- name="uap-pro"
- ;;
-diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
-index 90f961f3f0aaf3c76a0a8022258fbf5404165ca8..0228f14774d5873a52f19b60ed84389c7be86e51 100755
---- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
-+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
-@@ -253,6 +253,7 @@ platform_check_image() {
- nbg460n_550n_550nh | \
- unifi | \
- unifiac-lite | \
-+ unifiac-pro | \
- unifi-outdoor | \
- carambola2 | \
- weio )
-diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-ubnt-unifiac.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-ubnt-unifiac.c
-index 31cbe30d3ff9b323cb336c62d6fe0d7a0c67ba42..9194bc1c0799d83fca3f6fe76b2602d72e5f4ef8 100644
---- a/target/linux/ar71xx/files/arch/mips/ath79/mach-ubnt-unifiac.c
-+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-ubnt-unifiac.c
-@@ -21,6 +21,7 @@
- #include <asm/mach-ath79/ar71xx_regs.h>
-
- #include <linux/platform_data/phy-at803x.h>
-+#include <linux/ar8216_platform.h>
-
- #include "common.h"
- #include "dev-ap9x-pci.h"
-@@ -29,6 +30,7 @@
- #include "dev-leds-gpio.h"
- #include "dev-m25p80.h"
- #include "dev-wmac.h"
-+#include "dev-usb.h"
- #include "machtypes.h"
-
-
-@@ -108,3 +110,70 @@ static void __init ubnt_unifiac_lite_setup(void)
-
- MIPS_MACHINE(ATH79_MACH_UBNT_UNIFIAC_LITE, "UBNT-UF-AC-LITE", "Ubiquiti UniFi-AC-LITE",
- ubnt_unifiac_lite_setup);
-+
-+static struct ar8327_pad_cfg ubnt_unifiac_pro_ar8327_pad0_cfg = {
-+ .mode = AR8327_PAD_MAC_SGMII,
-+ .sgmii_delay_en = true,
-+};
-+
-+static struct ar8327_platform_data ubnt_unifiac_pro_ar8327_data = {
-+ .pad0_cfg = &ubnt_unifiac_pro_ar8327_pad0_cfg,
-+ .port0_cfg = {
-+ .force_link = 1,
-+ .speed = AR8327_PORT_SPEED_1000,
-+ .duplex = 1,
-+ .txpause = 1,
-+ .rxpause = 1,
-+ },
-+};
-+
-+
-+static struct mdio_board_info ubnt_unifiac_pro_mdio0_info[] = {
-+ {
-+ .bus_id = "ag71xx-mdio.0",
-+ .phy_addr = 0,
-+ .platform_data = &ubnt_unifiac_pro_ar8327_data,
-+ },
-+};
-+
-+static void __init ubnt_unifiac_pro_setup(void)
-+{
-+ u8 *eeprom = (u8 *) KSEG1ADDR(0x1fff0000);
-+
-+ ath79_register_m25p80(&ubnt_unifiac_flash_data);
-+
-+
-+ ath79_init_mac(ath79_eth0_data.mac_addr,
-+ eeprom + UNIFIAC_MAC0_OFFSET, 0);
-+
-+ ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_SGMII;
-+ ath79_eth0_data.mii_bus_dev = &ath79_mdio0_device.dev;
-+ ath79_eth0_data.phy_mask = BIT(0);
-+
-+ mdiobus_register_board_info(ubnt_unifiac_pro_mdio0_info,
-+ ARRAY_SIZE(ubnt_unifiac_pro_mdio0_info));
-+
-+ ath79_register_mdio(0, 0x00);
-+ ath79_register_eth(0);
-+
-+
-+ ath79_register_usb();
-+
-+
-+ ath79_register_wmac(eeprom + UNIFIAC_WMAC_CALDATA_OFFSET, NULL);
-+
-+
-+ ap91_pci_init(eeprom + UNIFIAC_PCI_CALDATA_OFFSET, NULL);
-+
-+
-+ ath79_register_leds_gpio(-1, ARRAY_SIZE(ubnt_unifiac_leds_gpio),
-+ ubnt_unifiac_leds_gpio);
-+
-+ ath79_register_gpio_keys_polled(-1, UNIFIAC_KEYS_POLL_INTERVAL,
-+ ARRAY_SIZE(ubnt_unifiac_gpio_keys),
-+ ubnt_unifiac_gpio_keys);
-+}
-+
-+
-+MIPS_MACHINE(ATH79_MACH_UBNT_UNIFIAC_PRO, "UBNT-UF-AC-PRO", "Ubiquiti UniFi-AC-PRO",
-+ ubnt_unifiac_pro_setup);
-diff --git a/target/linux/ar71xx/generic/profiles/ubnt.mk b/target/linux/ar71xx/generic/profiles/ubnt.mk
-index eac02406bbbffebbcb20962929fb8254edba520e..69b83985bd6623c0d6732399d3e2cc8c0af9f9f1 100644
---- a/target/linux/ar71xx/generic/profiles/ubnt.mk
-+++ b/target/linux/ar71xx/generic/profiles/ubnt.mk
-@@ -49,6 +49,17 @@ endef
-
- $(eval $(call Profile,UBNTUNIFIACLITE))
-
-+define Profile/UBNTUNIFIACPRO
-+ NAME:=Ubiquiti UniFi AP AC PRO
-+ PACKAGES:=kmod-ath10k ath10k-firmware-qca988x kmod-usb-core kmod-usb-ohci kmod-usb2
-+endef
-+
-+define Profile/UBNTUNIFIACPRO/Description
-+ Package set optimized for the Ubiquiti UniFi AP AC PRO.
-+endef
-+
-+$(eval $(call Profile,UBNTUNIFIACPRO))
-+
- define Profile/UBNTUNIFIOUTDOOR
- NAME:=Ubiquiti UniFiAP Outdoor
- PACKAGES:=
-diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
-index 42ffc69ca3f9b1cffa542fc2d06ead2ef224d6b2..7c648f26e10c49000b848e9b300701b388410c04 100644
---- a/target/linux/ar71xx/image/Makefile
-+++ b/target/linux/ar71xx/image/Makefile
-@@ -753,7 +753,13 @@ define Device/ubnt-unifiac-lite
- DEVICE_PROFILE := UBNT UBNTUNIFIACLITE
- BOARDNAME := UBNT-UF-AC-LITE
- endef
--TARGET_DEVICES += ubnt-unifiac-lite
-+
-+define Device/ubnt-unifiac-pro
-+ $(Device/ubnt-unifiac)
-+ DEVICE_PROFILE := UBNT UBNTUNIFIACPRO
-+ BOARDNAME := UBNT-UF-AC-PRO
-+endef
-+TARGET_DEVICES += ubnt-unifiac-lite ubnt-unifiac-pro
-
- rootfs_type=$(patsubst jffs2-%,jffs2,$(patsubst squashfs-%,squashfs,$(1)))
-
-diff --git a/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch b/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch
-index 9a28f58f67d5f98fcd4aa83dc09698705e2dfa3e..debde6e6a552e71b551d8c01ba06af03013407bf 100644
---- a/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch
-+++ b/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch
-@@ -1,6 +1,6 @@
- --- a/arch/mips/ath79/machtypes.h
- +++ b/arch/mips/ath79/machtypes.h
--@@ -16,22 +16,201 @@
-+@@ -16,22 +16,202 @@
-
- enum ath79_mach_type {
- ATH79_MACH_GENERIC = 0,
-@@ -166,6 +166,7 @@
- ATH79_MACH_UBNT_UAP_PRO, /* Ubiquiti UniFi AP Pro */
- ATH79_MACH_UBNT_UNIFI, /* Ubiquiti Unifi */
- + ATH79_MACH_UBNT_UNIFIAC_LITE, /* Ubiquiti Unifi AC LITE/LR */
-++ ATH79_MACH_UBNT_UNIFIAC_PRO, /* Ubiquiti Unifi AC PRO */
- ATH79_MACH_UBNT_UNIFI_OUTDOOR, /* Ubiquiti UnifiAP Outdoor */
- + ATH79_MACH_UBNT_UNIFI_OUTDOOR_PLUS, /* Ubiquiti UnifiAP Outdoor+ */
- ATH79_MACH_UBNT_XM, /* Ubiquiti Networks XM board rev 1.0 */
-@@ -1364,12 +1365,12 @@
-
- config ATH79_MACH_UBNT_XM
- bool "Ubiquiti Networks XM/UniFi boards"
--@@ -83,6 +1144,116 @@ config ATH79_MACH_UBNT_XM
-+@@ -83,6 +1144,117 @@ config ATH79_MACH_UBNT_XM
- Say 'Y' here if you want your kernel to support the
- Ubiquiti Networks XM (rev 1.0) board.
-
- +config ATH79_MACH_UBNT_UNIFIAC
--+ bool "Ubiquiti UniFi AC (LITE/LR) support"
-++ bool "Ubiquiti UniFi AC (LITE/LR/PRO) support"
- + select SOC_QCA956X
- + select ATH79_DEV_AP9X_PCI if PCI
- + select ATH79_DEV_ETH
-@@ -1377,6 +1378,7 @@
- + select ATH79_DEV_LEDS_GPIO
- + select ATH79_DEV_M25P80
- + select ATH79_DEV_WMAC
-++ select ATH79_DEV_USB
- +
- +config ATH79_MACH_WEIO
- + bool "WeIO board"
-@@ -1481,7 +1483,7 @@
- endmenu
-
- config SOC_AR71XX
--@@ -124,7 +1295,10 @@ config ATH79_DEV_DSA
-+@@ -124,7 +1296,10 @@ config ATH79_DEV_DSA
- config ATH79_DEV_ETH
- def_bool n
-
-@@ -1493,7 +1495,7 @@
- def_bool n
-
- config ATH79_DEV_GPIO_BUTTONS
--@@ -154,6 +1328,11 @@ config ATH79_PCI_ATH9K_FIXUP
-+@@ -154,6 +1329,11 @@ config ATH79_PCI_ATH9K_FIXUP
- def_bool n
-
- config ATH79_ROUTERBOOT
diff --git a/patches/openwrt/0043-ath9k-add-HSR-tuner-support-for-UniFi-Outdoor-Plus.patch b/patches/openwrt/0043-ath9k-add-HSR-tuner-support-for-UniFi-Outdoor-Plus.patch
deleted file mode 100644
index 61457f9d22244b292b839f41e3afbef20b11e504..0000000000000000000000000000000000000000
--- a/patches/openwrt/0043-ath9k-add-HSR-tuner-support-for-UniFi-Outdoor-Plus.patch
+++ /dev/null
@@ -1,395 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Thu, 3 Sep 2015 23:50:51 +0200
-Subject: ath9k: add HSR tuner support for UniFi Outdoor Plus
-
-Patch-by: Stefan Rompf <stefan@loplof.de>
-
-diff --git a/package/kernel/mac80211/patches/931-ubnt-uap-plus-hsr.patch b/package/kernel/mac80211/patches/931-ubnt-uap-plus-hsr.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..8e09fee938951ab3636d23b5fe4dee3ab0e11c7a
---- /dev/null
-+++ b/package/kernel/mac80211/patches/931-ubnt-uap-plus-hsr.patch
-@@ -0,0 +1,349 @@
-+--- a/drivers/net/wireless/ath/ath9k/channel.c
-++++ b/drivers/net/wireless/ath/ath9k/channel.c
-+@@ -15,6 +15,8 @@
-+ */
-+
-+ #include "ath9k.h"
-++#include <linux/ath9k_platform.h>
-++#include "hsr.h"
-+
-+ /* Set/change channels. If the channel is really being changed, it's done
-+ * by reseting the chip. To accomplish this we must first cleanup any pending
-+@@ -22,6 +24,7 @@
-+ */
-+ static int ath_set_channel(struct ath_softc *sc)
-+ {
-++ struct ath9k_platform_data *pdata = sc->dev->platform_data;
-+ struct ath_hw *ah = sc->sc_ah;
-+ struct ath_common *common = ath9k_hw_common(ah);
-+ struct ieee80211_hw *hw = sc->hw;
-+@@ -41,6 +44,11 @@ static int ath_set_channel(struct ath_so
-+ ath_dbg(common, CONFIG, "Set channel: %d MHz width: %d\n",
-+ chan->center_freq, chandef->width);
-+
-++ if (pdata && pdata->ubnt_hsr) {
-++ hsr_enable(ah, chandef->width, chan->center_freq);
-++ hsr_status(ah);
-++ }
-++
-+ /* update survey stats for the old channel before switching */
-+ spin_lock_bh(&common->cc_lock);
-+ ath_update_survey_stats(sc);
-+--- /dev/null
-++++ b/drivers/net/wireless/ath/ath9k/hsr.c
-+@@ -0,0 +1,223 @@
-++/*
-++ *
-++ * The MIT License (MIT)
-++ *
-++ * Copyright (c) 2015 Kirill Berezin
-++ *
-++ * Permission is hereby granted, free of charge, to any person obtaining a copy
-++ * of this software and associated documentation files (the "Software"), to deal
-++ * in the Software without restriction, including without limitation the rights
-++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-++ * copies of the Software, and to permit persons to whom the Software is
-++ * furnished to do so, subject to the following conditions:
-++ *
-++ * The above copyright notice and this permission notice shall be included in all
-++ * copies or substantial portions of the Software.
-++ *
-++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-++ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-++ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-++ * SOFTWARE.
-++ *
-++ */
-++
-++#include <linux/io.h>
-++#include <linux/slab.h>
-++#include <linux/module.h>
-++#include <linux/time.h>
-++#include <linux/bitops.h>
-++#include <linux/etherdevice.h>
-++#include <linux/rtnetlink.h>
-++#include <asm/unaligned.h>
-++
-++#include "hw.h"
-++#include "ath9k.h"
-++
-++#define HSR_GPIO_CSN 8
-++#define HSR_GPIO_CLK 6
-++#define HSR_GPIO_DOUT 7
-++#define HSR_GPIO_DIN 5
-++
-++/* delays are in useconds */
-++#define HSR_DELAY_HALF_TICK 100
-++#define HSR_DELAY_PRE_WRITE 75
-++#define HSR_DELAY_FINAL 20000
-++#define HSR_DELAY_TRAILING 200
-++
-++
-++void hsr_init(struct ath_hw* ah) {
-++ ath9k_hw_gpio_request_in(ah, HSR_GPIO_DIN, NULL);
-++ ath9k_hw_gpio_request_out(ah, HSR_GPIO_CSN, NULL,
-++ AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
-++ ath9k_hw_gpio_request_out(ah, HSR_GPIO_CLK, NULL,
-++ AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
-++ ath9k_hw_gpio_request_out(ah, HSR_GPIO_DOUT, NULL,
-++ AR_GPIO_OUTPUT_MUX_AS_OUTPUT);
-++
-++ ath9k_hw_set_gpio(ah, HSR_GPIO_CSN, 1);
-++ ath9k_hw_set_gpio(ah, HSR_GPIO_CLK, 0);
-++ ath9k_hw_set_gpio(ah, HSR_GPIO_DOUT, 0);
-++
-++ udelay(HSR_DELAY_TRAILING);
-++}
-++
-++static u32 hsr_write_byte(struct ath_hw* ah, int delay, u32 value){
-++ struct ath_common *common = ath9k_hw_common(ah);
-++ int i;
-++ u32 rval = 0;
-++
-++ udelay(delay);
-++
-++ ath9k_hw_set_gpio(ah, HSR_GPIO_CLK, 0);
-++ udelay(HSR_DELAY_HALF_TICK);
-++
-++ ath9k_hw_set_gpio(ah, HSR_GPIO_CSN, 0);
-++ udelay(HSR_DELAY_HALF_TICK);
-++
-++ for( i = 0; i < 8; ++i) {
-++ rval = rval << 1;
-++
-++ // pattern is left to right, that is 7-th bit runs first
-++ ath9k_hw_set_gpio(ah, HSR_GPIO_DOUT, (value >> (7 - i)) & 0x1);
-++ udelay(HSR_DELAY_HALF_TICK);
-++
-++ ath9k_hw_set_gpio(ah, HSR_GPIO_CLK, 1);
-++ udelay(HSR_DELAY_HALF_TICK);
-++
-++ rval |= ath9k_hw_gpio_get(ah, HSR_GPIO_DIN);
-++
-++ ath9k_hw_set_gpio(ah, HSR_GPIO_CLK, 0);
-++ udelay(HSR_DELAY_HALF_TICK);
-++ }
-++
-++ ath9k_hw_set_gpio(ah, HSR_GPIO_CSN, 1);
-++ udelay(HSR_DELAY_HALF_TICK);
-++
-++ ath_dbg(common, CONFIG, "hsr_write_byte: write byte %d return value is %d %c\n",
-++ value, rval, rval > 32 ? rval : '-');
-++
-++ return rval & 0xff;
-++}
-++
-++static int hsr_write_a_chain(struct ath_hw* ah, char* chain, int items) {
-++ int i = 0;
-++ int status = 0;
-++
-++ // a preamble
-++ hsr_write_byte(ah, HSR_DELAY_PRE_WRITE, 0);
-++ status = hsr_write_byte(ah, HSR_DELAY_PRE_WRITE, 0);
-++
-++ // clear HSR's reply buffer
-++ if (status) {
-++ int loop = 0;
-++ for ( loop = 0; (loop < 42) && status; ++loop) {
-++ status = hsr_write_byte(ah, HSR_DELAY_PRE_WRITE, 0);
-++ }
-++ if ( loop >= 42) {
-++ ATH_DBG_WARN(1, "hsr_write_a_chain: can't clear an output buffer after a 42 cycles.\n");
-++ return -1;
-++ }
-++ }
-++
-++ for ( i =0; (i < items) && ( 0 != chain[i]); ++i) {
-++ hsr_write_byte(ah, HSR_DELAY_PRE_WRITE, (u32)chain[i]);
-++ }
-++
-++ hsr_write_byte(ah, HSR_DELAY_PRE_WRITE, 0);
-++ mdelay(HSR_DELAY_FINAL / 1000);
-++
-++ // reply
-++ memset(chain, 0, items);
-++
-++ hsr_write_byte(ah, HSR_DELAY_PRE_WRITE, 0);
-++ udelay(HSR_DELAY_TRAILING);
-++
-++ for ( i = 0; i < (items - 1); ++i) {
-++ u32 ret;
-++ if ( 0 != (ret = hsr_write_byte(ah, HSR_DELAY_PRE_WRITE, 0))) {
-++ chain[i] = (char)ret;
-++ } else {
-++ break;
-++ }
-++ udelay(HSR_DELAY_TRAILING);
-++ }
-++
-++ return (1 < i) ? simple_strtol(chain + 1, NULL, 10) : 0;
-++}
-++
-++int hsr_disable(struct ath_hw* ah) {
-++ char cmd[10] = {'b', '4', '0', 0, 0, 0, 0, 0, 0, 0};
-++ int ret;
-++
-++ ret = hsr_write_a_chain(ah, cmd, sizeof(cmd));
-++ if ( (ret > 0) && (*cmd == 'B')) {
-++ return 0;
-++ }
-++
-++ return -1;
-++}
-++
-++int hsr_enable(struct ath_hw* ah, int bw, int fq) {
-++ char cmd[10];
-++ int ret;
-++
-++ /* Bandwidth argument is 0 sometimes. Assume default 802.11bgn
-++ 20MHz on invalid values */
-++ if ( (bw != 5) && (bw != 10) && (bw != 20) && (bw != 40)) {
-++ bw = 20;
-++ }
-++
-++ memset(cmd, 0, sizeof(cmd));
-++ *cmd = 'b'; // 98
-++ snprintf(cmd + 1, 3, "%02d", bw);
-++
-++ ret = hsr_write_a_chain(ah, cmd, sizeof(cmd));
-++ if ( (*cmd != 'B') || (ret != bw)) {
-++ ATH_DBG_WARN(1, "hsr_enable: failed changing bandwidth -> set (%d,%d) reply (%d, %d) \n", 'b', bw, *cmd, ret);
-++ return -1;
-++ }
-++
-++ memset(cmd, 0, sizeof(cmd));
-++ *cmd = 'x'; // 120
-++ ret = hsr_write_a_chain(ah, cmd, sizeof(cmd));
-++ if ( *cmd != 'X') {
-++ ATH_DBG_WARN(1, "hsr_enable: failed 'x' command -> reply (%d, %d) \n", *cmd, ret);
-++ return -1;
-++ }
-++
-++ memset(cmd, 0, sizeof(cmd));
-++ *cmd = 'm'; // 109
-++ ret = hsr_write_a_chain(ah, cmd, sizeof(cmd));
-++ if ( *cmd != 'M') {
-++ ATH_DBG_WARN(1, "hsr_enable: failed 'm' command -> reply (%d, %d) \n", *cmd, ret);
-++ return -1;
-++ }
-++
-++ memset(cmd, 0, sizeof(cmd));
-++ *cmd = 'f'; // 102
-++ snprintf(cmd + 1, 6, "%05d", fq);
-++ ret = hsr_write_a_chain(ah, cmd, sizeof(cmd));
-++ if ( (*cmd != 'F') && (ret != fq)) {
-++ ATH_DBG_WARN(1, "hsr_enable: failed set frequency -> reply (%d, %d) \n", *cmd, ret);
-++ return -1;
-++ }
-++
-++ return 0;
-++}
-++
-++int hsr_status(struct ath_hw* ah) {
-++ char cmd[10] = {'s', 0, 0, 0, 0, 0, 0, 0, 0, 0}; // 115
-++ int ret;
-++
-++ ret = hsr_write_a_chain(ah, cmd, sizeof(cmd));
-++ if ( (*cmd != 'S')) {
-++ ATH_DBG_WARN(1, "hsr_status: returned %d,%d \n", *cmd, ret);
-++ return -1;
-++ }
-++
-++ return 0;
-++}
-++
-+--- /dev/null
-++++ b/drivers/net/wireless/ath/ath9k/hsr.h
-+@@ -0,0 +1,33 @@
-++/*
-++ * The MIT License (MIT)
-++ *
-++ * Copyright (c) 2015 Kirill Berezin
-++ *
-++ * Permission is hereby granted, free of charge, to any person obtaining a copy
-++ * of this software and associated documentation files (the "Software"), to deal
-++ * in the Software without restriction, including without limitation the rights
-++ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-++ * copies of the Software, and to permit persons to whom the Software is
-++ * furnished to do so, subject to the following conditions:
-++ *
-++ * The above copyright notice and this permission notice shall be included in all
-++ * copies or substantial portions of the Software.
-++ *
-++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-++ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-++ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-++ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-++ * SOFTWARE.
-++ */
-++
-++#ifndef HSR_H_
-++#define HSR_H_
-++
-++void hsr_init(struct ath_hw* ah);
-++int hsr_disable(struct ath_hw* ah);
-++int hsr_enable(struct ath_hw* ah, int bw, int fq);
-++int hsr_status(struct ath_hw* ah);
-++
-++#endif /* HSR_H_ */
-+--- a/drivers/net/wireless/ath/ath9k/main.c
-++++ b/drivers/net/wireless/ath/ath9k/main.c
-+@@ -16,8 +16,10 @@
-+
-+ #include <linux/nl80211.h>
-+ #include <linux/delay.h>
-++#include <linux/ath9k_platform.h>
-+ #include "ath9k.h"
-+ #include "btcoex.h"
-++#include "hsr.h"
-+
-+ u8 ath9k_parse_mpdudensity(u8 mpdudensity)
-+ {
-+@@ -652,6 +654,7 @@ void ath_reset_work(struct work_struct *
-+ static int ath9k_start(struct ieee80211_hw *hw)
-+ {
-+ struct ath_softc *sc = hw->priv;
-++ struct ath9k_platform_data *pdata = sc->dev->platform_data;
-+ struct ath_hw *ah = sc->sc_ah;
-+ struct ath_common *common = ath9k_hw_common(ah);
-+ struct ieee80211_channel *curchan = sc->cur_chan->chandef.chan;
-+@@ -727,6 +730,11 @@ static int ath9k_start(struct ieee80211_
-+ ath9k_hw_set_gpio(ah, ah->led_pin,
-+ (ah->config.led_active_high) ? 1 : 0);
-+
-++ if (pdata && pdata->ubnt_hsr) {
-++ hsr_init(ah);
-++ hsr_disable(ah);
-++ }
-++
-+ /*
-+ * Reset key cache to sane defaults (all entries cleared) instead of
-+ * semi-random values after suspend/resume.
-+--- a/drivers/net/wireless/ath/ath9k/Makefile
-++++ b/drivers/net/wireless/ath/ath9k/Makefile
-+@@ -6,7 +6,8 @@ ath9k-y += beacon.o \
-+ xmit.o \
-+ link.o \
-+ antenna.o \
-+- channel.o
-++ channel.o \
-++ hsr.o
-+
-+ ath9k-$(CPTCFG_ATH9K_BTCOEX_SUPPORT) += mci.o
-+ ath9k-$(CPTCFG_ATH9K_PCI) += pci.o
-+--- a/include/linux/ath9k_platform.h
-++++ b/include/linux/ath9k_platform.h
-+@@ -54,6 +54,8 @@ struct ath9k_platform_data {
-+ unsigned num_btns;
-+ const struct gpio_keys_button *btns;
-+ unsigned btn_poll_interval;
-++
-++ bool ubnt_hsr;
-+ };
-+
-+ #endif /* _LINUX_ATH9K_PLATFORM_H */
-diff --git a/target/linux/ar71xx/patches-3.18/608-MIPS-ath79-ubnt-xm-add-more-boards.patch b/target/linux/ar71xx/patches-3.18/608-MIPS-ath79-ubnt-xm-add-more-boards.patch
-index 78035131db93f3e465585d7e96bfae9e88783d28..d865ed29ac268b6b49644c0841be6dfeace75038 100644
---- a/target/linux/ar71xx/patches-3.18/608-MIPS-ath79-ubnt-xm-add-more-boards.patch
-+++ b/target/linux/ar71xx/patches-3.18/608-MIPS-ath79-ubnt-xm-add-more-boards.patch
-@@ -254,6 +254,7 @@
- + ath79_register_eth(0);
- + ath79_register_eth(1);
- +
-++ ap9x_pci_get_wmac_data(0)->ubnt_hsr = true;
- + ap91_pci_init(ee, NULL);
- +
- + ath79_register_leds_gpio(-1, ARRAY_SIZE(ubnt_unifi_outdoor_plus_leds_gpio),
-diff --git a/target/linux/generic/patches-3.18/150-ath9k_ubnt_hsr_filter.patch b/target/linux/generic/patches-3.18/150-ath9k_ubnt_hsr_filter.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..b8844f1341f9a8a478730ef6ac440833b84b3e98
---- /dev/null
-+++ b/target/linux/generic/patches-3.18/150-ath9k_ubnt_hsr_filter.patch
-@@ -0,0 +1,16 @@
-+Flag that this platform is an Ubiquiti UniFi Outdoor Plus
-+containing a RF filter in ath9k's receive path.
-+
-+Signed-off-by: Stefan Rompf <stefan@loplof.de>
-+
-+--- a/include/linux/ath9k_platform.h
-++++ b/include/linux/ath9k_platform.h
-+@@ -54,6 +54,8 @@ struct ath9k_platform_data {
-+ unsigned num_btns;
-+ const struct gpio_keys_button *btns;
-+ unsigned btn_poll_interval;
-++
-++ bool ubnt_hsr;
-+ };
-+
-+ #endif /* _LINUX_ATH9K_PLATFORM_H */
diff --git a/patches/openwrt/0044-ar71xx-Send-power-to-USB-port-on-WNR2200.patch b/patches/openwrt/0044-ar71xx-Send-power-to-USB-port-on-WNR2200.patch
deleted file mode 100644
index dfccf180cf74e427fa31e4ca8eae0b06a9f519ef..0000000000000000000000000000000000000000
--- a/patches/openwrt/0044-ar71xx-Send-power-to-USB-port-on-WNR2200.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Sun, 29 May 2016 11:37:08 +0200
-Subject: ar71xx: Send power to USB port on WNR2200
-
-This patch fixes ticket #15267 by enabling power on the
-WNR2200's USB port. At present, the USB port on the WNR2200
-is non-functional due to it not receiving power.
-
-This patch defines an additional GPIO pin, but none of the
-current GPIO definitions have been modified.
-
-Signed-off-by: Riley Baird <BM-2cVqnDuYbAU5do2DfJTrN7ZbAJ246S4XiX@bitmessage.ch>
-
-Backport of r47236
-
-diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-wnr2200.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-wnr2200.c
-index 0087cac62087786d45bd5c8b68b2ec2ce3b5715e..5d23f21763cd9f4ddafc97f79ff47e819a18f2a6 100644
---- a/target/linux/ar71xx/files/arch/mips/ath79/mach-wnr2200.c
-+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-wnr2200.c
-@@ -36,7 +36,7 @@
- #define WNR2200_GPIO_LED_LAN4_GREEN 16
- #define WNR2200_GPIO_LED_PWR_AMBER 21
- #define WNR2200_GPIO_LED_PWR_GREEN 22
--
-+#define WNR2200_GPIO_USB_5V 4
- #define WNR2200_GPIO_USB_POWER 24
-
- #define WNR2200_KEYS_POLL_INTERVAL 20 /* msecs */
-@@ -128,9 +128,9 @@ static void __init wnr2200_setup(void)
- wnr2200_leds_gpio);
-
- /* enable power for the USB port */
-- gpio_request_one(WNR2200_GPIO_USB_POWER,
-- GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED,
-- "USB power");
-+ ap9x_pci_setup_wmac_gpio(0,
-+ BIT(WNR2200_GPIO_USB_5V),
-+ BIT(WNR2200_GPIO_USB_5V));
-
- ath79_register_usb();
- }
diff --git a/patches/openwrt/0045-ar71xx-WNR2200-fix-for-random-WLAN-MAC.patch b/patches/openwrt/0045-ar71xx-WNR2200-fix-for-random-WLAN-MAC.patch
deleted file mode 100644
index 7c285574bbe25005ba844baf7ec20c550554ea56..0000000000000000000000000000000000000000
--- a/patches/openwrt/0045-ar71xx-WNR2200-fix-for-random-WLAN-MAC.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Sun, 29 May 2016 11:45:14 +0200
-Subject: ar71xx: WNR2200: fix for random WLAN MAC
-
-Fix for invalid/random/duplicate WLAN MAC address in WNR2200.
-Permanent platform MAC is calculated and assigned during system startup.
-WLAN MAC follows wired Ethernet interface addresses.
-
-Signed-off-by: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
-
-Backport of r49100
-
-diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-wnr2200.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-wnr2200.c
-index 5d23f21763cd9f4ddafc97f79ff47e819a18f2a6..37ffc4c56be33be96c43078117d7b123679378b3 100644
---- a/target/linux/ar71xx/files/arch/mips/ath79/mach-wnr2200.c
-+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-wnr2200.c
-@@ -12,6 +12,7 @@
-
- #include <linux/mtd/mtd.h>
- #include <linux/mtd/partitions.h>
-+#include <linux/kernel.h> /* for max() macro */
-
- #include <asm/mach-ath79/ath79.h>
-
-@@ -45,6 +46,7 @@
- #define WNR2200_MAC0_OFFSET 0
- #define WNR2200_MAC1_OFFSET 6
- #define WNR2200_PCIE_CALDATA_OFFSET 0x1000
-+#define WNR2200_WMAC_OFFSET 0x108c /* wireless MAC is inside ART */
-
- static struct gpio_led wnr2200_leds_gpio[] __initdata = {
- {
-@@ -102,9 +104,40 @@ static struct gpio_led wnr2200_leds_gpio[] __initdata = {
- }
- };
-
-+/*
-+ * For WNR2200 ART flash area used for WLAN MAC is usually empty (0xff)
-+ * so ath9k driver uses random MAC instead each time module is loaded.
-+ * OpenWrt's original fix was to copy eth1 address to WLAN interface.
-+ * New solution does not duplicate hardware addresses and is taken from
-+ * WNR2000v3 code. It assigns permanent WLAN MAC equal to ethN's MAC
-+ * plus 1, so network interfaces get sequential addresses.
-+ * If ART wireless MAC address field has been filled by user, use it.
-+ */
-+static void __init wnr2200_get_wmac(u8 *wmac_gen_addr, int mac0_art_offset,
-+ int mac1_art_offset, int wmac_art_offset)
-+{
-+ u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
-+ u8 *eth0_mac_addr = (u8 *) (art + mac0_art_offset);
-+ u8 *eth1_mac_addr = (u8 *) (art + mac1_art_offset);
-+ u8 *wlan_mac_addr = (u8 *) (art + wmac_art_offset);
-+
-+ /* only 0xff if all bits are set - address is invalid, empty area */
-+ if ((wlan_mac_addr[0] & wlan_mac_addr[1] & wlan_mac_addr[2] &
-+ wlan_mac_addr[3] & wlan_mac_addr[4] & wlan_mac_addr[5]) == 0xff) {
-+ memcpy(wmac_gen_addr, eth0_mac_addr, 5);
-+ wmac_gen_addr[5] = max(eth0_mac_addr[5], eth1_mac_addr[5]) + 1;
-+
-+ /* Avoid potential conflict in case max(0xff,0x00)+1==0x00 */
-+ if (!wmac_gen_addr[5])
-+ wmac_gen_addr[5] = 1;
-+ } else
-+ memcpy(wmac_gen_addr, wlan_mac_addr, 6);
-+}
-+
- static void __init wnr2200_setup(void)
- {
- u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
-+ u8 wlan_mac_addr[6];
-
- ath79_register_mdio(0, 0x0);
-
-@@ -121,8 +154,10 @@ static void __init wnr2200_setup(void)
- ath79_register_eth(1);
-
- ath79_register_m25p80(NULL);
-- ap91_pci_init(art + WNR2200_PCIE_CALDATA_OFFSET,
-- art + WNR2200_MAC1_OFFSET);
-+
-+ wnr2200_get_wmac(wlan_mac_addr, WNR2200_MAC0_OFFSET,
-+ WNR2200_MAC1_OFFSET, WNR2200_WMAC_OFFSET);
-+ ap91_pci_init(art + WNR2200_PCIE_CALDATA_OFFSET, wlan_mac_addr);
-
- ath79_register_leds_gpio(-1, ARRAY_SIZE(wnr2200_leds_gpio),
- wnr2200_leds_gpio);
diff --git a/patches/openwrt/0046-ar71xx-WNR2200-enable-control-of-all-LEDs-and-buttons.patch b/patches/openwrt/0046-ar71xx-WNR2200-enable-control-of-all-LEDs-and-buttons.patch
deleted file mode 100644
index bbaf0fd6ccbf3b75b25148714cbf94f0c97bc6e9..0000000000000000000000000000000000000000
--- a/patches/openwrt/0046-ar71xx-WNR2200-enable-control-of-all-LEDs-and-buttons.patch
+++ /dev/null
@@ -1,251 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Sun, 29 May 2016 11:50:03 +0200
-Subject: ar71xx: WNR2200: enable control of all LEDs and buttons
-
-This patch provides full GPIO support for WNR2200 (LEDs and buttons).
-It exposes all LEDs to operating system, including Ethernet ones.
-
-Signed-off-by: Michal Cieslakiewicz <michal.cieslakiewicz@wp.pl>
-
-Backport of r49101
-
-diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
-index f4d523418c8d59e3c96dbe3d68eedd8d85e33546..b8677960249c1e05703570fdf2be4197bde5cac5 100644
---- a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
-+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
-@@ -600,6 +600,21 @@ wnr2000-v4)
- ucidef_set_led_usbdev "usb" "USB" "netgear:amber:status" "1-1"
- ;;
-
-+wnr2200)
-+ ucidef_set_led_netdev "wan-amber" "WAN (amber)" "netgear:amber:wan" "eth0"
-+ ucidef_set_led_default "wan-green" "WAN (green)" "netgear:green:wan" "0"
-+ ucidef_set_led_netdev "wlan" "WLAN" "netgear:blue:wlan" "wlan0"
-+ ucidef_set_led_switch "lan1green" "LAN1 (green)" "netgear:green:lan1" "switch0" "0x02" "0x04"
-+ ucidef_set_led_switch "lan2green" "LAN2 (green)" "netgear:green:lan2" "switch0" "0x04" "0x04"
-+ ucidef_set_led_switch "lan3green" "LAN3 (green)" "netgear:green:lan3" "switch0" "0x08" "0x04"
-+ ucidef_set_led_switch "lan4green" "LAN4 (green)" "netgear:green:lan4" "switch0" "0x10" "0x04"
-+ ucidef_set_led_switch "lan1amber" "LAN1 (amber)" "netgear:amber:lan1" "switch0" "0x02" "0x02"
-+ ucidef_set_led_switch "lan2amber" "LAN2 (amber)" "netgear:amber:lan2" "switch0" "0x04" "0x02"
-+ ucidef_set_led_switch "lan3amber" "LAN3 (amber)" "netgear:amber:lan3" "switch0" "0x08" "0x02"
-+ ucidef_set_led_switch "lan4amber" "LAN4 (amber)" "netgear:amber:lan4" "switch0" "0x10" "0x02"
-+ ucidef_set_led_usbdev "usb" "USB" "netgear:green:usb" "1-1"
-+ ;;
-+
- wpn824n)
- ucidef_set_led_netdev "wan-amber" "WAN (amber)" "netgear:amber:wan" "eth0"
- ucidef_set_led_wlan "wlan" "WLAN" "netgear:blue:wlan" "phy0tpt"
-diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-wnr2200.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-wnr2200.c
-index 37ffc4c56be33be96c43078117d7b123679378b3..258d254cf4abfc01a4d859f3f464b2a25aeec165 100644
---- a/target/linux/ar71xx/files/arch/mips/ath79/mach-wnr2200.c
-+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-wnr2200.c
-@@ -15,6 +15,8 @@
- #include <linux/kernel.h> /* for max() macro */
-
- #include <asm/mach-ath79/ath79.h>
-+#include <asm/mach-ath79/ar71xx_regs.h> /* needed to disable switch LEDs */
-+#include "common.h" /* needed to disable switch LEDs */
-
- #include "dev-ap9x-pci.h"
- #include "dev-eth.h"
-@@ -24,21 +26,28 @@
- #include "dev-usb.h"
- #include "machtypes.h"
-
-+/* WNR2200 - connected through AR7241 */
- #define WNR2200_GPIO_LED_LAN2_AMBER 0
- #define WNR2200_GPIO_LED_LAN4_AMBER 1
--#define WNR2200_GPIO_LED_WPS 5
--#define WNR2200_GPIO_LED_WAN_GREEN 7
--#define WNR2200_GPIO_LED_USB 8
-+#define WNR2200_GPIO_LED_LAN1_AMBER 6 /* AR724X_GPIO_FUNC_JTAG_DISABLE */
-+#define WNR2200_GPIO_LED_WPS_GREEN 7 /* AR724X_GPIO_FUNC_JTAG_DISABLE */
-+#define WNR2200_GPIO_LED_USB_GREEN 8 /* AR724X_GPIO_FUNC_JTAG_DISABLE */
- #define WNR2200_GPIO_LED_LAN3_AMBER 11
- #define WNR2200_GPIO_LED_WAN_AMBER 12
--#define WNR2200_GPIO_LED_LAN1_GREEN 13
--#define WNR2200_GPIO_LED_LAN2_GREEN 14
--#define WNR2200_GPIO_LED_LAN3_GREEN 15
--#define WNR2200_GPIO_LED_LAN4_GREEN 16
--#define WNR2200_GPIO_LED_PWR_AMBER 21
--#define WNR2200_GPIO_LED_PWR_GREEN 22
--#define WNR2200_GPIO_USB_5V 4
--#define WNR2200_GPIO_USB_POWER 24
-+#define WNR2200_GPIO_LED_LAN1_GREEN 13 /* AR724X_..._ETH_SWITCH_LED0 */
-+#define WNR2200_GPIO_LED_LAN2_GREEN 14 /* AR724X_..._ETH_SWITCH_LED1 */
-+#define WNR2200_GPIO_LED_LAN3_GREEN 15 /* AR724X_..._ETH_SWITCH_LED2 */
-+#define WNR2200_GPIO_LED_LAN4_GREEN 16 /* AR724X_..._ETH_SWITCH_LED3 */
-+#define WNR2200_GPIO_LED_WAN_GREEN 17 /* AR724X_..._ETH_SWITCH_LED4 */
-+
-+/* WNR2200 - connected through AR9287 */
-+#define WNR2200_GPIO_WMAC_LED_WLAN_BLUE 0
-+#define WNR2200_GPIO_WMAC_LED_TEST_AMBER 1
-+#define WNR2200_GPIO_WMAC_LED_POWER_GREEN 2
-+#define WNR2200_GPIO_WMAC_BTN_RFKILL 3
-+#define WNR2200_GPIO_WMAC_USB_5V 4
-+#define WNR2200_GPIO_WMAC_BTN_WPS 5
-+#define WNR2200_GPIO_WMAC_BTN_RESET 6
-
- #define WNR2200_KEYS_POLL_INTERVAL 20 /* msecs */
- #define WNR2200_KEYS_DEBOUNCE_INTERVAL (3 * WNR2200_KEYS_POLL_INTERVAL)
-@@ -50,30 +59,22 @@
-
- static struct gpio_led wnr2200_leds_gpio[] __initdata = {
- {
-- .name = "netgear:amber:lan2",
-- .gpio = WNR2200_GPIO_LED_LAN2_AMBER,
-- .active_low = 1,
-- }, {
-- .name = "netgear:amber:lan4",
-- .gpio = WNR2200_GPIO_LED_LAN4_AMBER,
-- .active_low = 1,
-- }, {
-- .name = "netgear:green:wps",
-- .gpio = WNR2200_GPIO_LED_WPS,
-- .active_low = 1,
-- }, {
-- .name = "netgear:green:wan",
-- .gpio = WNR2200_GPIO_LED_WAN_GREEN,
-+ .name = "netgear:amber:lan1",
-+ .gpio = WNR2200_GPIO_LED_LAN1_AMBER,
- .active_low = 1,
- }, {
-- .name = "netgear:green:usb",
-- .gpio = WNR2200_GPIO_LED_USB,
-+ .name = "netgear:amber:lan2",
-+ .gpio = WNR2200_GPIO_LED_LAN2_AMBER,
- .active_low = 1,
- }, {
- .name = "netgear:amber:lan3",
- .gpio = WNR2200_GPIO_LED_LAN3_AMBER,
- .active_low = 1,
- }, {
-+ .name = "netgear:amber:lan4",
-+ .gpio = WNR2200_GPIO_LED_LAN4_AMBER,
-+ .active_low = 1,
-+ }, {
- .name = "netgear:amber:wan",
- .gpio = WNR2200_GPIO_LED_WAN_AMBER,
- .active_low = 1,
-@@ -94,12 +95,56 @@ static struct gpio_led wnr2200_leds_gpio[] __initdata = {
- .gpio = WNR2200_GPIO_LED_LAN4_GREEN,
- .active_low = 1,
- }, {
-- .name = "netgear:amber:power",
-- .gpio = WNR2200_GPIO_LED_PWR_AMBER,
-+ .name = "netgear:green:usb",
-+ .gpio = WNR2200_GPIO_LED_USB_GREEN,
-+ .active_low = 1,
-+ }, {
-+ .name = "netgear:green:wan",
-+ .gpio = WNR2200_GPIO_LED_WAN_GREEN,
-+ .active_low = 1,
-+ }, {
-+ .name = "netgear:green:wps",
-+ .gpio = WNR2200_GPIO_LED_WPS_GREEN,
-+ .active_low = 1,
-+ }
-+};
-+
-+static const char *wnr2200_wmac_led_name = "netgear:blue:wlan";
-+
-+static struct gpio_led wnr2200_wmac_leds_gpio[] = {
-+ {
-+ .name = "netgear:amber:test",
-+ .gpio = WNR2200_GPIO_WMAC_LED_TEST_AMBER,
- .active_low = 1,
- }, {
- .name = "netgear:green:power",
-- .gpio = WNR2200_GPIO_LED_PWR_GREEN,
-+ .gpio = WNR2200_GPIO_WMAC_LED_POWER_GREEN,
-+ .active_low = 1,
-+ .default_state = LEDS_GPIO_DEFSTATE_ON,
-+ }
-+};
-+
-+static struct gpio_keys_button wnr2200_wmac_keys_gpio[] = {
-+ {
-+ .desc = "reset",
-+ .type = EV_KEY,
-+ .code = KEY_RESTART,
-+ .debounce_interval = WNR2200_KEYS_DEBOUNCE_INTERVAL,
-+ .gpio = WNR2200_GPIO_WMAC_BTN_RESET,
-+ .active_low = 1,
-+ }, {
-+ .desc = "rfkill",
-+ .type = EV_KEY,
-+ .code = KEY_RFKILL,
-+ .debounce_interval = WNR2200_KEYS_DEBOUNCE_INTERVAL,
-+ .gpio = WNR2200_GPIO_WMAC_BTN_RFKILL,
-+ .active_low = 1,
-+ }, {
-+ .desc = "wps",
-+ .type = EV_KEY,
-+ .code = KEY_WPS_BUTTON,
-+ .debounce_interval = WNR2200_KEYS_DEBOUNCE_INTERVAL,
-+ .gpio = WNR2200_GPIO_WMAC_BTN_WPS,
- .active_low = 1,
- }
- };
-@@ -139,14 +184,32 @@ static void __init wnr2200_setup(void)
- u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
- u8 wlan_mac_addr[6];
-
-+ /*
-+ * Disable JTAG to use all AR724X GPIO LEDs. Disable CLKs.
-+ * Allow OS to control all link LEDs.
-+ */
-+ ath79_gpio_function_setup(AR724X_GPIO_FUNC_JTAG_DISABLE |
-+ AR724X_GPIO_FUNC_UART_EN,
-+ AR724X_GPIO_FUNC_CLK_OBS1_EN |
-+ AR724X_GPIO_FUNC_CLK_OBS2_EN |
-+ AR724X_GPIO_FUNC_CLK_OBS3_EN |
-+ AR724X_GPIO_FUNC_CLK_OBS4_EN |
-+ AR724X_GPIO_FUNC_CLK_OBS5_EN |
-+ AR724X_GPIO_FUNC_GE0_MII_CLK_EN |
-+ AR724X_GPIO_FUNC_ETH_SWITCH_LED0_EN |
-+ AR724X_GPIO_FUNC_ETH_SWITCH_LED1_EN |
-+ AR724X_GPIO_FUNC_ETH_SWITCH_LED2_EN |
-+ AR724X_GPIO_FUNC_ETH_SWITCH_LED3_EN |
-+ AR724X_GPIO_FUNC_ETH_SWITCH_LED4_EN);
-+
- ath79_register_mdio(0, 0x0);
-
-- ath79_init_mac(ath79_eth0_data.mac_addr, art+WNR2200_MAC0_OFFSET, 0);
-+ ath79_init_mac(ath79_eth0_data.mac_addr, art + WNR2200_MAC0_OFFSET, 0);
- ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
- ath79_eth0_data.speed = SPEED_100;
- ath79_eth0_data.duplex = DUPLEX_FULL;
-
-- ath79_init_mac(ath79_eth1_data.mac_addr, art+WNR2200_MAC1_OFFSET, 0);
-+ ath79_init_mac(ath79_eth1_data.mac_addr, art + WNR2200_MAC1_OFFSET, 0);
- ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_RMII;
- ath79_eth1_data.phy_mask = 0x10;
-
-@@ -160,12 +223,22 @@ static void __init wnr2200_setup(void)
- ap91_pci_init(art + WNR2200_PCIE_CALDATA_OFFSET, wlan_mac_addr);
-
- ath79_register_leds_gpio(-1, ARRAY_SIZE(wnr2200_leds_gpio),
-- wnr2200_leds_gpio);
-+ wnr2200_leds_gpio);
-+
-+ ap9x_pci_setup_wmac_led_pin(0, WNR2200_GPIO_WMAC_LED_WLAN_BLUE);
-+ ap9x_pci_setup_wmac_led_name(0, wnr2200_wmac_led_name);
-+
-+ ap9x_pci_setup_wmac_leds(0, wnr2200_wmac_leds_gpio,
-+ ARRAY_SIZE(wnr2200_wmac_leds_gpio));
-+
-+ /* All 3 buttons are connected to wireless chip */
-+ ap9x_pci_setup_wmac_btns(0, wnr2200_wmac_keys_gpio,
-+ ARRAY_SIZE(wnr2200_wmac_keys_gpio),
-+ WNR2200_KEYS_POLL_INTERVAL);
-
- /* enable power for the USB port */
-- ap9x_pci_setup_wmac_gpio(0,
-- BIT(WNR2200_GPIO_USB_5V),
-- BIT(WNR2200_GPIO_USB_5V));
-+ ap9x_pci_setup_wmac_gpio(0, BIT(WNR2200_GPIO_WMAC_USB_5V),
-+ BIT(WNR2200_GPIO_WMAC_USB_5V));
-
- ath79_register_usb();
- }
diff --git a/patches/openwrt/0047-ar71xx-add-GL-AR150-support.patch b/patches/openwrt/0047-ar71xx-add-GL-AR150-support.patch
deleted file mode 100644
index 78153021a970fa49dfa20064509166863bc79598..0000000000000000000000000000000000000000
--- a/patches/openwrt/0047-ar71xx-add-GL-AR150-support.patch
+++ /dev/null
@@ -1,326 +0,0 @@
-From: Jan Niehusmann <jan@gondor.com>
-Date: Wed, 15 Jun 2016 14:57:47 +0200
-Subject: ar71xx: add GL-AR150 support
-
-patch from https://github.com/domino-team/OpenWrt-patches
-
-https://raw.githubusercontent.com/domino-team/OpenWrt-patches/master/AR150%2C%20AR300%2C%20Domino%20-%20CC1505/000-gl-ar150-cc.patch
-
-(and fixed indentation in target/linux/ar71xx/base-files/lib/ar71xx.sh)
-
-diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
-index b8677960249c1e05703570fdf2be4197bde5cac5..d81358d6bf9103ffeb2929b06d3ab01efffe931c 100644
---- a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
-+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
-@@ -188,6 +188,10 @@ dlan-pro-1200-ac)
- ucidef_set_led_trigger_gpio "plcr" "dLAN" "devolo:error:dlan" "16" "0"
- ;;
-
-+gl-ar150)
-+ ucidef_set_led_wlan "wlan" "WLAN" "gl_ar150:wlan" "phy0tpt"
-+ ;;
-+
- gl-inet)
- ucidef_set_led_netdev "lan" "LAN" "gl-connect:green:lan" "eth1"
- ucidef_set_led_wlan "wlan" "WLAN" "gl-connect:red:wlan" "phy0tpt"
-diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
-index b59844eac49a1269edb88890d89b0b4d8a7121d0..ac3deb8aa2ed4717e2bd682cb4ffd7d32c50134f 100755
---- a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
-+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
-@@ -383,6 +383,7 @@ dir-505-a1)
- alfa-ap96 |\
- alfa-nx |\
- ap83 |\
-+gl-ar150 |\
- gl-inet |\
- jwap003 |\
- pb42 |\
-diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
-index aded7ad117ffa1c1347c6f457c210d60b8e4df58..f242980b3e401f2e9de2b8abe7e984b24a71db5a 100755
---- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
-+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
-@@ -503,6 +503,9 @@ ar71xx_board_detect() {
- name="gl-inet"
- gl_inet_board_detect
- ;;
-+ *"GL AR150")
-+ name="gl-ar150"
-+ ;;
- *"EnGenius EPG5000")
- name="epg5000"
- ;;
-diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
-index 0228f14774d5873a52f19b60ed84389c7be86e51..d816f211891d6a259930f2781574504ea62b4e16 100755
---- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
-+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
-@@ -216,6 +216,7 @@ platform_check_image() {
- dlan-pro-500-wp | \
- dlan-pro-1200-ac | \
- dragino2 | \
-+ gl-ar150 | \
- epg5000 | \
- esr1750 | \
- esr900 | \
-diff --git a/target/linux/ar71xx/config-3.18 b/target/linux/ar71xx/config-3.18
-index a068cc5768aed6f29a67de27d24f00dc57e0695a..d4d92738d0ab010e1d43ebed0baef34fd9bc3f9d 100644
---- a/target/linux/ar71xx/config-3.18
-+++ b/target/linux/ar71xx/config-3.18
-@@ -70,6 +70,7 @@ CONFIG_ATH79_MACH_ESR1750=y
- CONFIG_ATH79_MACH_ESR900=y
- CONFIG_ATH79_MACH_EW_DORIN=y
- CONFIG_ATH79_MACH_F9K1115V2=y
-+CONFIG_ATH79_MACH_GL_AR150=y
- CONFIG_ATH79_MACH_GL_INET=y
- CONFIG_ATH79_MACH_GS_MINIBOX_V1=y
- CONFIG_ATH79_MACH_GS_OOLITE=y
-diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-ar150.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-ar150.c
-new file mode 100644
-index 0000000000000000000000000000000000000000..310182cc8e9c22e2bfcb168996d4f01d117dc103
---- /dev/null
-+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-gl-ar150.c
-@@ -0,0 +1,125 @@
-+/*
-+ * GL_ar150 board support
-+ *
-+ * Copyright (C) 2011 dongyuqi <729650915@qq.com>
-+ * Copyright (C) 2011-2012 Gabor Juhos <juhosg@openwrt.org>
-+ * Copyright (C) 2013 alzhao <alzhao@gmail.com>
-+ * Copyright (C) 2014 Michel Stempin <michel.stempin@wanadoo.fr>
-+ *
-+ * This program is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 as published
-+ * by the Free Software Foundation.
-+*/
-+
-+#include <linux/gpio.h>
-+
-+#include <asm/mach-ath79/ath79.h>
-+
-+#include "dev-eth.h"
-+#include "dev-gpio-buttons.h"
-+#include "dev-leds-gpio.h"
-+#include "dev-m25p80.h"
-+#include "dev-usb.h"
-+#include "dev-wmac.h"
-+#include "machtypes.h"
-+
-+#define GL_AR150_GPIO_LED_WLAN 0
-+#define GL_AR150_GPIO_LED_LAN 13
-+#define GL_AR150_GPIO_LED_WAN 15
-+
-+#define GL_AR150_GPIO_BIN_USB 6
-+#define GL_AR150_GPIO_BTN_MANUAL 7
-+#define GL_AR150_GPIO_BTN_AUTO 8
-+#define GL_AR150_GPIO_BTN_RESET 11
-+
-+#define GL_AR150_KEYS_POLL_INTERVAL 20 /* msecs */
-+#define GL_AR150_KEYS_DEBOUNCE_INTERVAL (3 * GL_AR150_KEYS_POLL_INTERVAL)
-+
-+#define GL_AR150_MAC0_OFFSET 0x0000
-+#define GL_AR150_MAC1_OFFSET 0x0000
-+#define GL_AR150_CALDATA_OFFSET 0x1000
-+#define GL_AR150_WMAC_MAC_OFFSET 0x0000
-+
-+static struct gpio_led gl_ar150_leds_gpio[] __initdata = {
-+ {
-+ .name = "gl_ar150:wlan",
-+ .gpio = GL_AR150_GPIO_LED_WLAN,
-+ .active_low = 0,
-+ },
-+ {
-+ .name = "gl_ar150:lan",
-+ .gpio = GL_AR150_GPIO_LED_LAN,
-+ .active_low = 0,
-+ },
-+ {
-+ .name = "gl_ar150:wan",
-+ .gpio = GL_AR150_GPIO_LED_WAN,
-+ .active_low = 0,
-+ .default_state = 1,
-+ },
-+};
-+
-+static struct gpio_keys_button gl_ar150_gpio_keys[] __initdata = {
-+ {
-+ .desc = "BTN_7",
-+ .type = EV_KEY,
-+ .code = BTN_7,
-+ .debounce_interval = GL_AR150_KEYS_DEBOUNCE_INTERVAL,
-+ .gpio = GL_AR150_GPIO_BTN_MANUAL,
-+ .active_low = 0,
-+ },
-+ {
-+ .desc = "BTN_8",
-+ .type = EV_KEY,
-+ .code = BTN_8,
-+ .debounce_interval = GL_AR150_KEYS_DEBOUNCE_INTERVAL,
-+ .gpio = GL_AR150_GPIO_BTN_AUTO,
-+ .active_low = 0,
-+ },
-+ {
-+ .desc = "reset",
-+ .type = EV_KEY,
-+ .code = KEY_RESTART,
-+ .debounce_interval = GL_AR150_KEYS_DEBOUNCE_INTERVAL,
-+ .gpio = GL_AR150_GPIO_BTN_RESET,
-+ .active_low = 0,
-+ },
-+};
-+
-+static void __init gl_ar150_setup(void)
-+{
-+
-+ /* ART base address */
-+ u8 *art = (u8 *) KSEG1ADDR(0x1fff0000);
-+
-+ /* disable PHY_SWAP and PHY_ADDR_SWAP bits */
-+ ath79_setup_ar933x_phy4_switch(false, false);
-+
-+ /* register flash. */
-+ ath79_register_m25p80(NULL);
-+
-+ /* register gpio LEDs and keys */
-+ ath79_register_leds_gpio(-1, ARRAY_SIZE(gl_ar150_leds_gpio),
-+ gl_ar150_leds_gpio);
-+ ath79_register_gpio_keys_polled(-1, GL_AR150_KEYS_POLL_INTERVAL,
-+ ARRAY_SIZE(gl_ar150_gpio_keys),
-+ gl_ar150_gpio_keys);
-+
-+ /* enable usb */
-+ gpio_request_one(GL_AR150_GPIO_BIN_USB,
-+ GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED,
-+ "USB power");
-+ ath79_register_usb();
-+
-+ /* register eth0 as WAN, eth1 as LAN */
-+ ath79_init_mac(ath79_eth0_data.mac_addr, art+GL_AR150_MAC0_OFFSET, 0);
-+ ath79_init_mac(ath79_eth1_data.mac_addr, art+GL_AR150_MAC1_OFFSET, 0);
-+ ath79_register_mdio(0, 0x0);
-+ ath79_register_eth(0);
-+ ath79_register_eth(1);
-+
-+ /* register wireless mac with cal data */
-+ ath79_register_wmac(art + GL_AR150_CALDATA_OFFSET, art + GL_AR150_WMAC_MAC_OFFSET);
-+}
-+
-+MIPS_MACHINE(ATH79_MACH_GL_AR150, "GL-AR150", "GL AR150",gl_ar150_setup);
-diff --git a/target/linux/ar71xx/generic/profiles/gl-connect.mk b/target/linux/ar71xx/generic/profiles/gl-connect.mk
-deleted file mode 100644
-index e9377dbbfa042f790f15817313c24b2700617f37..0000000000000000000000000000000000000000
---- a/target/linux/ar71xx/generic/profiles/gl-connect.mk
-+++ /dev/null
-@@ -1,17 +0,0 @@
--#
--# Copyright (C) 2014 OpenWrt.org
--#
--# This is free software, licensed under the GNU General Public License v2.
--# See /LICENSE for more information.
--#
--
--define Profile/GLINET
-- NAME:=GL.iNet
-- PACKAGES:=kmod-usb-core kmod-usb2
--endef
--
--define Profile/GLINET/Description
-- Package set optimized for the GL-Connect GL.iNet v1.
--endef
--
--$(eval $(call Profile,GLINET))
-diff --git a/target/linux/ar71xx/generic/profiles/gli.mk b/target/linux/ar71xx/generic/profiles/gli.mk
-new file mode 100644
-index 0000000000000000000000000000000000000000..a6ad661666a168a591319e74ef211277f8617fca
---- /dev/null
-+++ b/target/linux/ar71xx/generic/profiles/gli.mk
-@@ -0,0 +1,27 @@
-+#
-+# Copyright (C) 2013 OpenWrt.org
-+#
-+# This is free software, licensed under the GNU General Public License v2.
-+# See /LICENSE for more information.
-+#
-+define Profile/GLINET
-+ NAME:=GL.iNet 6416
-+ PACKAGES:=kmod-usb-core kmod-usb2
-+endef
-+
-+define Profile/GLINET/Description
-+ Package set optimized for the GL-Connect GL.iNet v1.
-+endef
-+
-+$(eval $(call Profile,GLINET))
-+
-+define Profile/GL-AR150
-+ NAME:=GL AR150
-+ PACKAGES:=kmod-usb-core kmod-usb2
-+endef
-+
-+define Profile/GL-AR150/Description
-+ Configuration of GL AR150.
-+endef
-+
-+$(eval $(call Profile,GL-AR150))
-diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
-index 7c648f26e10c49000b848e9b300701b388410c04..05eea0b16c362ba5f70c9f435dbe312087b319c2 100644
---- a/target/linux/ar71xx/image/Makefile
-+++ b/target/linux/ar71xx/image/Makefile
-@@ -144,6 +144,14 @@ define Device/weio
- endef
- TARGET_DEVICES += weio
-
-+define Device/gl-ar150
-+ BOARDNAME = GL-AR150
-+ IMAGE_SIZE = 16000k
-+ CONSOLE = ttyATH0,115200
-+ MTDPARTS = spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,16000k(firmware),64k(art)ro
-+endef
-+TARGET_DEVICES += gl-ar150
-+
- define Device/wndr3700
- BOARDNAME = WNDR3700
- NETGEAR_KERNEL_MAGIC = 0x33373030
-diff --git a/target/linux/ar71xx/patches-3.18/911-MIPS-ath79-add-gl_ar150.patch b/target/linux/ar71xx/patches-3.18/911-MIPS-ath79-add-gl_ar150.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..31db5816caf5dc8076ceec349884cf9a47b2fc68
---- /dev/null
-+++ b/target/linux/ar71xx/patches-3.18/911-MIPS-ath79-add-gl_ar150.patch
-@@ -0,0 +1,39 @@
-+--- a/arch/mips/ath79/Kconfig
-++++ b/arch/mips/ath79/Kconfig
-+@@ -533,6 +533,16 @@ config ATH79_MACH_GL_INET
-+ select ATH79_DEV_USB
-+ select ATH79_DEV_WMAC
-+
-++config ATH79_MACH_GL_AR150
-++ bool "GL AR150 support"
-++ select SOC_AR933X
-++ select ATH79_DEV_ETH
-++ select ATH79_DEV_GPIO_BUTTONS
-++ select ATH79_DEV_LEDS_GPIO
-++ select ATH79_DEV_M25P80
-++ select ATH79_DEV_USB
-++ select ATH79_DEV_WMAC
-++
-+ config ATH79_MACH_EAP300V2
-+ bool "EnGenius EAP300 v2 support"
-+ select SOC_AR934X
-+--- a/arch/mips/ath79/Makefile
-++++ b/arch/mips/ath79/Makefile
-+@@ -78,6 +78,7 @@ obj-$(CONFIG_ATH79_MACH_EL_MINI) += mach
-+ obj-$(CONFIG_ATH79_MACH_EPG5000) += mach-epg5000.o
-+ obj-$(CONFIG_ATH79_MACH_ESR1750) += mach-esr1750.o
-+ obj-$(CONFIG_ATH79_MACH_F9K1115V2) += mach-f9k1115v2.o
-++obj-$(CONFIG_ATH79_MACH_GL_AR150) += mach-gl-ar150.o
-+ obj-$(CONFIG_ATH79_MACH_GL_INET) += mach-gl-inet.o
-+ obj-$(CONFIG_ATH79_MACH_GS_MINIBOX_V1) += mach-gs-minibox-v1.o
-+ obj-$(CONFIG_ATH79_MACH_GS_OOLITE) += mach-gs-oolite.o
-+--- a/arch/mips/ath79/machtypes.h
-++++ b/arch/mips/ath79/machtypes.h
-+@@ -67,6 +67,7 @@ enum ath79_mach_type {
-+ ATH79_MACH_ESR1750, /* EnGenius ESR1750 */
-+ ATH79_MACH_EPG5000, /* EnGenius EPG5000 */
-+ ATH79_MACH_F9K1115V2, /* Belkin AC1750DB */
-++ ATH79_MACH_GL_AR150, /* GL-AR150 support */
-+ ATH79_MACH_GL_INET, /* GL-CONNECT GL-INET */
-+ ATH79_MACH_GS_MINIBOX_V1, /* Gainstrong MiniBox V1.0 */
-+ ATH79_MACH_GS_OOLITE, /* GS OOLITE V1.0 */
diff --git a/patches/openwrt/0048-build-don-t-add-j-for-parallel-builds-with-Make-4.2.patch b/patches/openwrt/0048-build-don-t-add-j-for-parallel-builds-with-Make-4.2.patch
deleted file mode 100644
index 5efb7e7080c2aa68b8085fa47e7b8b9a3186e7cc..0000000000000000000000000000000000000000
--- a/patches/openwrt/0048-build-don-t-add-j-for-parallel-builds-with-Make-4.2.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Wed, 15 Jun 2016 19:31:34 +0200
-Subject: build: don't add -j for parallel builds with Make 4.2+
-
-Make usually passes -j and jobserver arguments as part of MAKEFLAGS. LEDE
-removes MAKEFLAGS to have better control of the build, and re-adds the
-jobserver arguments with -j to the Make commandline where desired.
-
-Make 4.2+ behave differently with these arguments passed on the commandline
-than in MAKEFLAGS: -j will override the jobserver argument and the job
-count will be unlimited.
-
-Moving the flags to MAKEFLAGS will need many packages to be changed and
-tested; therefore, we opt for a less invasive change for now and just
-remove -j for Make 4.2+, as the jobserver argument alone is enough to
-enable parallel builds for these Make versions.
-
-Signed-off-by: Jo-Philipp Wich <jo@mein.io>
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-Backport of LEDE 6fb212f2933bbbdf2935124205717c9d0ca72b32
-
-diff --git a/include/host-build.mk b/include/host-build.mk
-index e2b5f2f8d1882207e11697df3df1302076adfaa3..44401b866a4d637648bb093470a5e66b4a3e38fc 100644
---- a/include/host-build.mk
-+++ b/include/host-build.mk
-@@ -10,7 +10,7 @@ HOST_INSTALL_DIR ?= $(HOST_BUILD_DIR)/host-install
- HOST_BUILD_PARALLEL ?=
-
- ifneq ($(CONFIG_PKG_BUILD_USE_JOBSERVER),)
-- HOST_MAKE_J:=$(if $(MAKE_JOBSERVER),$(MAKE_JOBSERVER) -j)
-+ HOST_MAKE_J:=$(if $(MAKE_JOBSERVER),$(MAKE_JOBSERVER) $(if $(filter 3.% 4.0 4.1,$(MAKE_VERSION)),-j))
- else
- HOST_MAKE_J:=-j$(CONFIG_PKG_BUILD_JOBS)
- endif
-diff --git a/include/package.mk b/include/package.mk
-index c69d92819779dd0ee92381620accd73ef2b80de6..a99cdc6990280d7ef83223861cd9f224c6eebc33 100644
---- a/include/package.mk
-+++ b/include/package.mk
-@@ -23,7 +23,7 @@ PKG_RELRO_PARTIAL ?= 1
- PKG_RELRO_FULL ?= 1
-
- ifneq ($(CONFIG_PKG_BUILD_USE_JOBSERVER),)
-- MAKE_J:=$(if $(MAKE_JOBSERVER),$(MAKE_JOBSERVER) -j)
-+ MAKE_J:=$(if $(MAKE_JOBSERVER),$(MAKE_JOBSERVER) $(if $(filter 3.% 4.0 4.1,$(MAKE_VERSION)),-j))
- else
- MAKE_J:=-j$(CONFIG_PKG_BUILD_JOBS)
- endif
diff --git a/patches/openwrt/0049-tools-cmake-fix-parallel-build-with-Make-4.2.patch b/patches/openwrt/0049-tools-cmake-fix-parallel-build-with-Make-4.2.patch
deleted file mode 100644
index a8535ea042add124d46358da50f352900cbe4fad..0000000000000000000000000000000000000000
--- a/patches/openwrt/0049-tools-cmake-fix-parallel-build-with-Make-4.2.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Wed, 15 Jun 2016 19:31:49 +0200
-Subject: tools/cmake: fix parallel build with Make 4.2+
-
-Avoid using the --parallel argument to the CMake bootstrap, as that doesn't
-allow us to remove the -j argument. Instead, pass the HOST_JOBS arguments
-in MAKEFLAGS.
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-Backport of LEDE 96db10752483cb07f822686482b44be6c21fbb5f
-
-diff --git a/tools/cmake/Makefile b/tools/cmake/Makefile
-index 08e2b028150dd4f496e3a8ebccf27bd49b6937c2..6c211def540a6a41012349d5979b919481e1bcec 100644
---- a/tools/cmake/Makefile
-+++ b/tools/cmake/Makefile
-@@ -18,10 +18,11 @@ HOST_CONFIGURE_PARALLEL:=1
-
- include $(INCLUDE_DIR)/host-build.mk
-
-+HOST_CONFIGURE_CMD := MAKEFLAGS="$(HOST_JOBS)" $(BASH) ./configure
-+
- HOST_CONFIGURE_VARS :=
-
- HOST_CONFIGURE_ARGS := \
-- --prefix=$(STAGING_DIR_HOST) \
-- $(if $(MAKE_JOBSERVER),--parallel="$(MAKE_JOBSERVER)")
-+ --prefix=$(STAGING_DIR_HOST)
-
- $(eval $(call HostBuild))
diff --git a/patches/openwrt/0050-linux-make-IPv6-builtin-if-selected-saves-30KB.patch b/patches/openwrt/0050-linux-make-IPv6-builtin-if-selected-saves-30KB.patch
deleted file mode 100644
index 19ba4f3202b2ab52f4057ce7cb7e0ce83b27111a..0000000000000000000000000000000000000000
--- a/patches/openwrt/0050-linux-make-IPv6-builtin-if-selected-saves-30KB.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Thu, 16 Jun 2016 00:51:07 +0200
-Subject: linux: make IPv6 builtin if selected (saves >30KB)
-
-Signed-off-by: Steven Barth <steven@midlink.org>
-
-Backport of OpenWrt r46834
-
-kmod-ipv6 is added to the PROVIDES of the kernel package, so we don't have
-to adjust all packages depending on kmod-ipv6.
-
-diff --git a/config/Config-build.in b/config/Config-build.in
-index 4674d8403539a3b209d709342ab71a6e6ff79de2..cd50290f812f73bc6886a789a456956fa4fb1e42 100644
---- a/config/Config-build.in
-+++ b/config/Config-build.in
-@@ -83,7 +83,7 @@ menu "Global build settings"
- prompt "Enable IPv6 support in packages"
- default y
- help
-- Enable IPv6 support in packages (passes --enable-ipv6 to configure scripts).
-+ Enables IPv6 support in kernel (builtin) and packages.
-
- config PKG_BUILD_PARALLEL
- bool
-diff --git a/package/kernel/linux/Makefile b/package/kernel/linux/Makefile
-index 45ca9faa923eb1a1db97d94d0406a46223c59a8f..b06c49a92fd396e8edcb0ca7a7a94b74b05a87e0 100644
---- a/package/kernel/linux/Makefile
-+++ b/package/kernel/linux/Makefile
-@@ -49,6 +49,7 @@ define Package/kernel
- TITLE:=Virtual kernel package
- VERSION:=$(LINUX_VERSION)-$(LINUX_RELEASE)-$(LINUX_VERMAGIC)
- URL:=http://www.kernel.org/
-+ PROVIDES:=$(if $(CONFIG_IPV6),kmod-ipv6)
- endef
-
- define Package/kernel/install
-diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk
-index cea8e47a65b5283640a17ed6c311bd87c70373b2..8a2760d8a4a429f206eba41a8c83432e5b6ddab7 100644
---- a/package/kernel/linux/modules/netsupport.mk
-+++ b/package/kernel/linux/modules/netsupport.mk
-@@ -439,7 +439,7 @@ $(eval $(call KernelPackage,iptunnel4))
- define KernelPackage/iptunnel6
- SUBMENU:=$(NETWORK_SUPPORT_MENU)
- TITLE:=IPv6 tunneling
-- DEPENDS:= +kmod-ipv6
-+ DEPENDS:=@IPV6
- KCONFIG:= \
- CONFIG_INET6_TUNNEL
- FILES:=$(LINUX_DIR)/net/ipv6/tunnel6.ko
-@@ -456,15 +456,16 @@ $(eval $(call KernelPackage,iptunnel6))
- define KernelPackage/ipv6
- SUBMENU:=$(NETWORK_SUPPORT_MENU)
- TITLE:=IPv6 support
-+ DEPENDS:=@IPV6
-+ HIDDEN:=1
-+ DEFAULT:=y
- KCONFIG:= \
-- CONFIG_IPV6 \
-+ CONFIG_IPV6=y \
- CONFIG_IPV6_PRIVACY=y \
- CONFIG_IPV6_MULTIPLE_TABLES=y \
- CONFIG_IPV6_MROUTE=y \
- CONFIG_IPV6_PIMSM_V2=n \
- CONFIG_IPV6_SUBTREES=y
-- FILES:=$(LINUX_DIR)/net/ipv6/ipv6.ko
-- AUTOLOAD:=$(call AutoLoad,20,ipv6)
- endef
-
- define KernelPackage/ipv6/description
-@@ -476,7 +477,7 @@ $(eval $(call KernelPackage,ipv6))
-
- define KernelPackage/sit
- SUBMENU:=$(NETWORK_SUPPORT_MENU)
-- DEPENDS:=+kmod-ipv6 +kmod-iptunnel +kmod-iptunnel4
-+ DEPENDS:=@IPV6 +kmod-iptunnel +kmod-iptunnel4
- TITLE:=IPv6-in-IPv4 tunnel
- KCONFIG:=CONFIG_IPV6_SIT \
- CONFIG_IPV6_SIT_6RD=y
-@@ -494,7 +495,7 @@ $(eval $(call KernelPackage,sit))
- define KernelPackage/ip6-tunnel
- SUBMENU:=$(NETWORK_SUPPORT_MENU)
- TITLE:=IP-in-IPv6 tunnelling
-- DEPENDS:= +kmod-ipv6 +kmod-iptunnel6
-+ DEPENDS:=@IPV6 +kmod-iptunnel6
- KCONFIG:= CONFIG_IPV6_TUNNEL
- FILES:=$(LINUX_DIR)/net/ipv6/ip6_tunnel.ko
- AUTOLOAD:=$(call AutoLoad,32,ip6_tunnel)
-@@ -510,7 +511,7 @@ $(eval $(call KernelPackage,ip6-tunnel))
- define KernelPackage/gre
- SUBMENU:=$(NETWORK_SUPPORT_MENU)
- TITLE:=GRE support
-- DEPENDS:=+PACKAGE_kmod-ipv6:kmod-ipv6 +kmod-iptunnel
-+ DEPENDS:=+kmod-iptunnel
- KCONFIG:=CONFIG_NET_IPGRE CONFIG_NET_IPGRE_DEMUX
- FILES:=$(LINUX_DIR)/net/ipv4/ip_gre.ko $(LINUX_DIR)/net/ipv4/gre.ko
- AUTOLOAD:=$(call AutoLoad,39,gre ip_gre)
-@@ -526,7 +527,7 @@ $(eval $(call KernelPackage,gre))
- define KernelPackage/gre6
- SUBMENU:=$(NETWORK_SUPPORT_MENU)
- TITLE:=GRE support over IPV6
-- DEPENDS:=+kmod-ipv6 +kmod-iptunnel +kmod-ip6-tunnel
-+ DEPENDS:=@IPV6 +kmod-iptunnel +kmod-ip6-tunnel
- KCONFIG:=CONFIG_IPV6_GRE
- FILES:=$(LINUX_DIR)/net/ipv6/ip6_gre.ko
- AUTOLOAD:=$(call AutoLoad,39,ip6_gre)
-@@ -862,7 +863,6 @@ define KernelPackage/l2tp
- SUBMENU:=$(NETWORK_SUPPORT_MENU)
- TITLE:=Layer Two Tunneling Protocol (L2TP)
- DEPENDS:= \
-- +IPV6:kmod-ipv6 \
- +kmod-udptunnel4 \
- +IPV6:kmod-udptunnel6
- KCONFIG:=CONFIG_L2TP \
-@@ -898,7 +898,7 @@ $(eval $(call KernelPackage,l2tp-eth))
- define KernelPackage/l2tp-ip
- SUBMENU:=$(NETWORK_SUPPORT_MENU)
- TITLE:=L2TP IP encapsulation for L2TPv3
-- DEPENDS:=+kmod-l2tp +IPV6:kmod-ipv6
-+ DEPENDS:=+kmod-l2tp
- KCONFIG:=CONFIG_L2TP_IP
- FILES:= \
- $(LINUX_DIR)/net/l2tp/l2tp_ip.ko \
-@@ -930,7 +930,7 @@ define KernelPackage/sctp
- CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5=y
- FILES:= $(LINUX_DIR)/net/sctp/sctp.ko
- AUTOLOAD:= $(call AutoLoad,32,sctp)
-- DEPENDS:=+kmod-lib-crc32c +kmod-crypto-md5 +kmod-crypto-hmac +IPV6:kmod-ipv6
-+ DEPENDS:=+kmod-lib-crc32c +kmod-crypto-md5 +kmod-crypto-hmac
- endef
-
- define KernelPackage/sctp/description
-diff --git a/package/network/services/dnsmasq/Makefile b/package/network/services/dnsmasq/Makefile
-index 19a8df9009da7fee967b84f65248470db3b34150..8fd51fe8748082b072710b718300a706832b25be 100644
---- a/package/network/services/dnsmasq/Makefile
-+++ b/package/network/services/dnsmasq/Makefile
-@@ -52,7 +52,6 @@ define Package/dnsmasq-full
- $(call Package/dnsmasq/Default)
- TITLE += (with DNSSEC, DHCPv6, Auth DNS, IPset enabled by default)
- DEPENDS:=+PACKAGE_dnsmasq_full_dnssec:libnettle \
-- +PACKAGE_dnsmasq_full_dhcpv6:kmod-ipv6 \
- +PACKAGE_dnsmasq_full_ipset:kmod-ipt-ipset
- VARIANT:=full
- endef
diff --git a/patches/openwrt/0051-package-ipkg.mk-fix-Provides-for-packages-with-multiple-PROVIDES-entries.patch b/patches/openwrt/0051-package-ipkg.mk-fix-Provides-for-packages-with-multiple-PROVIDES-entries.patch
deleted file mode 100644
index 14c058b2bee1b2ea779d2c7e7a3f040ea69834a8..0000000000000000000000000000000000000000
--- a/patches/openwrt/0051-package-ipkg.mk-fix-Provides-for-packages-with-multiple-PROVIDES-entries.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Thu, 16 Jun 2016 04:28:44 +0200
-Subject: package-ipkg.mk: fix Provides for packages with multiple PROVIDES entries
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-Backport of LEDE 3ee6c17cd14ec1fed0b0491542c499c03fc6d211
-
-diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk
-index eb4c874047e8a9e24a4d77b13f7ba66e1221cbb5..1830d644c36fa3dad342d3283529a18b8d70a377 100644
---- a/include/package-ipkg.mk
-+++ b/include/package-ipkg.mk
-@@ -154,7 +154,7 @@ Package: $(1)
- Version: $(VERSION)
- $$(call addfield,Depends,$$(Package/$(1)/DEPENDS)
- )$$(call addfield,Conflicts,$$(call mergelist,$(CONFLICTS))
--)$$(call addfield,Provides,$(PROVIDES)
-+)$$(call addfield,Provides,$$(call mergelist,$(PROVIDES))
- )$$(call addfield,Source,$(SOURCE)
- )$$(call addfield,License,$$(PKG_LICENSE)
- )$$(call addfield,LicenseFiles,$$(PKG_LICENSE_FILES)
diff --git a/patches/openwrt/0052-kernel-remove-packaging-of-kmod-crypto-core-and-kmod-crypto-arc4.patch b/patches/openwrt/0052-kernel-remove-packaging-of-kmod-crypto-core-and-kmod-crypto-arc4.patch
deleted file mode 100644
index cc03f5fbabbc6cf38d4d0320ff47681f17c8b94a..0000000000000000000000000000000000000000
--- a/patches/openwrt/0052-kernel-remove-packaging-of-kmod-crypto-core-and-kmod-crypto-arc4.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Thu, 16 Jun 2016 03:42:03 +0200
-Subject: kernel: remove packaging of kmod-crypto-core and kmod-crypto-arc4
-
-Everything except for blkcipher was already built-in, so make blkcipher
-built-in as well.
-
-Signed-off-by: Felix Fietkau <nbd@openwrt.org>
-
-Backport of OpenWrt r46820
-
-The packages kmod-crypto-{core,arc4} are added to kernel PROVIDES to
-satisfy dependencies of CC packages.
-
-diff --git a/package/kernel/linux/Makefile b/package/kernel/linux/Makefile
-index b06c49a92fd396e8edcb0ca7a7a94b74b05a87e0..19bcbd582ba06cb8cdb9ee869c50a67dbfd470bb 100644
---- a/package/kernel/linux/Makefile
-+++ b/package/kernel/linux/Makefile
-@@ -49,7 +49,7 @@ define Package/kernel
- TITLE:=Virtual kernel package
- VERSION:=$(LINUX_VERSION)-$(LINUX_RELEASE)-$(LINUX_VERMAGIC)
- URL:=http://www.kernel.org/
-- PROVIDES:=$(if $(CONFIG_IPV6),kmod-ipv6)
-+ PROVIDES:=kmod-crypto-core kmod-crypto-arc4 $(if $(CONFIG_IPV6),kmod-ipv6)
- endef
-
- define Package/kernel/install
-diff --git a/package/kernel/linux/modules/crypto.mk b/package/kernel/linux/modules/crypto.mk
-index c8e0fbb04397c9b1fa7ebde3579f663b5d756e1b..926dab0e3379efbc92aeac865b02673928c18644 100644
---- a/package/kernel/linux/modules/crypto.mk
-+++ b/package/kernel/linux/modules/crypto.mk
-@@ -15,24 +15,9 @@ crypto_confvar=CONFIG_CRYPTO_$(word 1,$(subst =,$(space),$(1)))
- crypto_file=$(LINUX_DIR)/crypto/$(word 2,$(subst =,$(space),$(1))).ko
- crypto_name=$(if $(findstring y,$($(call crypto_confvar,$(1)))),,$(word 2,$(subst =,$(space),$(1))))
-
--define KernelPackage/crypto-core
-- SUBMENU:=$(CRYPTO_MENU)
-- TITLE:=Core CryptoAPI modules
-- KCONFIG:= \
-- CONFIG_CRYPTO=y \
-- CONFIG_CRYPTO_HW=y \
-- CONFIG_CRYPTO_BLKCIPHER \
-- CONFIG_CRYPTO_ALGAPI \
-- $(foreach mod,$(CRYPTO_MODULES),$(call crypto_confvar,$(mod)))
-- FILES:=$(foreach mod,$(CRYPTO_MODULES),$(call crypto_file,$(mod)))
--endef
--
--$(eval $(call KernelPackage,crypto-core))
--
--
- define AddDepends/crypto
- SUBMENU:=$(CRYPTO_MENU)
-- DEPENDS+=+kmod-crypto-core $(1)
-+ DEPENDS+= $(1)
- endef
-
- define KernelPackage/crypto-aead
-@@ -272,17 +257,6 @@ endif
- $(eval $(call KernelPackage,crypto-aes))
-
-
--define KernelPackage/crypto-arc4
-- TITLE:=ARC4 (RC4) cipher CryptoAPI module
-- KCONFIG:=CONFIG_CRYPTO_ARC4
-- FILES:=$(LINUX_DIR)/crypto/arc4.ko
-- AUTOLOAD:=$(call AutoLoad,09,arc4)
-- $(call AddDepends/crypto)
--endef
--
--$(eval $(call KernelPackage,crypto-arc4))
--
--
- define KernelPackage/crypto-authenc
- TITLE:=Combined mode wrapper for IPsec
- DEPENDS:=+kmod-crypto-manager
-diff --git a/package/kernel/linux/modules/fs.mk b/package/kernel/linux/modules/fs.mk
-index fa182375ea8b0224753141620bd168328194ddf4..cc87a45961d04d93badce575530495f994deee86 100644
---- a/package/kernel/linux/modules/fs.mk
-+++ b/package/kernel/linux/modules/fs.mk
-@@ -91,7 +91,6 @@ define KernelPackage/fs-cifs
- AUTOLOAD:=$(call AutoLoad,30,cifs)
- $(call AddDepends/nls)
- DEPENDS+= \
-- +kmod-crypto-arc4 \
- +kmod-crypto-hmac \
- +kmod-crypto-md5 \
- +kmod-crypto-md4 \
-diff --git a/package/kernel/linux/modules/netsupport.mk b/package/kernel/linux/modules/netsupport.mk
-index 8a2760d8a4a429f206eba41a8c83432e5b6ddab7..ab76946d2ab30e748ea5bc69c24051dbfc411036 100644
---- a/package/kernel/linux/modules/netsupport.mk
-+++ b/package/kernel/linux/modules/netsupport.mk
-@@ -714,7 +714,7 @@ $(eval $(call KernelPackage,ipoa))
- define KernelPackage/mppe
- SUBMENU:=$(NETWORK_SUPPORT_MENU)
- TITLE:=Microsoft PPP compression/encryption
-- DEPENDS:=kmod-ppp +kmod-crypto-core +kmod-crypto-arc4 +kmod-crypto-sha1 +kmod-crypto-ecb
-+ DEPENDS:=kmod-ppp +kmod-crypto-sha1 +kmod-crypto-ecb
- KCONFIG:= \
- CONFIG_PPP_MPPE_MPPC \
- CONFIG_PPP_MPPE
-@@ -998,7 +998,7 @@ define KernelPackage/rxrpc
- $(LINUX_DIR)/net/rxrpc/af-rxrpc.ko \
- $(LINUX_DIR)/net/rxrpc/rxkad.ko
- AUTOLOAD:=$(call AutoLoad,30,rxkad af-rxrpc)
-- DEPENDS:=+kmod-crypto-core +kmod-crypto-manager +kmod-crypto-pcbc +kmod-crypto-fcrypt
-+ DEPENDS:= +kmod-crypto-manager +kmod-crypto-pcbc +kmod-crypto-fcrypt
- endef
-
- define KernelPackage/rxrpc/description
-diff --git a/target/linux/generic/config-3.18 b/target/linux/generic/config-3.18
-index 6038692b7e81334e4864d30453f734f4fe829aa0..a0dc3c9b607abe32c1ca021b7fad293a8f742ec1 100644
---- a/target/linux/generic/config-3.18
-+++ b/target/linux/generic/config-3.18
-@@ -700,9 +700,10 @@ CONFIG_CRYPTO_ALGAPI=y
- CONFIG_CRYPTO_ALGAPI2=y
- # CONFIG_CRYPTO_ANSI_CPRNG is not set
- # CONFIG_CRYPTO_ANUBIS is not set
--# CONFIG_CRYPTO_ARC4 is not set
-+CONFIG_CRYPTO_ARC4=y
- # CONFIG_CRYPTO_AUTHENC is not set
--# CONFIG_CRYPTO_BLKCIPHER is not set
-+CONFIG_CRYPTO_BLKCIPHER=y
-+CONFIG_CRYPTO_BLKCIPHER2=y
- # CONFIG_CRYPTO_BLOWFISH is not set
- # CONFIG_CRYPTO_CAMELLIA is not set
- # CONFIG_CRYPTO_CAST5 is not set
-diff --git a/target/linux/omap/config-3.18 b/target/linux/omap/config-3.18
-index a06a350a37c035c66ec8d6242f28379e7992685e..d5003c275b2b2a167d4614f5e33269941a02173e 100644
---- a/target/linux/omap/config-3.18
-+++ b/target/linux/omap/config-3.18
-@@ -114,9 +114,6 @@ CONFIG_CPU_V7=y
- CONFIG_CRC16=y
- CONFIG_CRYPTO_AEAD=m
- CONFIG_CRYPTO_AEAD2=m
--CONFIG_CRYPTO_ARC4=m
--CONFIG_CRYPTO_BLKCIPHER=m
--CONFIG_CRYPTO_BLKCIPHER2=m
- CONFIG_CRYPTO_CCM=m
- CONFIG_CRYPTO_CRC32C=y
- CONFIG_CRYPTO_CTR=m
-diff --git a/target/linux/sunxi/config-3.18 b/target/linux/sunxi/config-3.18
-index ddc3f7acb82064fb3be16f5111b0c4344b01c362..57651bbd65ebc61b14d45aefaaf20e5b8d59e27a 100644
---- a/target/linux/sunxi/config-3.18
-+++ b/target/linux/sunxi/config-3.18
-@@ -110,9 +110,6 @@ CONFIG_CPU_TLB_V7=y
- CONFIG_CPU_V7=y
- CONFIG_CRC16=y
- CONFIG_CRC_T10DIF=y
--CONFIG_CRYPTO_ARC4=y
--CONFIG_CRYPTO_BLKCIPHER=y
--CONFIG_CRYPTO_BLKCIPHER2=y
- CONFIG_CRYPTO_CRC32C=y
- CONFIG_CRYPTO_CRCT10DIF=y
- CONFIG_CRYPTO_DES=y
diff --git a/patches/openwrt/0053-x86-stop-relying-on-hexdump-for-image-build-signature.patch b/patches/openwrt/0053-x86-stop-relying-on-hexdump-for-image-build-signature.patch
deleted file mode 100644
index 6a2790e2f26e7d9699b797a1e39014b147a9464f..0000000000000000000000000000000000000000
--- a/patches/openwrt/0053-x86-stop-relying-on-hexdump-for-image-build-signature.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Sun, 3 Jul 2016 19:15:49 +0200
-Subject: x86: stop relying on hexdump for image build signature
-
-Use perl to generate random number instead.
-See https://github.com/freifunk-gluon/gluon/issues/811
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
-
-Backport of LEDE d5ee23ee275fcd6550b0051de59706cc928cdac8
-
-diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile
-index e7e02f15fbb3d1638b26982e7ddff305464e6851..6f64eba398e34093308b766839e69780512a4ca8 100644
---- a/target/linux/x86/image/Makefile
-+++ b/target/linux/x86/image/Makefile
-@@ -40,7 +40,7 @@ ifneq ($(GRUB_TERMINALS),)
- GRUB_TERMINAL_CONFIG := terminal_input $(GRUB_TERMINALS); terminal_output $(GRUB_TERMINALS)
- endif
-
--SIGNATURE:=$(shell dd if=/dev/urandom bs=4 count=1 2>/dev/null | hexdump -v -e '"%08x"')
-+SIGNATURE:=$(shell perl -e 'printf("%08x", rand(0xFFFFFFFF))')
- ROOTPART:=$(call qstrip,$(CONFIG_TARGET_ROOTFS_PARTNAME))
- ROOTPART:=$(if $(ROOTPART),$(ROOTPART),PARTUUID=$(SIGNATURE)-02)
-
diff --git a/patches/openwrt/0054-mt76-fix-build-with-kernel-3.18.patch b/patches/openwrt/0054-mt76-fix-build-with-kernel-3.18.patch
deleted file mode 100644
index 44683c010ce1e99d016deb5d014123fc3a7afa30..0000000000000000000000000000000000000000
--- a/patches/openwrt/0054-mt76-fix-build-with-kernel-3.18.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Thu, 30 Jun 2016 21:52:02 +0200
-Subject: mt76: fix build with kernel 3.18
-
-diff --git a/package/kernel/mac80211/patches/945-netdev_alloc_frag.patch b/package/kernel/mac80211/patches/945-netdev_alloc_frag.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..ea389cd85cb15c7ecb20a1e0c934fcf8b58c0eda
---- /dev/null
-+++ b/package/kernel/mac80211/patches/945-netdev_alloc_frag.patch
-@@ -0,0 +1,11 @@
-+--- a/backport-include/linux/netdevice.h
-++++ b/backport-include/linux/netdevice.h
-+@@ -233,7 +233,7 @@ static inline void backport_unregister_n
-+ #endif
-+
-+ #if LINUX_VERSION_CODE < KERNEL_VERSION(3,19,0)
-+-#define napi_alloc_frag(fragsz) netdev_alloc_frag(fragsz)
-++#define napi_alloc_frag netdev_alloc_frag
-+ #endif
-+
-+ /*
-diff --git a/package/kernel/mt76/Makefile b/package/kernel/mt76/Makefile
-index bd851e61910c9a57ca45a570855ca22329c9ae4b..989ba0c2e8d10f6e7bb8fbd31e7181efff19be7c 100644
---- a/package/kernel/mt76/Makefile
-+++ b/package/kernel/mt76/Makefile
-@@ -24,7 +24,7 @@ include $(INCLUDE_DIR)/package.mk
- define KernelPackage/mt76
- SUBMENU:=Wireless Drivers
- TITLE:=MediaTek MT76x2/MT7603 wireless driver
-- DEPENDS:=+kmod-mac80211 +@DRIVER_11N_SUPPORT @PCI_SUPPORT @!LINUX_3_18
-+ DEPENDS:=+kmod-mac80211 +@DRIVER_11N_SUPPORT @PCI_SUPPORT
- FILES:=\
- $(PKG_BUILD_DIR)/mt76.ko \
- $(PKG_BUILD_DIR)/mt76x2e.ko \
diff --git a/patches/openwrt/0055-ramips-Support-LEDs-on-D-Link-DIR-860L-B1.patch b/patches/openwrt/0055-ramips-Support-LEDs-on-D-Link-DIR-860L-B1.patch
deleted file mode 100644
index d8b870748b85bd1bc4622d91e7db5657df2e1155..0000000000000000000000000000000000000000
--- a/patches/openwrt/0055-ramips-Support-LEDs-on-D-Link-DIR-860L-B1.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Thu, 30 Jun 2016 15:34:32 +0200
-Subject: ramips: Support LEDs on D-Link DIR-860L B1
-
-Adds the required gpio definitions.
-
-Signed-off-by: Johannes Wienke <languitar@semipol.de>
-
-Backport of OpenWrt r48715
-
-diff --git a/target/linux/ramips/dts/DIR-860L-B1.dts b/target/linux/ramips/dts/DIR-860L-B1.dts
-index 23ec1140bc89fa06aa2920bc43efc8bb7465fb42..2582b3d4182d3a0fcee6e6ea6f97ab8007edf3a2 100644
---- a/target/linux/ramips/dts/DIR-860L-B1.dts
-+++ b/target/linux/ramips/dts/DIR-860L-B1.dts
-@@ -97,6 +97,26 @@
-
- gpio-leds {
- compatible = "gpio-leds";
-+
-+ power {
-+ label = "d-link:orange:power";
-+ gpios = <&gpio0 13 1>;
-+ };
-+
-+ power2 {
-+ label = "d-link:green:power";
-+ gpios = <&gpio0 15 1>;
-+ };
-+
-+ net {
-+ label = "d-link:orange:net";
-+ gpios = <&gpio0 14 1>;
-+ };
-+
-+ net2 {
-+ label = "d-link:green:net";
-+ gpios = <&gpio0 16 1>;
-+ };
- };
-
- gpio-keys-polled {
diff --git a/patches/openwrt/0056-ramips-add-button-support-and-make-LEDs-known-to-userspace-for-DIR-860L-B1.patch b/patches/openwrt/0056-ramips-add-button-support-and-make-LEDs-known-to-userspace-for-DIR-860L-B1.patch
deleted file mode 100644
index 5de381df572bb1bc03cd8a334fc87df5fb52ba37..0000000000000000000000000000000000000000
--- a/patches/openwrt/0056-ramips-add-button-support-and-make-LEDs-known-to-userspace-for-DIR-860L-B1.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Thu, 30 Jun 2016 15:18:03 +0200
-Subject: ramips: add button support and make LEDs known to userspace for DIR-860L B1
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/target/linux/ramips/base-files/etc/board.d/01_leds b/target/linux/ramips/base-files/etc/board.d/01_leds
-index 5327d006299ed94c645542f687e20962c83e842d..5fb28a52f7632bf09e7f62ff77dcd7254a2ebcc2 100755
---- a/target/linux/ramips/base-files/etc/board.d/01_leds
-+++ b/target/linux/ramips/base-files/etc/board.d/01_leds
-@@ -114,6 +114,9 @@ case $board in
- esr-9753)
- set_wifi_led "rt2800pci-phy0::radio"
- ;;
-+ dir-860l-b1)
-+ ucidef_set_led_netdev "wan" "wan" "d-link:green:net" "eth0.2"
-+ ;;
- ex2700)
- ucidef_set_led_default "power_r" "POWER (red)" "ex2700:red:power" "0"
- set_wifi_led "ex2700:green:router"
-diff --git a/target/linux/ramips/base-files/etc/diag.sh b/target/linux/ramips/base-files/etc/diag.sh
-index 6474ebdde354b51648fcafd426e3256f0b6fe8b4..37360a417cb24eaedef24766510db7146c92e3cb 100644
---- a/target/linux/ramips/base-files/etc/diag.sh
-+++ b/target/linux/ramips/base-files/etc/diag.sh
-@@ -54,6 +54,9 @@ get_status_led() {
- dir-645)
- status_led="d-link:green:wps"
- ;;
-+ dir-860l-b1)
-+ status_led="d-link:green:power"
-+ ;;
- dap-1350)
- status_led="d-link:blue:power"
- ;;
-diff --git a/target/linux/ramips/dts/DIR-860L-B1.dts b/target/linux/ramips/dts/DIR-860L-B1.dts
-index 2582b3d4182d3a0fcee6e6ea6f97ab8007edf3a2..c0bcc86216cf4bd343b688aa7e717b5c45775c50 100644
---- a/target/linux/ramips/dts/DIR-860L-B1.dts
-+++ b/target/linux/ramips/dts/DIR-860L-B1.dts
-@@ -124,5 +124,17 @@
- #address-cells = <1>;
- #size-cells = <0>;
- poll-interval = <20>;
-+
-+ reset {
-+ label = "reset";
-+ gpios = <&gpio0 7 1>;
-+ linux,code = <0x198>;
-+ };
-+
-+ wps {
-+ label = "wps";
-+ gpios = <&gpio0 18 1>;
-+ linux,code = <0x211>;
-+ };
- };
- };
diff --git a/patches/openwrt/0057-ramips-set-correct-LAN-WAN-MAC-addresses-on-DIR-860L-B1.patch b/patches/openwrt/0057-ramips-set-correct-LAN-WAN-MAC-addresses-on-DIR-860L-B1.patch
deleted file mode 100644
index 12d1f6dd6813efdb0e2668b5fff2a719b318cb64..0000000000000000000000000000000000000000
--- a/patches/openwrt/0057-ramips-set-correct-LAN-WAN-MAC-addresses-on-DIR-860L-B1.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Thu, 30 Jun 2016 16:16:30 +0200
-Subject: ramips: set correct LAN/WAN MAC addresses on DIR-860L B1
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/target/linux/ramips/base-files/etc/board.d/02_network b/target/linux/ramips/base-files/etc/board.d/02_network
-index a78912dbc9b5ecdc8a9fb0c583c1e47fdb579015..4e6e507625adf8c706e2311ee121769cadb2aeaf 100755
---- a/target/linux/ramips/base-files/etc/board.d/02_network
-+++ b/target/linux/ramips/base-files/etc/board.d/02_network
-@@ -346,6 +346,11 @@ ramips_setup_macs()
- wan_mac=$(mtd_get_mac_ascii nvram wanmac)
- ;;
-
-+ dir-860l-b1)
-+ lan_mac=$(mtd_get_mac_ascii factory lanmac)
-+ wan_mac=$(mtd_get_mac_ascii factory wanmac)
-+ ;;
-+
- e1700)
- wan_mac=$(mtd_get_mac_ascii config WAN_MAC_ADDR)
- ;;
diff --git a/patches/openwrt/0058-ar71xx-add-support-for-TP-LINK-TL-WR842N-ND-v3.patch b/patches/openwrt/0058-ar71xx-add-support-for-TP-LINK-TL-WR842N-ND-v3.patch
deleted file mode 100644
index e95381056b6e14d9eafef30b54661e633a2dab24..0000000000000000000000000000000000000000
--- a/patches/openwrt/0058-ar71xx-add-support-for-TP-LINK-TL-WR842N-ND-v3.patch
+++ /dev/null
@@ -1,323 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Sun, 3 Jul 2016 22:14:18 +0200
-Subject: ar71xx: add support for TP-LINK TL-WR842N/ND v3
-
-- CPU QCA9531-BL3A
-- RAM: 64MB
-- flash: 16MB
-- USB
-
-AP143 platform, similar to tl-wr841n v10/v11, but with USB
-
-Signed-off-by: Cezary Jackiewicz <cezary@eko.one.pl>
-
-Backport of LEDE 0b45bec22c59cc6e6b2fa71dc9a88386c5587132
-
-diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh
-index cb92349cab833179a87a195b94e2539cc5ce3e79..2c5d6af8f4e2c5ce71adc0b63d32b8506e01b6a2 100644
---- a/target/linux/ar71xx/base-files/etc/diag.sh
-+++ b/target/linux/ar71xx/base-files/etc/diag.sh
-@@ -280,6 +280,7 @@ get_status_led() {
- tl-wr841n-v11 | \
- tl-wa830re-v2 | \
- tl-wr842n-v2 | \
-+ tl-wr842n-v3 | \
- tl-wr941nd | \
- tl-wr941nd-v5)
- status_led="tp-link:green:system"
-diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
-index d81358d6bf9103ffeb2929b06d3ab01efffe931c..14aa7bc5e56c0d7be435ba3a1803416075eccb58 100644
---- a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
-+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
-@@ -523,6 +523,16 @@ tl-wr842n-v2)
- ucidef_set_led_usbdev "usb" "USB" "tp-link:green:3g" "1-1"
- ;;
-
-+tl-wr842n-v3)
-+ ucidef_set_led_netdev "wan" "WAN" "tp-link:green:wan" "eth1"
-+ ucidef_set_led_switch "lan1" "LAN1" "tp-link:green:lan1" "switch0" "0x10"
-+ ucidef_set_led_switch "lan2" "LAN2" "tp-link:green:lan2" "switch0" "0x08"
-+ ucidef_set_led_switch "lan3" "LAN3" "tp-link:green:lan3" "switch0" "0x04"
-+ ucidef_set_led_switch "lan4" "LAN4" "tp-link:green:lan4" "switch0" "0x02"
-+ ucidef_set_led_wlan "wlan" "WLAN" "tp-link:green:wlan" "phy0tpt"
-+ ucidef_set_led_usbdev "usb" "USB" "tp-link:green:3g" "1-1"
-+ ;;
-+
- tl-wa801nd-v2 | \
- tl-wa901nd-v3)
- ucidef_set_led_netdev "lan" "LAN" "tp-link:green:lan" "eth0"
-diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
-index ac3deb8aa2ed4717e2bd682cb4ffd7d32c50134f..ca9c5771d72681557f4139c0e58f4d7a656bd741 100755
---- a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
-+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
-@@ -449,6 +449,7 @@ tl-wr741nd-v4 |\
- tl-wr841n-v7 |\
- tl-wr841n-v9 |\
- tl-wr841n-v11 |\
-+tl-wr842n-v3 |\
- whr-g301n |\
- whr-hp-g300n |\
- whr-hp-gn |\
-diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
-index f242980b3e401f2e9de2b8abe7e984b24a71db5a..fcd0bc35227de9b6a02c10c1bebf2413bdc555bf 100755
---- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
-+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
-@@ -869,6 +869,9 @@ ar71xx_board_detect() {
- *"TL-WR842N/ND v2")
- name="tl-wr842n-v2"
- ;;
-+ *"TL-WR842N/ND v3")
-+ name="tl-wr842n-v3"
-+ ;;
- *TL-WR941ND)
- name="tl-wr941nd"
- ;;
-diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
-index d816f211891d6a259930f2781574504ea62b4e16..53284df5e2da19d8012361e9560244af898d3c2c 100755
---- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
-+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
-@@ -367,6 +367,7 @@ platform_check_image() {
- tl-wr841n-v9 | \
- tl-wr841n-v11 | \
- tl-wr842n-v2 | \
-+ tl-wr842n-v3 | \
- tl-wr941nd | \
- tl-wr941nd-v5 | \
- tl-wr941nd-v6 | \
-diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr841n-v9.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr841n-v9.c
-index 004f71961396cd33cfd381aca386706104a7b757..ebaed15a49113133f59f069325898a00f5612fef 100644
---- a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr841n-v9.c
-+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr841n-v9.c
-@@ -1,9 +1,16 @@
- /*
-+<<<<<<< HEAD
- * TP-LINK TL-WR841N/ND v9/v11
- *
- * Copyright (C) 2014 Matthias Schiffer <mschiffer@universe-factory.net>
- * Copyright (C) 2016 Cezary Jackiewicz <cezary@eko.one.pl>
- * Copyright (C) 2016 Stijn Segers <francesco.borromini@gmail.com>
-+=======
-+ * TP-LINK TL-WR841N/ND v9/TL-WR842N/ND v3
-+ *
-+ * Copyright (C) 2014 Matthias Schiffer <mschiffer@universe-factory.net>
-+ * Copyright (C) 2016 Cezary Jackiewicz <cezary@eko.one.pl>
-+>>>>>>> ar71xx: add support for TP-LINK TL-WR842N/ND v3
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published
-@@ -49,6 +56,20 @@
- #define TL_WR841NV11_GPIO_BTN_RESET 12
- #define TL_WR841NV11_GPIO_BTN_WIFI 17
-
-+#define TL_WR842NV3_GPIO_LED_SYSTEM 2
-+#define TL_WR842NV3_GPIO_LED_WLAN 3
-+#define TL_WR842NV3_GPIO_LED_WAN_RED 4
-+#define TL_WR842NV3_GPIO_LED_WAN_GREEN 11
-+#define TL_WR842NV3_GPIO_LED_LAN1 12
-+#define TL_WR842NV3_GPIO_LED_LAN2 13
-+#define TL_WR842NV3_GPIO_LED_LAN3 14
-+#define TL_WR842NV3_GPIO_LED_LAN4 15
-+#define TL_WR842NV3_GPIO_LED_3G 16
-+#define TL_WR842NV3_GPIO_LED_WPS 17
-+
-+#define TL_WR842NV3_GPIO_BTN_RESET 1
-+#define TL_WR842NV3_GPIO_BTN_WIFI 0
-+
- #define TL_WR841NV9_KEYS_POLL_INTERVAL 20 /* msecs */
- #define TL_WR841NV9_KEYS_DEBOUNCE_INTERVAL (3 * TL_WR841NV9_KEYS_POLL_INTERVAL)
-
-@@ -151,6 +172,68 @@ static struct gpio_led tl_wr841n_v11_leds_gpio[] __initdata = {
- },
- };
-
-+static struct gpio_led tl_wr842n_v3_leds_gpio[] __initdata = {
-+ {
-+ .name = "tp-link:green:lan1",
-+ .gpio = TL_WR842NV3_GPIO_LED_LAN1,
-+ .active_low = 1,
-+ }, {
-+ .name = "tp-link:green:lan2",
-+ .gpio = TL_WR842NV3_GPIO_LED_LAN2,
-+ .active_low = 1,
-+ }, {
-+ .name = "tp-link:green:lan3",
-+ .gpio = TL_WR842NV3_GPIO_LED_LAN3,
-+ .active_low = 1,
-+ }, {
-+ .name = "tp-link:green:lan4",
-+ .gpio = TL_WR842NV3_GPIO_LED_LAN4,
-+ .active_low = 1,
-+ }, {
-+ .name = "tp-link:green:wan",
-+ .gpio = TL_WR842NV3_GPIO_LED_WAN_GREEN,
-+ .active_low = 1,
-+ }, {
-+ .name = "tp-link:red:wan",
-+ .gpio = TL_WR842NV3_GPIO_LED_WAN_RED,
-+ .active_low = 1,
-+ }, {
-+ .name = "tp-link:green:wlan",
-+ .gpio = TL_WR842NV3_GPIO_LED_WLAN,
-+ .active_low = 1,
-+ }, {
-+ .name = "tp-link:green:system",
-+ .gpio = TL_WR842NV3_GPIO_LED_SYSTEM,
-+ .active_low = 1,
-+ }, {
-+ .name = "tp-link:green:3g",
-+ .gpio = TL_WR842NV3_GPIO_LED_3G,
-+ .active_low = 1,
-+ }, {
-+ .name = "tp-link:green:wps",
-+ .gpio = TL_WR842NV3_GPIO_LED_WPS,
-+ .active_low = 1,
-+ },
-+};
-+
-+static struct gpio_keys_button tl_wr842n_v3_gpio_keys[] __initdata = {
-+ {
-+ .desc = "Reset button",
-+ .type = EV_KEY,
-+ .code = KEY_RESTART,
-+ .debounce_interval = TL_WR841NV9_KEYS_DEBOUNCE_INTERVAL,
-+ .gpio = TL_WR842NV3_GPIO_BTN_RESET,
-+ .active_low = 1,
-+ }, {
-+ .desc = "WIFI button",
-+ .type = EV_KEY,
-+ .code = KEY_RFKILL,
-+ .debounce_interval = TL_WR841NV9_KEYS_DEBOUNCE_INTERVAL,
-+ .gpio = TL_WR842NV3_GPIO_BTN_WIFI,
-+ .active_low = 1,
-+ }
-+};
-+
- static void __init tl_ap143_setup(void)
- {
- u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
-@@ -212,3 +295,20 @@ static void __init tl_wr841n_v11_setup(void)
-
- MIPS_MACHINE(ATH79_MACH_TL_WR841N_V11, "TL-WR841N-v11", "TP-LINK TL-WR841N/ND v11",
- tl_wr841n_v11_setup);
-+
-+static void __init tl_wr842n_v3_setup(void)
-+{
-+ tl_ap143_setup();
-+
-+ ath79_register_leds_gpio(-1, ARRAY_SIZE(tl_wr842n_v3_leds_gpio),
-+ tl_wr842n_v3_leds_gpio);
-+
-+ ath79_register_gpio_keys_polled(1, TL_WR841NV9_KEYS_POLL_INTERVAL,
-+ ARRAY_SIZE(tl_wr842n_v3_gpio_keys),
-+ tl_wr842n_v3_gpio_keys);
-+
-+ ath79_register_usb();
-+}
-+
-+MIPS_MACHINE(ATH79_MACH_TL_WR842N_V3, "TL-WR842N-v3", "TP-LINK TL-WR842N/ND v3",
-+ tl_wr842n_v3_setup);
-diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
-index 05eea0b16c362ba5f70c9f435dbe312087b319c2..d66bd25fe01544224a69e3f35f020f2e4130c8b3 100644
---- a/target/linux/ar71xx/image/Makefile
-+++ b/target/linux/ar71xx/image/Makefile
-@@ -607,6 +607,13 @@ define Device/tl-wr842n-v2
- TPLINK_HWID := 0x8420002
- endef
-
-+define Device/tl-wr842n-v3
-+ $(Device/tplink-16mlzma)
-+ BOARDNAME := TL-WR842N-v3
-+ DEVICE_PROFILE := TLWR842
-+ TPLINK_HWID := 0x08420003
-+endef
-+
- define Device/tl-wr843nd-v1
- $(Device/tplink-4mlzma)
- BOARDNAME := TL-WR841N-v8
-@@ -620,7 +627,7 @@ define Device/tl-wr847n-v8
- DEVICE_PROFILE := TLWR841
- TPLINK_HWID := 0x08470008
- endef
--TARGET_DEVICES += tl-wr841n-v8 tl-wr841n-v9 tl-wr841n-v10 tl-wr841n-v11 tl-wr842n-v2 tl-wr843nd-v1 tl-wr847n-v8
-+TARGET_DEVICES += tl-wr841n-v8 tl-wr841n-v9 tl-wr841n-v10 tl-wr841n-v11 tl-wr842n-v2 tl-wr842n-v3 tl-wr843nd-v1 tl-wr847n-v8
-
- define Device/tl-wr941nd-v5
- $(Device/tplink-4mlzma)
-diff --git a/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch b/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch
-index debde6e6a552e71b551d8c01ba06af03013407bf..d4b417bfb78606ddb84076ad8c927952e65118c2 100644
---- a/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch
-+++ b/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch
-@@ -1,6 +1,6 @@
- --- a/arch/mips/ath79/machtypes.h
- +++ b/arch/mips/ath79/machtypes.h
--@@ -16,22 +16,202 @@
-+@@ -16,22 +16,203 @@
-
- enum ath79_mach_type {
- ATH79_MACH_GENERIC = 0,
-@@ -148,6 +148,7 @@
- + ATH79_MACH_TL_WR841N_V9, /* TP-LINK TL-WR841N/ND v9 */
- + ATH79_MACH_TL_WR841N_V11, /* TP-LINK TL-WR841N/ND v11 */
- + ATH79_MACH_TL_WR842N_V2, /* TP-LINK TL-WR842N/ND v2 */
-++ ATH79_MACH_TL_WR842N_V3, /* TP-LINK TL-WR842N/ND v3 */
- + ATH79_MACH_TL_WR941ND, /* TP-LINK TL-WR941ND */
- + ATH79_MACH_TL_WR941ND_V5, /* TP-LINK TL-WR941ND v5 */
- + ATH79_MACH_TL_WR941ND_V6, /* TP-LINK TL-WR941ND v6 */
-@@ -285,7 +286,7 @@
- config ATH79_MACH_AP121
- bool "Atheros AP121 reference board"
- select SOC_AR933X
--@@ -11,62 +84,1050 @@ config ATH79_MACH_AP121
-+@@ -11,62 +84,1051 @@ config ATH79_MACH_AP121
- select ATH79_DEV_M25P80
- select ATH79_DEV_USB
- select ATH79_DEV_WMAC
-@@ -1236,13 +1237,14 @@
- + select ATH79_DEV_WMAC
- +
- +config ATH79_MACH_TL_WR841N_V9
--+ bool "TP-LINK TL-WR841N/ND v9 support"
--+ select SOC_QCA953X
--+ select ATH79_DEV_ETH
--+ select ATH79_DEV_GPIO_BUTTONS
--+ select ATH79_DEV_LEDS_GPIO
--+ select ATH79_DEV_M25P80
--+ select ATH79_DEV_WMAC
-++ bool "TP-LINK TL-WR841N/ND v9/TL-WR842N/ND v3 support"
-++ select SOC_QCA953X
-++ select ATH79_DEV_ETH
-++ select ATH79_DEV_GPIO_BUTTONS
-++ select ATH79_DEV_LEDS_GPIO
-++ select ATH79_DEV_M25P80
-++ select ATH79_DEV_USB
-++ select ATH79_DEV_WMAC
- +
- +config ATH79_MACH_TL_WR941ND
- + bool "TP-LINK TL-WR941ND support"
-@@ -1365,7 +1367,7 @@
-
- config ATH79_MACH_UBNT_XM
- bool "Ubiquiti Networks XM/UniFi boards"
--@@ -83,6 +1144,117 @@ config ATH79_MACH_UBNT_XM
-+@@ -83,6 +1145,117 @@ config ATH79_MACH_UBNT_XM
- Say 'Y' here if you want your kernel to support the
- Ubiquiti Networks XM (rev 1.0) board.
-
-@@ -1483,7 +1485,7 @@
- endmenu
-
- config SOC_AR71XX
--@@ -124,7 +1296,10 @@ config ATH79_DEV_DSA
-+@@ -124,7 +1297,10 @@ config ATH79_DEV_DSA
- config ATH79_DEV_ETH
- def_bool n
-
-@@ -1495,7 +1497,7 @@
- def_bool n
-
- config ATH79_DEV_GPIO_BUTTONS
--@@ -154,6 +1329,11 @@ config ATH79_PCI_ATH9K_FIXUP
-+@@ -154,6 +1330,11 @@ config ATH79_PCI_ATH9K_FIXUP
- def_bool n
-
- config ATH79_ROUTERBOOT
diff --git a/patches/openwrt/0059-x86-generic-enable-CONFIG_SATA_VIA.patch b/patches/openwrt/0059-x86-generic-enable-CONFIG_SATA_VIA.patch
deleted file mode 100644
index 2498e2730da16a9f9f657391672fd3ba68ec37d2..0000000000000000000000000000000000000000
--- a/patches/openwrt/0059-x86-generic-enable-CONFIG_SATA_VIA.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From: Florian Klink <flokli@flokli.de>
-Date: Mon, 18 Jul 2016 13:53:25 +0200
-Subject: x86/generic: enable CONFIG_SATA_VIA
-
-This enables support for VIA SATA.
-
-diff --git a/target/linux/x86/generic/config-default b/target/linux/x86/generic/config-default
-index 9e963bf725b222dc94792dc8760f6f747cfffb78..4fc513154bd566319d77e6e42622ef362baeb094 100644
---- a/target/linux/x86/generic/config-default
-+++ b/target/linux/x86/generic/config-default
-@@ -174,6 +174,7 @@ CONFIG_PNP_DEBUG_MESSAGES=y
- CONFIG_RAS=y
- # CONFIG_SAMSUNG_Q10 is not set
- CONFIG_SATA_AHCI=y
-+CONFIG_SATA_VIA=y
- # CONFIG_SCx200_ACB is not set
- # CONFIG_SERIAL_8250_FINTEK is not set
- CONFIG_SERIAL_8250_PNP=y
diff --git a/patches/openwrt/0060-libpcap-fix-dependency-of-install-shared-so-make-target.patch b/patches/openwrt/0060-libpcap-fix-dependency-of-install-shared-so-make-target.patch
deleted file mode 100644
index dca302d71b220c0833b1b5b1846afcd70c316ea7..0000000000000000000000000000000000000000
--- a/patches/openwrt/0060-libpcap-fix-dependency-of-install-shared-so-make-target.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Thu, 21 Jul 2016 17:45:26 +0200
-Subject: libpcap: fix dependency of install-shared-so make target
-
-There seems to be a situation in which a rebuild of libpcap.so is triggered
-in the install step of the libpcap Makefile. libpcap.so is the wrong
-target, leading to the build failure reported in [1].
-
-Fix the dependency of install-shared-so to $(SHAREDLIB) so the build can
-succeed in this case.
-
-[1] https://dev.openwrt.org/ticket/19894
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-Backport of LEDE b82c8ddf8c15e91d6eecfd6d237606a4ce1f756f
-
-diff --git a/package/libs/libpcap/patches/100-debian_shared_lib.patch b/package/libs/libpcap/patches/100-debian_shared_lib.patch
-index b294e51576f9b9f363fa0143bd0945f03f9d13cd..f8df7f3636cb62845930843a4b208fe4e91a54f2 100644
---- a/package/libs/libpcap/patches/100-debian_shared_lib.patch
-+++ b/package/libs/libpcap/patches/100-debian_shared_lib.patch
-@@ -97,7 +97,7 @@ build a shared library.
-
- +grammar_pic.o: grammar.c
- + @rm -f $@
--+ $(CC) -fPIC $(FULL_CFLAGS) -Dyylval=pcap_lval -o $@ -c grammar.c
-++ $(CC) -fPIC $(FULL_CFLAGS) -Dyylval=pcap_lval -o $@ -c grammar.c
- +
- version.o: version.c
- $(CC) $(FULL_CFLAGS) -c version.c
-@@ -118,8 +118,12 @@ build a shared library.
- #
- # Generate the pcap-config script.
- #
--@@ -618,11 +652,9 @@ install-shared: install-shared-$(DYEXT)
-- install-shared-so: libpcap.so
-+@@ -615,14 +649,12 @@ install: install-shared install-archive
-+ $(DESTDIR)$(mandir)/man@MAN_MISC_INFO@/`echo $$i | sed 's/.manmisc.in/.@MAN_MISC_INFO@/'`; done
-+
-+ install-shared: install-shared-$(DYEXT)
-+-install-shared-so: libpcap.so
-++install-shared-so: $(SHAREDLIB)
- [ -d $(DESTDIR)$(libdir) ] || \
- (mkdir -p $(DESTDIR)$(libdir); chmod 755 $(DESTDIR)$(libdir))
- - VER=`cat $(srcdir)/VERSION`; \
diff --git a/patches/openwrt/0061-ar71xx-add-revision-detection-for-D-Link-DIR-505-A1-A2.patch b/patches/openwrt/0061-ar71xx-add-revision-detection-for-D-Link-DIR-505-A1-A2.patch
deleted file mode 100644
index 7b331209ac4a6e634e3ce01c0e9ee08e29f0f0f3..0000000000000000000000000000000000000000
--- a/patches/openwrt/0061-ar71xx-add-revision-detection-for-D-Link-DIR-505-A1-A2.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Thu, 28 Jul 2016 15:43:25 +0200
-Subject: ar71xx: add revision detection for D-Link DIR-505 A1/A2
-
-The A1 image also works on the A2, correctly set AR71XX_MODEL in this case.
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-Backport of LEDE 500a67a167a256002f8ab05171f49dfb86b03260
-
-diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
-index fcd0bc35227de9b6a02c10c1bebf2413bdc555bf..20250e96fdcc1783f9b6818c340425206c67016f 100755
---- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
-+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
-@@ -107,6 +107,15 @@ cybertan_get_hw_magic() {
- dd bs=8 count=1 skip=0 if=$part 2>/dev/null | hexdump -v -n 8 -e '1/1 "%02x"'
- }
-
-+dir505_board_detect() {
-+ local dev=$(find_mtd_part 'mac')
-+ [ -z "$dev" ] && return
-+
-+ # The revision is stored at the beginning of the "mac" partition
-+ local rev="$(LC_CTYPE=C awk -v 'FS=[^[:print:]]' '{print $1; exit}' $dev)"
-+ AR71XX_MODEL="D-Link DIR-505 rev. $rev"
-+}
-+
- tplink_get_hwid() {
- local part
-
-@@ -453,6 +462,7 @@ ar71xx_board_detect() {
- ;;
- *"DIR-505 rev. A1")
- name="dir-505-a1"
-+ dir505_board_detect
- ;;
- *"DIR-600 rev. A1")
- name="dir-600-a1"
diff --git a/patches/openwrt/0062-ar71xx-don-t-use-D-Link-DIR-505-status-LED-as-ethernet-indicator.patch b/patches/openwrt/0062-ar71xx-don-t-use-D-Link-DIR-505-status-LED-as-ethernet-indicator.patch
deleted file mode 100644
index c89e8f53ef3409a742595b5457b7d64c52719926..0000000000000000000000000000000000000000
--- a/patches/openwrt/0062-ar71xx-don-t-use-D-Link-DIR-505-status-LED-as-ethernet-indicator.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Thu, 28 Jul 2016 15:59:04 +0200
-Subject: ar71xx: don't use D-Link DIR-505 status LED as ethernet indicator
-
-The stock firmware uses the single LED as status indicator only. Using the
-same LED both for status and as ethernet indicator is uncommon, and has
-been confusing users who were using the device as a WLAN mesh node (so the
-LED was just off, as no ethernet was connected).
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-Backport of LEDE adbbfb7ff900c489e6be34b2ec2834172dff7943
-
-diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
-index 14aa7bc5e56c0d7be435ba3a1803416075eccb58..3d240fb076bf40b07e7f0b5974d7b5fd4435a044 100644
---- a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
-+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
-@@ -139,10 +139,6 @@ dhp-1565-a1)
- ucidef_set_led_switch "wan" "WAN" "d-link:green:planet" "switch0" "0x20"
- ;;
-
--dir-505-a1)
-- ucidef_set_led_netdev "lan" "LAN" "d-link:green:power" "eth1"
-- ;;
--
- dir-600-a1|\
- dir-615-e1|\
- dir-615-e4)
diff --git a/patches/openwrt/0063-ar71xx-cpe510-enable-LNA-for-CPE210-220-510-520.patch b/patches/openwrt/0063-ar71xx-cpe510-enable-LNA-for-CPE210-220-510-520.patch
deleted file mode 100644
index 7e4bc678de4d3266e3ff523a9b252c81302f362b..0000000000000000000000000000000000000000
--- a/patches/openwrt/0063-ar71xx-cpe510-enable-LNA-for-CPE210-220-510-520.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Thu, 9 Jun 2016 04:39:08 +0200
-Subject: ar71xx/cpe510: enable LNA for CPE210/220/510/520
-
-The LNA improves the rx path. Within a simple test setup
-it improved the signal from -60dbm to -40dbm.
-
-Signed-off-by: Alexander Couzens <lynxis@fe80.eu>
-
-Backport of LEDE 94e23bf7409d6cc4c9efb55ed32aba8e5a497966
-
-diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-cpe510.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-cpe510.c
-index 8bf5c0f6226cbba10da10af4798b67b76db94e2b..5cb052a84aee451b9fbd449910acfde80dcf8aa7 100644
---- a/target/linux/ar71xx/files/arch/mips/ath79/mach-cpe510.c
-+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-cpe510.c
-@@ -30,6 +30,9 @@
- #define CPE510_GPIO_LED_L3 15
- #define CPE510_GPIO_LED_L4 16
-
-+#define CPE510_GPIO_EXTERNAL_LNA0 18
-+#define CPE510_GPIO_EXTERNAL_LNA1 19
-+
- #define CPE510_GPIO_BTN_RESET 4
-
- #define CPE510_KEYS_POLL_INTERVAL 20 /* msecs */
-@@ -93,6 +96,9 @@ static void __init cpe510_setup(void)
- ARRAY_SIZE(cpe510_gpio_keys),
- cpe510_gpio_keys);
-
-+ ath79_wmac_set_ext_lna_gpio(0, CPE510_GPIO_EXTERNAL_LNA0);
-+ ath79_wmac_set_ext_lna_gpio(1, CPE510_GPIO_EXTERNAL_LNA1);
-+
- ath79_register_m25p80(NULL);
-
- ath79_register_mdio(1, 0);
diff --git a/patches/openwrt/0064-ar71xx-cpe510-split-profile-into-2-profiles-cpe210-and-cpe510.patch b/patches/openwrt/0064-ar71xx-cpe510-split-profile-into-2-profiles-cpe210-and-cpe510.patch
deleted file mode 100644
index 311a7ca7499a0afa17b56bfe22f30021346385c1..0000000000000000000000000000000000000000
--- a/patches/openwrt/0064-ar71xx-cpe510-split-profile-into-2-profiles-cpe210-and-cpe510.patch
+++ /dev/null
@@ -1,169 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Thu, 9 Jun 2016 04:55:37 +0200
-Subject: ar71xx/cpe510: split profile into 2 profiles cpe210 and cpe510
-
-Split profile into 2GHz and 5GHz. The 5GHz devices are
-quite "special". The 2 GHz works perfect.
-
-Signed-off-by: Alexander Couzens <lynxis@fe80.eu>
-
-Backport of LEDE c5ff273d85f69981e5b126eeaed3dee5b4061fb4
-
-diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/01_gpio-switches b/target/linux/ar71xx/base-files/etc/uci-defaults/01_gpio-switches
-index b41f27554b1e3eac19c22af59731771631a1135b..0f7a41589384755ff596d4355ad9fbf1e1087d91 100644
---- a/target/linux/ar71xx/base-files/etc/uci-defaults/01_gpio-switches
-+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/01_gpio-switches
-@@ -15,6 +15,7 @@ nanostation-m)
- nanostation-m-xw)
- ucidef_set_gpio_switch "poe_passthrough" "PoE Passthrough" "2"
- ;;
-+cpe210|\
- cpe510)
- ucidef_set_gpio_switch "poe_passthrough" "PoE Passthrough" "20"
- ;;
-diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
-index 3d240fb076bf40b07e7f0b5974d7b5fd4435a044..f1266d88f1b6a441e58b0a008ca915a4b5958928 100644
---- a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
-+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
-@@ -78,6 +78,7 @@ carambola2)
- ucidef_set_led_wlan "wlan" "WLAN" "carambola2:green:wlan" "phy0tpt"
- ;;
-
-+cpe210|\
- cpe510)
- ucidef_set_led_switch "lan0" "LAN0" "tp-link:green:lan0" "switch0" "0x20"
- ucidef_set_led_switch "lan1" "LAN1" "tp-link:green:lan1" "switch0" "0x10"
-diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
-index ca9c5771d72681557f4139c0e58f4d7a656bd741..6c3ecf54dccd111231d93e539346f7839252794c 100755
---- a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
-+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
-@@ -72,6 +72,7 @@ bsb)
- ucidef_set_interface_wlan
- ;;
-
-+cpe210|\
- cpe510)
- ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
- ucidef_add_switch "switch0" "1" "1"
-diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
-index 20250e96fdcc1783f9b6818c340425206c67016f..0d8ccd21c3f552b7ae7aff6905a08ff6a4fdadf7 100755
---- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
-+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
-@@ -447,7 +447,11 @@ ar71xx_board_detect() {
- *CAP4200AG)
- name="cap4200ag"
- ;;
-- *"CPE210/220/510/520")
-+ *"CPE210/220")
-+ name="cpe210"
-+ tplink_pharos_board_detect
-+ ;;
-+ *"CPE510/520")
- name="cpe510"
- tplink_pharos_board_detect
- ;;
-diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
-index 53284df5e2da19d8012361e9560244af898d3c2c..4003b21df26917a521ed96db82a970a82cdbc2cb 100755
---- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
-+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
-@@ -265,6 +265,7 @@ platform_check_image() {
- return 0
- ;;
-
-+ cpe210|\
- cpe510)
- tplink_pharos_check_image "$1" && return 0
- return 1
-diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-cpe510.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-cpe510.c
-index 5cb052a84aee451b9fbd449910acfde80dcf8aa7..74daf434e611d1f9d05f7d7516ae918d334b32b7 100644
---- a/target/linux/ar71xx/files/arch/mips/ath79/mach-cpe510.c
-+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-cpe510.c
-@@ -78,12 +78,8 @@ static struct gpio_keys_button cpe510_gpio_keys[] __initdata = {
- }
- };
-
--
--static void __init cpe510_setup(void)
-+static void __init cpe_setup(u8 *mac)
- {
-- u8 *mac = (u8 *) KSEG1ADDR(0x1f830008);
-- u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
--
- /* Disable JTAG, enabling GPIOs 0-3 */
- /* Configure OBS4 line, for GPIO 4*/
- ath79_gpio_function_setup(AR934X_GPIO_FUNC_JTAG_DISABLE,
-@@ -105,9 +101,31 @@ static void __init cpe510_setup(void)
- ath79_init_mac(ath79_eth1_data.mac_addr, mac, 0);
- ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_GMII;
- ath79_register_eth(1);
-+}
-+
-+
-+static void __init cpe210_setup(void)
-+{
-+ u8 *mac = (u8 *) KSEG1ADDR(0x1f830008);
-+ u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
-+
-+ cpe_setup(mac);
-
- ath79_register_wmac(ee, mac);
- }
-
--MIPS_MACHINE(ATH79_MACH_CPE510, "CPE510", "TP-LINK CPE210/220/510/520",
-+static void __init cpe510_setup(void)
-+{
-+ u8 *mac = (u8 *) KSEG1ADDR(0x1f830008);
-+ u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
-+
-+ cpe_setup(mac);
-+
-+ ath79_register_wmac(ee, mac);
-+}
-+
-+MIPS_MACHINE(ATH79_MACH_CPE210, "CPE210", "TP-LINK CPE210/220",
-+ cpe210_setup);
-+
-+MIPS_MACHINE(ATH79_MACH_CPE510, "CPE510", "TP-LINK CPE510/520",
- cpe510_setup);
-diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
-index d66bd25fe01544224a69e3f35f020f2e4130c8b3..75083f9b698ba8a438256209a34369eb626a3b3d 100644
---- a/target/linux/ar71xx/image/Makefile
-+++ b/target/linux/ar71xx/image/Makefile
-@@ -2111,7 +2111,8 @@ $(eval $(call SingleProfile,TPLINK-LZMA,64kraw,TLWR1043V2,tl-wr1043nd-v2,TL-WR10
- $(eval $(call SingleProfile,TPLINK-LZMA,64kraw,TLWR1043V3,tl-wr1043nd-v3,TL-WR1043ND-v2,ttyS0,115200,0x10430003,1,8M))
- $(eval $(call SingleProfile,TPLINK-LZMA,64kraw,TLWR2543,tl-wr2543-v1,TL-WR2543N,ttyS0,115200,0x25430001,1,8Mlzma,-v 3.13.99))
-
--$(eval $(call SingleProfile,TPLINK-SAFELOADER,64kraw,CPE510,cpe210-220-510-520,CPE510,ttyS0,115200,$$(cpe510_mtdlayout),CPE510))
-+$(eval $(call SingleProfile,TPLINK-SAFELOADER,64kraw,CPE210_220,cpe210-220,CPE210,ttyS0,115200,$$(cpe510_mtdlayout),CPE510))
-+$(eval $(call SingleProfile,TPLINK-SAFELOADER,64kraw,CPE510_520,cpe510-520,CPE510,ttyS0,115200,$$(cpe510_mtdlayout),CPE510))
-
- $(eval $(call SingleProfile,UAPPRO,64k,UAPPRO,ubnt-uap-pro,UAP-PRO,ttyS0,115200,BZ,BZ,ar934x))
- $(eval $(call SingleProfile,UAPPRO,64k,UBNTUNIFIOUTDOORPLUS,ubnt-unifi-outdoor-plus,UBNT-UOP,ttyS0,115200,BZ,BZ,ar7240))
-@@ -2175,6 +2176,7 @@ $(eval $(call MultiProfile,TLWR842,TLWR842V1))
- $(eval $(call MultiProfile,TLWR941,TLWR941NV2 TLWR941NV3 TLWR941NV4))
- $(eval $(call MultiProfile,TLWR1043,TLWR1043V1 TLWR1043V2 TLWR1043V3))
- $(eval $(call MultiProfile,TLWDR4300,TLWDR3500V1 TLWDR3600V1 TLWDR4300V1 TLWDR4300V1IL TLWDR4310V1 MW4530RV1))
-+$(eval $(call MultiProfile,CPE510,CPE210_220 CPE510_520))
- $(eval $(call MultiProfile,TUBE2H,TUBE2H8M TUBE2H16M))
- $(eval $(call MultiProfile,UBNT,UBNTAIRROUTER UBNTRS UBNTRSPRO UBNTLSSR71 UBNTBULLETM UBNTROCKETM UBNTROCKETMXW UBNTNANOM UBNTNANOMXW UBNTLOCOXW UBNTUNIFI UBNTUNIFIOUTDOOR UBNTUNIFIOUTDOORPLUS UAPPRO UBNTAIRGW))
- $(eval $(call MultiProfile,WNR612V2,REALWNR612V2 N150R))
-diff --git a/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch b/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch
-index d4b417bfb78606ddb84076ad8c927952e65118c2..c83ac2e89324deda3135aab84e8c4f4112ea728d 100644
---- a/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch
-+++ b/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch
-@@ -1,6 +1,6 @@
- --- a/arch/mips/ath79/machtypes.h
- +++ b/arch/mips/ath79/machtypes.h
--@@ -16,22 +16,203 @@
-+@@ -16,22 +16,204 @@
-
- enum ath79_mach_type {
- ATH79_MACH_GENERIC = 0,
-@@ -26,6 +26,7 @@
- + ATH79_MACH_BHU_BXU2000N2_A1, /* BHU BXU2000n-2 A1 */
- + ATH79_MACH_CAP4200AG, /* Senao CAP4200AG */
- + ATH79_MACH_CARAMBOLA2, /* 8devices Carambola2 */
-++ ATH79_MACH_CPE210, /* TP-LINK CPE210 */
- + ATH79_MACH_CPE510, /* TP-LINK CPE510 */
- ATH79_MACH_DB120, /* Atheros DB120 reference board */
- ATH79_MACH_PB44, /* Atheros PB44 reference board */
diff --git a/patches/openwrt/0065-firmware-utils-backport-tplink-safeloader-from-LEDE-05abcf518d5e2b7d6526fd7a87a88a268030694a.patch b/patches/openwrt/0065-firmware-utils-backport-tplink-safeloader-from-LEDE-05abcf518d5e2b7d6526fd7a87a88a268030694a.patch
deleted file mode 100644
index 4e286d5e1637733e14bee20383ee70220fcacbfa..0000000000000000000000000000000000000000
--- a/patches/openwrt/0065-firmware-utils-backport-tplink-safeloader-from-LEDE-05abcf518d5e2b7d6526fd7a87a88a268030694a.patch
+++ /dev/null
@@ -1,555 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Wed, 21 Dec 2016 19:22:56 +0100
-Subject: firmware-utils: backport tplink-safeloader from LEDE 05abcf518d5e2b7d6526fd7a87a88a268030694a
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/tools/firmware-utils/src/tplink-safeloader.c b/tools/firmware-utils/src/tplink-safeloader.c
-index 77a894b237281f6211dd1123ead4b5b0f2f58370..016c118787f3b5332b76f65c85930065a569d6b8 100644
---- a/tools/firmware-utils/src/tplink-safeloader.c
-+++ b/tools/firmware-utils/src/tplink-safeloader.c
-@@ -53,6 +53,8 @@
- #define ALIGN(x,a) ({ typeof(a) __a = (a); (((x) + __a - 1) & ~(__a - 1)); })
-
-
-+#define MAX_PARTITIONS 32
-+
- /** An image partition table entry */
- struct image_partition_entry {
- const char *name;
-@@ -67,6 +69,16 @@ struct flash_partition_entry {
- uint32_t size;
- };
-
-+/** Firmware layout description */
-+struct device_info {
-+ const char *id;
-+ const char *vendor;
-+ const char *support_list;
-+ char support_trail;
-+ const struct flash_partition_entry partitions[MAX_PARTITIONS+1];
-+ const char *first_sysupgrade_partition;
-+ const char *last_sysupgrade_partition;
-+};
-
- /** The content of the soft-version structure */
- struct __attribute__((__packed__)) soft_version {
-@@ -102,45 +114,225 @@ static const uint8_t md5_salt[16] = {
- };
-
-
--/** Vendor information for CPE210/220/510/520 */
--static const char cpe510_vendor[] = "CPE510(TP-LINK|UN|N300-5):1.0\r\n";
--
--
--/**
-- The flash partition table for CPE210/220/510/520;
-- it is the same as the one used by the stock images.
--*/
--static const struct flash_partition_entry cpe510_partitions[] = {
-- {"fs-uboot", 0x00000, 0x20000},
-- {"partition-table", 0x20000, 0x02000},
-- {"default-mac", 0x30000, 0x00020},
-- {"product-info", 0x31100, 0x00100},
-- {"signature", 0x32000, 0x00400},
-- {"os-image", 0x40000, 0x170000},
-- {"soft-version", 0x1b0000, 0x00100},
-- {"support-list", 0x1b1000, 0x00400},
-- {"file-system", 0x1c0000, 0x600000},
-- {"user-config", 0x7c0000, 0x10000},
-- {"default-config", 0x7d0000, 0x10000},
-- {"log", 0x7e0000, 0x10000},
-- {"radio", 0x7f0000, 0x10000},
-- {NULL, 0, 0}
-+/** Firmware layout table */
-+static struct device_info boards[] = {
-+ /** Firmware layout for the CPE210/220 */
-+ {
-+ .id = "CPE210",
-+ .vendor = "CPE510(TP-LINK|UN|N300-5):1.0\r\n",
-+ .support_list =
-+ "SupportList:\r\n"
-+ "CPE210(TP-LINK|UN|N300-2):1.0\r\n"
-+ "CPE210(TP-LINK|UN|N300-2):1.1\r\n"
-+ "CPE210(TP-LINK|US|N300-2):1.1\r\n"
-+ "CPE210(TP-LINK|EU|N300-2):1.1\r\n"
-+ "CPE220(TP-LINK|UN|N300-2):1.1\r\n"
-+ "CPE220(TP-LINK|US|N300-2):1.1\r\n"
-+ "CPE220(TP-LINK|EU|N300-2):1.1\r\n",
-+ .support_trail = '\xff',
-+
-+ .partitions = {
-+ {"fs-uboot", 0x00000, 0x20000},
-+ {"partition-table", 0x20000, 0x02000},
-+ {"default-mac", 0x30000, 0x00020},
-+ {"product-info", 0x31100, 0x00100},
-+ {"signature", 0x32000, 0x00400},
-+ {"os-image", 0x40000, 0x170000},
-+ {"soft-version", 0x1b0000, 0x00100},
-+ {"support-list", 0x1b1000, 0x00400},
-+ {"file-system", 0x1c0000, 0x600000},
-+ {"user-config", 0x7c0000, 0x10000},
-+ {"default-config", 0x7d0000, 0x10000},
-+ {"log", 0x7e0000, 0x10000},
-+ {"radio", 0x7f0000, 0x10000},
-+ {NULL, 0, 0}
-+ },
-+
-+ .first_sysupgrade_partition = "os-image",
-+ .last_sysupgrade_partition = "file-system",
-+ },
-+
-+ /** Firmware layout for the CPE510/520 */
-+ {
-+ .id = "CPE510",
-+ .vendor = "CPE510(TP-LINK|UN|N300-5):1.0\r\n",
-+ .support_list =
-+ "SupportList:\r\n"
-+ "CPE510(TP-LINK|UN|N300-5):1.0\r\n"
-+ "CPE510(TP-LINK|UN|N300-5):1.1\r\n"
-+ "CPE510(TP-LINK|UN|N300-5):1.1\r\n"
-+ "CPE510(TP-LINK|US|N300-5):1.1\r\n"
-+ "CPE510(TP-LINK|EU|N300-5):1.1\r\n"
-+ "CPE520(TP-LINK|UN|N300-5):1.1\r\n"
-+ "CPE520(TP-LINK|US|N300-5):1.1\r\n"
-+ "CPE520(TP-LINK|EU|N300-5):1.1\r\n",
-+ .support_trail = '\xff',
-+
-+ .partitions = {
-+ {"fs-uboot", 0x00000, 0x20000},
-+ {"partition-table", 0x20000, 0x02000},
-+ {"default-mac", 0x30000, 0x00020},
-+ {"product-info", 0x31100, 0x00100},
-+ {"signature", 0x32000, 0x00400},
-+ {"os-image", 0x40000, 0x170000},
-+ {"soft-version", 0x1b0000, 0x00100},
-+ {"support-list", 0x1b1000, 0x00400},
-+ {"file-system", 0x1c0000, 0x600000},
-+ {"user-config", 0x7c0000, 0x10000},
-+ {"default-config", 0x7d0000, 0x10000},
-+ {"log", 0x7e0000, 0x10000},
-+ {"radio", 0x7f0000, 0x10000},
-+ {NULL, 0, 0}
-+ },
-+
-+ .first_sysupgrade_partition = "os-image",
-+ .last_sysupgrade_partition = "file-system",
-+ },
-+
-+ /** Firmware layout for the C2600 */
-+ {
-+ .id = "C2600",
-+ .vendor = "",
-+ .support_list =
-+ "SupportList:\r\n"
-+ "{product_name:Archer C2600,product_ver:1.0.0,special_id:00000000}\r\n",
-+ .support_trail = '\x00',
-+
-+ .partitions = {
-+ {"SBL1", 0x00000, 0x20000},
-+ {"MIBIB", 0x20000, 0x20000},
-+ {"SBL2", 0x40000, 0x20000},
-+ {"SBL3", 0x60000, 0x30000},
-+ {"DDRCONFIG", 0x90000, 0x10000},
-+ {"SSD", 0xa0000, 0x10000},
-+ {"TZ", 0xb0000, 0x30000},
-+ {"RPM", 0xe0000, 0x20000},
-+ {"fs-uboot", 0x100000, 0x70000},
-+ {"uboot-env", 0x170000, 0x40000},
-+ {"radio", 0x1b0000, 0x40000},
-+ {"os-image", 0x1f0000, 0x200000},
-+ {"file-system", 0x3f0000, 0x1b00000},
-+ {"default-mac", 0x1ef0000, 0x00200},
-+ {"pin", 0x1ef0200, 0x00200},
-+ {"product-info", 0x1ef0400, 0x0fc00},
-+ {"partition-table", 0x1f00000, 0x10000},
-+ {"soft-version", 0x1f10000, 0x10000},
-+ {"support-list", 0x1f20000, 0x10000},
-+ {"profile", 0x1f30000, 0x10000},
-+ {"default-config", 0x1f40000, 0x10000},
-+ {"user-config", 0x1f50000, 0x40000},
-+ {"qos-db", 0x1f90000, 0x40000},
-+ {"usb-config", 0x1fd0000, 0x10000},
-+ {"log", 0x1fe0000, 0x20000},
-+ {NULL, 0, 0}
-+ },
-+
-+ .first_sysupgrade_partition = "os-image",
-+ .last_sysupgrade_partition = "file-system"
-+ },
-+
-+ /** Firmware layout for the C9 */
-+ {
-+ .id = "ARCHERC9",
-+ .vendor = "",
-+ .support_list =
-+ "SupportList:\n"
-+ "{product_name:ArcherC9,"
-+ "product_ver:1.0.0,"
-+ "special_id:00000000}\n",
-+ .support_trail = '\x00',
-+
-+ .partitions = {
-+ {"fs-uboot", 0x00000, 0x40000},
-+ {"os-image", 0x40000, 0x200000},
-+ {"file-system", 0x240000, 0xc00000},
-+ {"default-mac", 0xe40000, 0x00200},
-+ {"pin", 0xe40200, 0x00200},
-+ {"product-info", 0xe40400, 0x00200},
-+ {"partition-table", 0xe50000, 0x10000},
-+ {"soft-version", 0xe60000, 0x00200},
-+ {"support-list", 0xe61000, 0x0f000},
-+ {"profile", 0xe70000, 0x10000},
-+ {"default-config", 0xe80000, 0x10000},
-+ {"user-config", 0xe90000, 0x50000},
-+ {"log", 0xee0000, 0x100000},
-+ {"radio_bk", 0xfe0000, 0x10000},
-+ {"radio", 0xff0000, 0x10000},
-+ {NULL, 0, 0}
-+ },
-+
-+ .first_sysupgrade_partition = "os-image",
-+ .last_sysupgrade_partition = "file-system"
-+ },
-+
-+ /** Firmware layout for the EAP120 */
-+ {
-+ .id = "EAP120",
-+ .vendor = "EAP120(TP-LINK|UN|N300-2):1.0\r\n",
-+ .support_list =
-+ "SupportList:\r\n"
-+ "EAP120(TP-LINK|UN|N300-2):1.0\r\n",
-+ .support_trail = '\xff',
-+
-+ .partitions = {
-+ {"fs-uboot", 0x00000, 0x20000},
-+ {"partition-table", 0x20000, 0x02000},
-+ {"default-mac", 0x30000, 0x00020},
-+ {"support-list", 0x31000, 0x00100},
-+ {"product-info", 0x31100, 0x00100},
-+ {"soft-version", 0x32000, 0x00100},
-+ {"os-image", 0x40000, 0x180000},
-+ {"file-system", 0x1c0000, 0x600000},
-+ {"user-config", 0x7c0000, 0x10000},
-+ {"backup-config", 0x7d0000, 0x10000},
-+ {"log", 0x7e0000, 0x10000},
-+ {"radio", 0x7f0000, 0x10000},
-+ {NULL, 0, 0}
-+ },
-+
-+ .first_sysupgrade_partition = "os-image",
-+ .last_sysupgrade_partition = "file-system"
-+ },
-+
-+ /** Firmware layout for the TL-WR1043 v4 */
-+ {
-+ .id = "TLWR1043NDV4",
-+ .vendor = "",
-+ .support_list =
-+ "SupportList:\n"
-+ "{product_name:TL-WR1043ND,product_ver:4.0.0,special_id:45550000}\n",
-+ .support_trail = '\x00',
-+
-+ /**
-+ We use a bigger os-image partition than the stock images (and thus
-+ smaller file-system), as our kernel doesn't fit in the stock firmware's
-+ 1MB os-image.
-+ */
-+ .partitions = {
-+ {"fs-uboot", 0x00000, 0x20000},
-+ {"os-image", 0x20000, 0x180000},
-+ {"file-system", 0x1a0000, 0xdb0000},
-+ {"default-mac", 0xf50000, 0x00200},
-+ {"pin", 0xf50200, 0x00200},
-+ {"product-info", 0xf50400, 0x0fc00},
-+ {"soft-version", 0xf60000, 0x0b000},
-+ {"support-list", 0xf6b000, 0x04000},
-+ {"profile", 0xf70000, 0x04000},
-+ {"default-config", 0xf74000, 0x0b000},
-+ {"user-config", 0xf80000, 0x40000},
-+ {"partition-table", 0xfc0000, 0x10000},
-+ {"log", 0xfd0000, 0x20000},
-+ {"radio", 0xff0000, 0x10000},
-+ {NULL, 0, 0}
-+ },
-+
-+ .first_sysupgrade_partition = "os-image",
-+ .last_sysupgrade_partition = "file-system"
-+ },
-+
-+ {}
- };
-
--/**
-- The support list for CPE210/220/510/520
--*/
--static const char cpe510_support_list[] =
-- "SupportList:\r\n"
-- "CPE510(TP-LINK|UN|N300-5):1.0\r\n"
-- "CPE510(TP-LINK|UN|N300-5):1.1\r\n"
-- "CPE520(TP-LINK|UN|N300-5):1.0\r\n"
-- "CPE520(TP-LINK|UN|N300-5):1.1\r\n"
-- "CPE210(TP-LINK|UN|N300-2):1.0\r\n"
-- "CPE210(TP-LINK|UN|N300-2):1.1\r\n"
-- "CPE220(TP-LINK|UN|N300-2):1.0\r\n"
-- "CPE220(TP-LINK|UN|N300-2):1.1\r\n";
--
- #define error(_ret, _errno, _str, ...) \
- do { \
- fprintf(stderr, _str ": %s\n", ## __VA_ARGS__, \
-@@ -240,14 +432,14 @@ static struct image_partition_entry make_soft_version(uint32_t rev) {
- }
-
- /** Generates the support-list partition */
--static struct image_partition_entry make_support_list(const char *support_list) {
-- size_t len = strlen(support_list);
-+static struct image_partition_entry make_support_list(const struct device_info *info) {
-+ size_t len = strlen(info->support_list);
- struct image_partition_entry entry = alloc_image_partition("support-list", len + 9);
-
- put32(entry.data, len);
- memset(entry.data+4, 0, 4);
-- memcpy(entry.data+8, support_list, len);
-- entry.data[len+8] = '\xff';
-+ memcpy(entry.data+8, info->support_list, len);
-+ entry.data[len+8] = info->support_trail;
-
- return entry;
- }
-@@ -313,12 +505,22 @@ static struct image_partition_entry read_file(const char *part_name, const char
-
- I think partition-table must be the first partition in the firmware image.
- */
--static void put_partitions(uint8_t *buffer, const struct image_partition_entry *parts) {
-- size_t i;
-+static void put_partitions(uint8_t *buffer, const struct flash_partition_entry *flash_parts, const struct image_partition_entry *parts) {
-+ size_t i, j;
- char *image_pt = (char *)buffer, *end = image_pt + 0x800;
-
- size_t base = 0x800;
- for (i = 0; parts[i].name; i++) {
-+ for (j = 0; flash_parts[j].name; j++) {
-+ if (!strcmp(flash_parts[j].name, parts[i].name)) {
-+ if (parts[i].size > flash_parts[j].size)
-+ error(1, 0, "%s partition too big (more than %u bytes)", flash_parts[j].name, (unsigned)flash_parts[j].size);
-+ break;
-+ }
-+ }
-+
-+ assert(flash_parts[j].name);
-+
- memcpy(buffer + base, parts[i].data, parts[i].size);
-
- size_t len = end-image_pt;
-@@ -331,10 +533,6 @@ static void put_partitions(uint8_t *buffer, const struct image_partition_entry *
-
- base += parts[i].size;
- }
--
-- image_pt++;
--
-- memset(image_pt, 0xff, end-image_pt);
- }
-
- /** Generates and writes the image MD5 checksum */
-@@ -363,7 +561,7 @@ static void put_md5(uint8_t *md5, uint8_t *buffer, unsigned int len) {
- 1014-1813 Image partition table (2048 bytes, padded with 0xff)
- 1814-xxxx Firmware partitions
- */
--static void * generate_factory_image(const char *vendor, const struct image_partition_entry *parts, size_t *len) {
-+static void * generate_factory_image(const struct device_info *info, const struct image_partition_entry *parts, size_t *len) {
- *len = 0x1814;
-
- size_t i;
-@@ -374,14 +572,16 @@ static void * generate_factory_image(const char *vendor, const struct image_part
- if (!image)
- error(1, errno, "malloc");
-
-+ memset(image, 0xff, *len);
- put32(image, *len);
-
-- size_t vendor_len = strlen(vendor);
-- put32(image+0x14, vendor_len);
-- memcpy(image+0x18, vendor, vendor_len);
-- memset(image+0x18+vendor_len, 0xff, 4092-vendor_len);
-+ if (info->vendor) {
-+ size_t vendor_len = strlen(info->vendor);
-+ put32(image+0x14, vendor_len);
-+ memcpy(image+0x18, info->vendor, vendor_len);
-+ }
-
-- put_partitions(image + 0x1014, parts);
-+ put_partitions(image + 0x1014, info->partitions, parts);
- put_md5(image+0x04, image+0x14, *len-0x14);
-
- return image;
-@@ -394,33 +594,39 @@ static void * generate_factory_image(const char *vendor, const struct image_part
- should be generalized when TP-LINK starts building its safeloader into hardware with
- different flash layouts.
- */
--static void * generate_sysupgrade_image(const struct flash_partition_entry *flash_parts, const struct image_partition_entry *image_parts, size_t *len) {
-- const struct flash_partition_entry *flash_os_image = &flash_parts[5];
-- const struct flash_partition_entry *flash_soft_version = &flash_parts[6];
-- const struct flash_partition_entry *flash_support_list = &flash_parts[7];
-- const struct flash_partition_entry *flash_file_system = &flash_parts[8];
--
-- const struct image_partition_entry *image_os_image = &image_parts[3];
-- const struct image_partition_entry *image_soft_version = &image_parts[1];
-- const struct image_partition_entry *image_support_list = &image_parts[2];
-- const struct image_partition_entry *image_file_system = &image_parts[4];
--
-- assert(strcmp(flash_os_image->name, "os-image") == 0);
-- assert(strcmp(flash_soft_version->name, "soft-version") == 0);
-- assert(strcmp(flash_support_list->name, "support-list") == 0);
-- assert(strcmp(flash_file_system->name, "file-system") == 0);
--
-- assert(strcmp(image_os_image->name, "os-image") == 0);
-- assert(strcmp(image_soft_version->name, "soft-version") == 0);
-- assert(strcmp(image_support_list->name, "support-list") == 0);
-- assert(strcmp(image_file_system->name, "file-system") == 0);
--
-- if (image_os_image->size > flash_os_image->size)
-- error(1, 0, "kernel image too big (more than %u bytes)", (unsigned)flash_os_image->size);
-- if (image_file_system->size > flash_file_system->size)
-- error(1, 0, "rootfs image too big (more than %u bytes)", (unsigned)flash_file_system->size);
--
-- *len = flash_file_system->base - flash_os_image->base + image_file_system->size;
-+static void * generate_sysupgrade_image(const struct device_info *info, const struct image_partition_entry *image_parts, size_t *len) {
-+ size_t i, j;
-+ size_t flash_first_partition_index = 0;
-+ size_t flash_last_partition_index = 0;
-+ const struct flash_partition_entry *flash_first_partition = NULL;
-+ const struct flash_partition_entry *flash_last_partition = NULL;
-+ const struct image_partition_entry *image_last_partition = NULL;
-+
-+ /** Find first and last partitions */
-+ for (i = 0; info->partitions[i].name; i++) {
-+ if (!strcmp(info->partitions[i].name, info->first_sysupgrade_partition)) {
-+ flash_first_partition = &info->partitions[i];
-+ flash_first_partition_index = i;
-+ } else if (!strcmp(info->partitions[i].name, info->last_sysupgrade_partition)) {
-+ flash_last_partition = &info->partitions[i];
-+ flash_last_partition_index = i;
-+ }
-+ }
-+
-+ assert(flash_first_partition && flash_last_partition);
-+ assert(flash_first_partition_index < flash_last_partition_index);
-+
-+ /** Find last partition from image to calculate needed size */
-+ for (i = 0; image_parts[i].name; i++) {
-+ if (!strcmp(image_parts[i].name, info->last_sysupgrade_partition)) {
-+ image_last_partition = &image_parts[i];
-+ break;
-+ }
-+ }
-+
-+ assert(image_last_partition);
-+
-+ *len = flash_last_partition->base - flash_first_partition->base + image_last_partition->size;
-
- uint8_t *image = malloc(*len);
- if (!image)
-@@ -428,31 +634,44 @@ static void * generate_sysupgrade_image(const struct flash_partition_entry *flas
-
- memset(image, 0xff, *len);
-
-- memcpy(image, image_os_image->data, image_os_image->size);
-- memcpy(image + flash_soft_version->base - flash_os_image->base, image_soft_version->data, image_soft_version->size);
-- memcpy(image + flash_support_list->base - flash_os_image->base, image_support_list->data, image_support_list->size);
-- memcpy(image + flash_file_system->base - flash_os_image->base, image_file_system->data, image_file_system->size);
-+ for (i = flash_first_partition_index; i <= flash_last_partition_index; i++) {
-+ for (j = 0; image_parts[j].name; j++) {
-+ if (!strcmp(info->partitions[i].name, image_parts[j].name)) {
-+ if (image_parts[j].size > info->partitions[i].size)
-+ error(1, 0, "%s partition too big (more than %u bytes)", info->partitions[i].name, (unsigned)info->partitions[i].size);
-+ memcpy(image + info->partitions[i].base - flash_first_partition->base, image_parts[j].data, image_parts[j].size);
-+ break;
-+ }
-+
-+ assert(image_parts[j].name);
-+ }
-+ }
-
- return image;
- }
-
--
--/** Generates an image for CPE210/220/510/520 and writes it to a file */
--static void do_cpe510(const char *output, const char *kernel_image, const char *rootfs_image, uint32_t rev, bool add_jffs2_eof, bool sysupgrade) {
-+/** Generates an image according to a given layout and writes it to a file */
-+static void build_image(const char *output,
-+ const char *kernel_image,
-+ const char *rootfs_image,
-+ uint32_t rev,
-+ bool add_jffs2_eof,
-+ bool sysupgrade,
-+ const struct device_info *info) {
- struct image_partition_entry parts[6] = {};
-
-- parts[0] = make_partition_table(cpe510_partitions);
-+ parts[0] = make_partition_table(info->partitions);
- parts[1] = make_soft_version(rev);
-- parts[2] = make_support_list(cpe510_support_list);
-+ parts[2] = make_support_list(info);
- parts[3] = read_file("os-image", kernel_image, false);
- parts[4] = read_file("file-system", rootfs_image, add_jffs2_eof);
-
- size_t len;
- void *image;
- if (sysupgrade)
-- image = generate_sysupgrade_image(cpe510_partitions, parts, &len);
-+ image = generate_sysupgrade_image(info, parts, &len);
- else
-- image = generate_factory_image(cpe510_vendor, parts, &len);
-+ image = generate_factory_image(info, parts, &len);
-
- FILE *file = fopen(output, "wb");
- if (!file)
-@@ -470,7 +689,6 @@ static void do_cpe510(const char *output, const char *kernel_image, const char *
- free_image_partition(parts[i]);
- }
-
--
- /** Usage output */
- static void usage(const char *argv0) {
- fprintf(stderr,
-@@ -490,10 +708,22 @@ static void usage(const char *argv0) {
- };
-
-
-+static const struct device_info *find_board(const char *id)
-+{
-+ struct device_info *board = NULL;
-+
-+ for (board = boards; board->id != NULL; board++)
-+ if (strcasecmp(id, board->id) == 0)
-+ return board;
-+
-+ return NULL;
-+}
-+
- int main(int argc, char *argv[]) {
- const char *board = NULL, *kernel_image = NULL, *rootfs_image = NULL, *output = NULL;
- bool add_jffs2_eof = false, sysupgrade = false;
- unsigned rev = 0;
-+ const struct device_info *info;
-
- while (true) {
- int c;
-@@ -550,10 +780,12 @@ int main(int argc, char *argv[]) {
- if (!output)
- error(1, 0, "no output filename has been specified");
-
-- if (strcmp(board, "CPE510") == 0)
-- do_cpe510(output, kernel_image, rootfs_image, rev, add_jffs2_eof, sysupgrade);
-- else
-+ info = find_board(board);
-+
-+ if (info == NULL)
- error(1, 0, "unsupported board %s", board);
-
-+ build_image(output, kernel_image, rootfs_image, rev, add_jffs2_eof, sysupgrade, info);
-+
- return 0;
- }
diff --git a/patches/openwrt/0066-ar71xx-split-CPE210-from-CPE510-profile.patch b/patches/openwrt/0066-ar71xx-split-CPE210-from-CPE510-profile.patch
deleted file mode 100644
index eb29bc8f576481f30377f83355a181b3684c4b4e..0000000000000000000000000000000000000000
--- a/patches/openwrt/0066-ar71xx-split-CPE210-from-CPE510-profile.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Thu, 9 Jun 2016 05:03:35 +0200
-Subject: ar71xx: split CPE210 from CPE510 profile
-
-The CPE210 was still described for the OEM upgrade as compatible,
-even the wireless configuration isn't compatible anymore between
-both series (2ghz and 5ghz).
-Update the CPE210 image profile to use the new profile.
-
-Signed-off-by: Alexander Couzens <lynxis@fe80.eu>
-
-Backport of LEDE 824147960569f2c1cd22140c9074c62c3df911a5
-
-diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
-index 75083f9b698ba8a438256209a34369eb626a3b3d..bb2bb94e04ee8f59db62907ace49952061b411dc 100644
---- a/target/linux/ar71xx/image/Makefile
-+++ b/target/linux/ar71xx/image/Makefile
-@@ -2111,7 +2111,7 @@ $(eval $(call SingleProfile,TPLINK-LZMA,64kraw,TLWR1043V2,tl-wr1043nd-v2,TL-WR10
- $(eval $(call SingleProfile,TPLINK-LZMA,64kraw,TLWR1043V3,tl-wr1043nd-v3,TL-WR1043ND-v2,ttyS0,115200,0x10430003,1,8M))
- $(eval $(call SingleProfile,TPLINK-LZMA,64kraw,TLWR2543,tl-wr2543-v1,TL-WR2543N,ttyS0,115200,0x25430001,1,8Mlzma,-v 3.13.99))
-
--$(eval $(call SingleProfile,TPLINK-SAFELOADER,64kraw,CPE210_220,cpe210-220,CPE210,ttyS0,115200,$$(cpe510_mtdlayout),CPE510))
-+$(eval $(call SingleProfile,TPLINK-SAFELOADER,64kraw,CPE210_220,cpe210-220,CPE210,ttyS0,115200,$$(cpe510_mtdlayout),CPE210))
- $(eval $(call SingleProfile,TPLINK-SAFELOADER,64kraw,CPE510_520,cpe510-520,CPE510,ttyS0,115200,$$(cpe510_mtdlayout),CPE510))
-
- $(eval $(call SingleProfile,UAPPRO,64k,UAPPRO,ubnt-uap-pro,UAP-PRO,ttyS0,115200,BZ,BZ,ar934x))
diff --git a/patches/openwrt/0067-dropbear-update-to-LEDE-277f85c21ae0ede4e15e66cbd801b9fb502531df.patch b/patches/openwrt/0067-dropbear-update-to-LEDE-277f85c21ae0ede4e15e66cbd801b9fb502531df.patch
deleted file mode 100644
index 35824a1fd26933131f7f353941adeb15c4debc75..0000000000000000000000000000000000000000
--- a/patches/openwrt/0067-dropbear-update-to-LEDE-277f85c21ae0ede4e15e66cbd801b9fb502531df.patch
+++ /dev/null
@@ -1,437 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Mon, 22 Aug 2016 19:14:52 +0200
-Subject: dropbear: update to LEDE 277f85c21ae0ede4e15e66cbd801b9fb502531df
-
-Includes a few security updates and enables Curve25519 support.
-
-The patches 600-allow-blank-root-password.patch and
-610-skip-default-keys-in-custom-runs.patch are left out for now to avoid
-allowing password-less root login.
-
-diff --git a/package/network/services/dropbear/Config.in b/package/network/services/dropbear/Config.in
-index e2a761034fa64225439db4a18030dee75fb0775c..7c2edd79f23708f9ef01c6a62a54073b0c7a33ed 100644
---- a/package/network/services/dropbear/Config.in
-+++ b/package/network/services/dropbear/Config.in
-@@ -1,6 +1,15 @@
- menu "Configuration"
- depends on PACKAGE_dropbear
-
-+config DROPBEAR_CURVE25519
-+ bool "Curve25519 support"
-+ default y
-+ help
-+ This enables the following key exchange algorithm:
-+ curve25519-sha256@libssh.org
-+
-+ Increases binary size by about 13 kB uncompressed (MIPS).
-+
- config DROPBEAR_ECC
- bool "Elliptic curve cryptography (ECC)"
- default n
-@@ -12,7 +21,6 @@ config DROPBEAR_ECC
- ecdh-sha2-nistp256
- ecdh-sha2-nistp384
- ecdh-sha2-nistp521
-- curve25519-sha256@libssh.org
-
- Public key algorithms:
- ecdsa-sha2-nistp256
-@@ -22,6 +30,21 @@ config DROPBEAR_ECC
- Does not generate ECC host keys by default (ECC key exchange will not be used,
- only ECC public key auth).
-
-- Increases binary size by about 36 kB (MIPS).
-+ Increases binary size by about 23 kB (MIPS).
-+
-+config DROPBEAR_UTMP
-+ bool "Utmp support"
-+ default n
-+ depends on BUSYBOX_CONFIG_FEATURE_UTMP
-+ help
-+ This enables dropbear utmp support, the file /var/run/utmp is used to
-+ track who is currently logged in.
-+
-+config DROPBEAR_PUTUTLINE
-+ bool "Pututline support"
-+ default n
-+ depends on DROPBEAR_UTMP
-+ help
-+ Dropbear will use pututline() to write the utmp structure into the utmp file.
-
- endmenu
-diff --git a/package/network/services/dropbear/Makefile b/package/network/services/dropbear/Makefile
-index 35958d332cd0c9796ba50c433b13a3e24cd4441c..36bcb4ab7b6c57460cd15da1bcc130af62e32bc6 100644
---- a/package/network/services/dropbear/Makefile
-+++ b/package/network/services/dropbear/Makefile
-@@ -1,5 +1,5 @@
- #
--# Copyright (C) 2006-2014 OpenWrt.org
-+# Copyright (C) 2006-2016 OpenWrt.org
- #
- # This is free software, licensed under the GNU General Public License v2.
- # See /LICENSE for more information.
-@@ -8,14 +8,14 @@
- include $(TOPDIR)/rules.mk
-
- PKG_NAME:=dropbear
--PKG_VERSION:=2015.67
-+PKG_VERSION:=2016.74
- PKG_RELEASE:=1
-
- PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
- PKG_SOURCE_URL:= \
- http://matt.ucc.asn.au/dropbear/releases/ \
- https://dropbear.nl/mirror/releases/
--PKG_MD5SUM:=e967e320344cd4bfebe321e3ab8514d6
-+PKG_MD5SUM:=9ad0172731e0f16623937804643b5bd8
-
- PKG_LICENSE:=MIT
- PKG_LICENSE_FILES:=LICENSE libtomcrypt/LICENSE libtommath/LICENSE
-@@ -23,10 +23,14 @@ PKG_LICENSE_FILES:=LICENSE libtomcrypt/LICENSE libtommath/LICENSE
- PKG_BUILD_PARALLEL:=1
- PKG_USE_MIPS16:=0
-
--PKG_CONFIG_DEPENDS:=CONFIG_DROPBEAR_ECC
-+PKG_CONFIG_DEPENDS:=CONFIG_TARGET_INIT_PATH CONFIG_DROPBEAR_ECC CONFIG_DROPBEAR_CURVE25519
-
- include $(INCLUDE_DIR)/package.mk
-
-+ifneq ($(DUMP),1)
-+ STAMP_CONFIGURED:=$(strip $(STAMP_CONFIGURED))_$(shell $(SH_FUNC) echo $(CONFIG_TARGET_INIT_PATH) | md5s)
-+endif
-+
- define Package/dropbear/Default
- URL:=http://matt.ucc.asn.au/dropbear/
- endef
-@@ -48,7 +52,6 @@ endef
-
- define Package/dropbear/conffiles
- /etc/dropbear/dropbear_rsa_host_key
--/etc/dropbear/dropbear_dss_host_key
- /etc/config/dropbear
- endef
-
-@@ -65,25 +68,35 @@ CONFIGURE_ARGS += \
- --enable-syslog \
- $(if $(CONFIG_SHADOW_PASSWORDS),,--disable-shadow) \
- --disable-lastlog \
-- --disable-utmp \
- --disable-utmpx \
-+ $(if $(CONFIG_DROPBEAR_UTMP),,--disable-utmp) \
- --disable-wtmp \
- --disable-wtmpx \
- --disable-loginfunc \
-- --disable-pututline \
-+ $(if $(CONFIG_DROPBEAR_PUTUTLINE),,--disable-pututline) \
- --disable-pututxline \
- --disable-zlib \
- --enable-bundled-libtom
-
--TARGET_CFLAGS += -DARGTYPE=3 -ffunction-sections -fdata-sections
-+TARGET_CFLAGS += -DDEFAULT_PATH=\\\"$(CONFIG_TARGET_INIT_PATH)\\\" -DARGTYPE=3 -ffunction-sections -fdata-sections
- TARGET_LDFLAGS += -Wl,--gc-sections
-
- define Build/Configure
- $(Build/Configure/Default)
-
-+ $(SED) 's,^#define DEFAULT_PATH .*$$$$,#define DEFAULT_PATH "$(CONFIG_TARGET_INIT_PATH)",g' \
-+ $(PKG_BUILD_DIR)/options.h
-+
-+ awk 'BEGIN { rc = 1 } \
-+ /'DROPBEAR_CURVE25519'/ { $$$$0 = "$(if $(CONFIG_DROPBEAR_CURVE25519),,// )#define 'DROPBEAR_CURVE25519'"; rc = 0 } \
-+ { print } \
-+ END { exit(rc) }' $(PKG_BUILD_DIR)/options.h \
-+ >$(PKG_BUILD_DIR)/options.h.new && \
-+ mv $(PKG_BUILD_DIR)/options.h.new $(PKG_BUILD_DIR)/options.h
-+
- # Enforce that all replacements are made, otherwise options.h has changed
- # format and this logic is broken.
-- for OPTION in DROPBEAR_ECDSA DROPBEAR_ECDH DROPBEAR_CURVE25519; do \
-+ for OPTION in DROPBEAR_ECDSA DROPBEAR_ECDH; do \
- awk 'BEGIN { rc = 1 } \
- /'$$$$OPTION'/ { $$$$0 = "$(if $(CONFIG_DROPBEAR_ECC),,// )#define '$$$$OPTION'"; rc = 0 } \
- { print } \
-@@ -91,6 +104,9 @@ define Build/Configure
- >$(PKG_BUILD_DIR)/options.h.new && \
- mv $(PKG_BUILD_DIR)/options.h.new $(PKG_BUILD_DIR)/options.h || exit 1; \
- done
-+
-+ # Enforce rebuild of svr-chansession.c
-+ rm -f $(PKG_BUILD_DIR)/svr-chansession.o
- endef
-
- define Build/Compile
-@@ -118,7 +134,6 @@ define Package/dropbear/install
- $(INSTALL_DIR) $(1)/usr/lib/opkg/info
- $(INSTALL_DIR) $(1)/etc/dropbear
- touch $(1)/etc/dropbear/dropbear_rsa_host_key
-- touch $(1)/etc/dropbear/dropbear_dss_host_key
- endef
-
- define Package/dropbearconvert/install
-diff --git a/package/network/services/dropbear/files/dropbear.init b/package/network/services/dropbear/files/dropbear.init
-index 6de0142728dfa127652ecceef1d25080069d800a..1653efbdb38b1037c3630595b903c839887a4e52 100755
---- a/package/network/services/dropbear/files/dropbear.init
-+++ b/package/network/services/dropbear/files/dropbear.init
-@@ -37,7 +37,6 @@ validate_section_dropbear()
- 'RootPasswordAuth:bool:1' \
- 'RootLogin:bool:1' \
- 'rsakeyfile:file' \
-- 'dsskeyfile:file' \
- 'BannerFile:file' \
- 'Port:list(port):22' \
- 'SSHKeepAlive:uinteger:300' \
-@@ -49,7 +48,7 @@ dropbear_instance()
- {
- local PasswordAuth enable Interface GatewayPorts \
- RootPasswordAuth RootLogin rsakeyfile \
-- dsskeyfile BannerFile Port SSHKeepAlive IdleTimeout \
-+ BannerFile Port SSHKeepAlive IdleTimeout \
- mdns ipaddrs
-
- validate_section_dropbear "${1}" || {
-@@ -75,18 +74,18 @@ dropbear_instance()
- [ "${RootPasswordAuth}" -eq 0 ] && procd_append_param command -g
- [ "${RootLogin}" -eq 0 ] && procd_append_param command -w
- [ -n "${rsakeyfile}" ] && procd_append_param command -r "${rsakeyfile}"
-- [ -n "${dsskeyfile}" ] && procd_append_param command -d "${dsskeyfile}"
- [ -n "${BannerFile}" ] && procd_append_param command -b "${BannerFile}"
- append_ports "${ipaddrs}" "${Port}"
- [ "${IdleTimeout}" -ne 0 ] && procd_append_param command -I "${IdleTimeout}"
- [ "${SSHKeepAlive}" -ne 0 ] && procd_append_param command -K "${SSHKeepAlive}"
- [ "${mdns}" -ne 0 ] && procd_add_mdns "ssh" "tcp" "$Port" "daemon=dropbear"
-+ procd_set_param respawn
- procd_close_instance
- }
-
- keygen()
- {
-- for keytype in rsa dss; do
-+ for keytype in rsa; do
- # check for keys
- key=dropbear/dropbear_${keytype}_host_key
- [ -f /tmp/$key -o -s /etc/$key ] || {
-@@ -107,10 +106,15 @@ keygen()
- chmod 0700 /etc/dropbear
- }
-
-+load_interfaces()
-+{
-+ config_get interface "$1" Interface
-+ interfaces=" ${interface} ${interfaces}"
-+}
-+
- start_service()
- {
-- [ -s /etc/dropbear/dropbear_rsa_host_key -a \
-- -s /etc/dropbear/dropbear_dss_host_key ] || keygen
-+ [ -s /etc/dropbear/dropbear_rsa_host_key ] || keygen
-
- . /lib/functions.sh
- . /lib/functions/network.sh
-@@ -121,7 +125,19 @@ start_service()
-
- service_triggers()
- {
-- procd_add_reload_trigger "dropbear"
-+ local interfaces
-+
-+ procd_add_config_trigger "config.change" "dropbear" /etc/init.d/dropbear reload
-+
-+ config_load "${NAME}"
-+ config_foreach load_interfaces dropbear
-+
-+ [ -n "${interfaces}" ] & {
-+ for n in $interfaces ; do
-+ procd_add_interface_trigger "interface.*" $n /etc/init.d/dropbear reload
-+ done
-+ }
-+
- procd_add_validation validate_section_dropbear
- }
-
-diff --git a/package/network/services/dropbear/patches/100-pubkey_path.patch b/package/network/services/dropbear/patches/100-pubkey_path.patch
-index 456874b730272f157bd3f4b2e9f65e14eda49b0b..41fdc1adab96cf9efffa8593000336c504fdf6fb 100644
---- a/package/network/services/dropbear/patches/100-pubkey_path.patch
-+++ b/package/network/services/dropbear/patches/100-pubkey_path.patch
-@@ -1,6 +1,6 @@
- --- a/svr-authpubkey.c
- +++ b/svr-authpubkey.c
--@@ -208,17 +208,21 @@ static int checkpubkey(unsigned char* al
-+@@ -218,17 +218,21 @@ static int checkpubkey(char* algo, unsig
- goto out;
- }
-
-@@ -33,7 +33,7 @@
- if (authfile == NULL) {
- goto out;
- }
--@@ -371,26 +375,35 @@ static int checkpubkeyperms() {
-+@@ -381,26 +385,35 @@ static int checkpubkeyperms() {
- goto out;
- }
-
-diff --git a/package/network/services/dropbear/patches/110-change_user.patch b/package/network/services/dropbear/patches/110-change_user.patch
-index 7982af631539e351d3d46f50541115f9311612db..4b5c1cb51bb16a7229c03b6298796769e5752f6b 100644
---- a/package/network/services/dropbear/patches/110-change_user.patch
-+++ b/package/network/services/dropbear/patches/110-change_user.patch
-@@ -1,6 +1,6 @@
- --- a/svr-chansession.c
- +++ b/svr-chansession.c
--@@ -920,12 +920,12 @@ static void execchild(void *user_data) {
-+@@ -922,12 +922,12 @@ static void execchild(void *user_data) {
- /* We can only change uid/gid as root ... */
- if (getuid() == 0) {
-
-diff --git a/package/network/services/dropbear/patches/120-openwrt_options.patch b/package/network/services/dropbear/patches/120-openwrt_options.patch
-index 48dae73b1f7bcb052172f0a8d22d06203c80f993..f16aaf001eee11811be81fa1db399cf117e66595 100644
---- a/package/network/services/dropbear/patches/120-openwrt_options.patch
-+++ b/package/network/services/dropbear/patches/120-openwrt_options.patch
-@@ -18,7 +18,28 @@
-
- /* Whether to support "-c" and "-m" flags to choose ciphers/MACs at runtime */
- #define ENABLE_USER_ALGO_LIST
--@@ -126,9 +126,9 @@ much traffic. */
-+@@ -91,16 +91,16 @@ much traffic. */
-+ * Including multiple keysize variants the same cipher
-+ * (eg AES256 as well as AES128) will result in a minimal size increase.*/
-+ #define DROPBEAR_AES128
-+-#define DROPBEAR_3DES
-++/*#define DROPBEAR_3DES*/
-+ #define DROPBEAR_AES256
-+ /* Compiling in Blowfish will add ~6kB to runtime heap memory usage */
-+ /*#define DROPBEAR_BLOWFISH*/
-+-#define DROPBEAR_TWOFISH256
-+-#define DROPBEAR_TWOFISH128
-++/*#define DROPBEAR_TWOFISH256*/
-++/*#define DROPBEAR_TWOFISH128*/
-+
-+ /* Enable CBC mode for ciphers. This has security issues though
-+ * is the most compatible with older SSH implementations */
-+-#define DROPBEAR_ENABLE_CBC_MODE
-++/*#define DROPBEAR_ENABLE_CBC_MODE*/
-+
-+ /* Enable "Counter Mode" for ciphers. This is more secure than normal
-+ * CBC mode against certain attacks. It is recommended for security
-+@@ -131,9 +131,9 @@ If you test it please contact the Dropbe
- * If you disable MD5, Dropbear will fall back to SHA1 fingerprints,
- * which are not the standard form. */
- #define DROPBEAR_SHA1_HMAC
-@@ -31,7 +52,16 @@
- #define DROPBEAR_MD5_HMAC
-
- /* You can also disable integrity. Don't bother disabling this if you're
--@@ -184,7 +184,7 @@ much traffic. */
-+@@ -146,7 +146,7 @@ If you test it please contact the Dropbe
-+ * Removing either of these won't save very much space.
-+ * SSH2 RFC Draft requires dss, recommends rsa */
-+ #define DROPBEAR_RSA
-+-#define DROPBEAR_DSS
-++/*#define DROPBEAR_DSS*/
-+ /* ECDSA is significantly faster than RSA or DSS. Compiling in ECC
-+ * code (either ECDSA or ECDH) increases binary size - around 30kB
-+ * on x86-64 */
-+@@ -194,7 +194,7 @@ If you test it please contact the Dropbe
-
- /* Whether to print the message of the day (MOTD). This doesn't add much code
- * size */
-@@ -40,7 +70,7 @@
-
- /* The MOTD file path */
- #ifndef MOTD_FILENAME
--@@ -226,7 +226,7 @@ much traffic. */
-+@@ -242,7 +242,7 @@ Homedir is prepended unless path begins
- * note that it will be provided for all "hidden" client-interactive
- * style prompts - if you want something more sophisticated, use
- * SSH_ASKPASS instead. Comment out this var to remove this functionality.*/
-diff --git a/package/network/services/dropbear/patches/130-ssh_ignore_o_and_x_args.patch b/package/network/services/dropbear/patches/130-ssh_ignore_o_and_x_args.patch
-deleted file mode 100644
-index edb29093aece5423554ccd406e34b41466c25511..0000000000000000000000000000000000000000
---- a/package/network/services/dropbear/patches/130-ssh_ignore_o_and_x_args.patch
-+++ /dev/null
-@@ -1,21 +0,0 @@
----- a/cli-runopts.c
--+++ b/cli-runopts.c
--@@ -315,6 +315,10 @@ void cli_getopts(int argc, char ** argv)
-- debug_trace = 1;
-- break;
-- #endif
--+ case 'o':
--+ next = &dummy;
--+ case 'x':
--+ break;
-- case 'F':
-- case 'e':
-- #ifndef ENABLE_USER_ALGO_LIST
--@@ -332,7 +336,6 @@ void cli_getopts(int argc, char ** argv)
-- print_version();
-- exit(EXIT_SUCCESS);
-- break;
--- case 'o':
-- case 'b':
-- next = &dummy;
-- default:
-diff --git a/package/network/services/dropbear/patches/130-ssh_ignore_x_args.patch b/package/network/services/dropbear/patches/130-ssh_ignore_x_args.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..ab09c2f3dc3a253fd18acae8d7d3b4b0f668e3dd
---- /dev/null
-+++ b/package/network/services/dropbear/patches/130-ssh_ignore_x_args.patch
-@@ -0,0 +1,11 @@
-+--- a/cli-runopts.c
-++++ b/cli-runopts.c
-+@@ -296,6 +296,8 @@ void cli_getopts(int argc, char ** argv)
-+ debug_trace = 1;
-+ break;
-+ #endif
-++ case 'x':
-++ break;
-+ case 'F':
-+ case 'e':
-+ #ifndef ENABLE_USER_ALGO_LIST
-diff --git a/package/network/services/dropbear/patches/140-disable_assert.patch b/package/network/services/dropbear/patches/140-disable_assert.patch
-index 0717228ef3de0576967b3824ca9709f95a326f61..78b54acfa0f52a4abbae497ed57a04cca7368c41 100644
---- a/package/network/services/dropbear/patches/140-disable_assert.patch
-+++ b/package/network/services/dropbear/patches/140-disable_assert.patch
-@@ -1,6 +1,6 @@
- --- a/dbutil.h
- +++ b/dbutil.h
--@@ -101,7 +101,11 @@ int m_str_to_uint(const char* str, unsig
-+@@ -78,7 +78,11 @@ int m_str_to_uint(const char* str, unsig
- #define DEF_MP_INT(X) mp_int X = {0, 0, 0, NULL}
-
- /* Dropbear assertion */
-diff --git a/package/network/services/dropbear/patches/150-dbconvert_standalone.patch b/package/network/services/dropbear/patches/150-dbconvert_standalone.patch
-index 367dc2c68122f382273464fc7bf570fde18386ab..ccc2cb792598de77b4db6aa7b7b46e8eb7bf93a5 100644
---- a/package/network/services/dropbear/patches/150-dbconvert_standalone.patch
-+++ b/package/network/services/dropbear/patches/150-dbconvert_standalone.patch
-@@ -1,8 +1,8 @@
- --- a/options.h
- +++ b/options.h
- @@ -5,6 +5,11 @@
-- #ifndef _OPTIONS_H_
-- #define _OPTIONS_H_
-+ #ifndef DROPBEAR_OPTIONS_H_
-+ #define DROPBEAR_OPTIONS_H_
-
- +#if !defined(DROPBEAR_CLIENT) && !defined(DROPBEAR_SERVER)
- +#define DROPBEAR_SERVER
-diff --git a/package/network/services/dropbear/patches/500-set-default-path.patch b/package/network/services/dropbear/patches/500-set-default-path.patch
-index e2add9415fd4e7884a007ce7337ee8026bcc62a7..da6b9ae0ce0ae6a270f8c7bc6152cf09efbee15d 100644
---- a/package/network/services/dropbear/patches/500-set-default-path.patch
-+++ b/package/network/services/dropbear/patches/500-set-default-path.patch
-@@ -1,11 +1,12 @@
- --- a/options.h
- +++ b/options.h
--@@ -336,7 +336,7 @@ be overridden at runtime with -I. 0 disa
-+@@ -352,7 +352,9 @@ be overridden at runtime with -I. 0 disa
- #define DEFAULT_IDLE_TIMEOUT 0
-
- /* The default path. This will often get replaced by the shell */
---#define DEFAULT_PATH "/usr/bin:/bin"
--+#define DEFAULT_PATH "/bin:/sbin:/usr/bin:/usr/sbin"
-++#ifndef DEFAULT_PATH
-+ #define DEFAULT_PATH "/usr/bin:/bin"
-++#endif
-
- /* Some other defines (that mostly should be left alone) are defined
- * in sysoptions.h */
diff --git a/patches/openwrt/0068-ar71xx-Added-support-for-TL-WA801NDv3.patch b/patches/openwrt/0068-ar71xx-Added-support-for-TL-WA801NDv3.patch
deleted file mode 100644
index 9c0ad5abf32c032dcc37bb4f7792a837f48f0a30..0000000000000000000000000000000000000000
--- a/patches/openwrt/0068-ar71xx-Added-support-for-TL-WA801NDv3.patch
+++ /dev/null
@@ -1,567 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Mon, 22 Aug 2016 23:55:22 +0200
-Subject: ar71xx: Added support for TL-WA801NDv3
-
-Signed-off-by: Tiziano Bacocco <tizbac2@gmail.com>
-
-Backport of OpenWrt r48705
-
-diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
-index 6c3ecf54dccd111231d93e539346f7839252794c..027a671215e5acd70cee06620c6648506ad6be47 100755
---- a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
-+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
-@@ -377,6 +377,7 @@ wp543)
- ucidef_set_interface_lan "eth0"
- ;;
-
-+tl-wa801nd-v3 |\
- dir-505-a1)
- ucidef_set_interface_lan "eth1"
- ;;
-diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
-index 0d8ccd21c3f552b7ae7aff6905a08ff6a4fdadf7..5928439f3ae253fc15eeb2ac30451ff467411e88 100755
---- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
-+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
-@@ -838,6 +838,9 @@ ar71xx_board_detect() {
- *"TL-WA801ND v2")
- name="tl-wa801nd-v2"
- ;;
-+ *"TL-WA801ND v3")
-+ name="tl-wa801nd-v3"
-+ ;;
- *TL-WA901ND)
- name="tl-wa901nd"
- ;;
-diff --git a/target/linux/ar71xx/config-3.18 b/target/linux/ar71xx/config-3.18
-index d4d92738d0ab010e1d43ebed0baef34fd9bc3f9d..d7cbe2e79af31a0ff88d946323e237f3215620a0 100644
---- a/target/linux/ar71xx/config-3.18
-+++ b/target/linux/ar71xx/config-3.18
-@@ -120,6 +120,7 @@ CONFIG_ATH79_MACH_TL_MR3020=y
- CONFIG_ATH79_MACH_TL_MR3X20=y
- CONFIG_ATH79_MACH_TL_WA701ND_V2=y
- CONFIG_ATH79_MACH_TL_WA7210N_V2=y
-+CONFIG_ATH79_MACH_TL_WA801ND_V3=y
- CONFIG_ATH79_MACH_TL_WA830RE_V2=y
- CONFIG_ATH79_MACH_TL_WA901ND=y
- CONFIG_ATH79_MACH_TL_WA901ND_V2=y
-diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wa801nd-v3.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wa801nd-v3.c
-new file mode 100644
-index 0000000000000000000000000000000000000000..39cdb10ee340650bc69e4f6054b06a4ae7421e57
---- /dev/null
-+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wa801nd-v3.c
-@@ -0,0 +1,136 @@
-+/*
-+ * TP-LINK TL-WA801ND v3 adapted from TP-LINK TL-WR841N/ND v9
-+ *
-+ * Copyright (C) 2014 Matthias Schiffer <mschiffer@universe-factory.net>
-+ * Copyright (C) 2016 Tiziano Bacocco <tizbac2@gmail.com>
-+ *
-+ * This program is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 as published
-+ * by the Free Software Foundation.
-+ */
-+
-+#include <linux/gpio.h>
-+#include <linux/platform_device.h>
-+
-+#include <asm/mach-ath79/ath79.h>
-+#include <asm/mach-ath79/ar71xx_regs.h>
-+
-+#include "common.h"
-+#include "dev-eth.h"
-+#include "dev-gpio-buttons.h"
-+#include "dev-leds-gpio.h"
-+#include "dev-m25p80.h"
-+#include "dev-wmac.h"
-+#include "machtypes.h"
-+
-+#define TL_WA801NDV3_GPIO_LED_WLAN 12
-+#define TL_WA801NDV3_GPIO_LED_QSS 13
-+#define TL_WA801NDV3_GPIO_LED_SECURITY_RED 11
-+#define TL_WA801NDV3_GPIO_LED_SECURITY_GREEN 15
-+#define TL_WA801NDV3_GPIO_LED_LAN 3
-+
-+#define TL_WA801NDV3_GPIO_BTN_RESET 2
-+#define TL_WA801NDV3_GPIO_BTN_WIFI 1
-+
-+#define TL_WA801NDV3_KEYS_POLL_INTERVAL 20 /* msecs */
-+#define TL_WA801NDV3_KEYS_DEBOUNCE_INTERVAL (3 * TL_WA801NDV3_KEYS_POLL_INTERVAL)
-+
-+static const char *tl_wa801n_v3_part_probes[] = {
-+ "tp-link",
-+ NULL,
-+};
-+
-+static struct flash_platform_data tl_wa801n_v3_flash_data = {
-+ .part_probes = tl_wa801n_v3_part_probes,
-+};
-+
-+static struct gpio_led tl_wa801n_v3_leds_gpio[] __initdata = {
-+ {
-+ .name = "tp-link:green:qss",
-+ .gpio = TL_WA801NDV3_GPIO_LED_QSS,
-+ .active_low = 1,
-+ }, {
-+ .name = "tp-link:green:lan",
-+ .gpio = TL_WA801NDV3_GPIO_LED_LAN,
-+ .active_low = 1,
-+ }, {
-+ .name = "tp-link:green:wlan",
-+ .gpio = TL_WA801NDV3_GPIO_LED_WLAN,
-+ .active_low = 1,
-+ }, {
-+ .name = "tp-link:red:security",
-+ .gpio = TL_WA801NDV3_GPIO_LED_SECURITY_RED,
-+ .active_low = 0,
-+ }, {
-+ .name = "tp-link:green:security",
-+ .gpio = TL_WA801NDV3_GPIO_LED_SECURITY_GREEN,
-+ .active_low = 0,
-+ }
-+
-+};
-+
-+static struct gpio_keys_button tl_wa801n_v3_gpio_keys[] __initdata = {
-+ {
-+ .desc = "Reset button",
-+ .type = EV_KEY,
-+ .code = KEY_RESTART,
-+ .debounce_interval = TL_WA801NDV3_KEYS_DEBOUNCE_INTERVAL,
-+ .gpio = TL_WA801NDV3_GPIO_BTN_RESET,
-+ .active_low = 1,
-+ }, {
-+ .desc = "WIFI button",
-+ .type = EV_KEY,
-+ .code = KEY_RFKILL,
-+ .debounce_interval = TL_WA801NDV3_KEYS_DEBOUNCE_INTERVAL,
-+ .gpio = TL_WA801NDV3_GPIO_BTN_WIFI,
-+ .active_low = 1,
-+ }
-+};
-+
-+
-+static void __init tl_ap143_setup(void)
-+{
-+ u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
-+ u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
-+ u8 tmpmac[ETH_ALEN];
-+
-+ ath79_register_m25p80(&tl_wa801n_v3_flash_data);
-+
-+ ath79_setup_ar933x_phy4_switch(false, false);
-+
-+ ath79_register_mdio(0, 0x0);
-+
-+ /* LAN */
-+ ath79_eth1_data.phy_if_mode = PHY_INTERFACE_MODE_GMII;
-+ ath79_eth1_data.duplex = DUPLEX_FULL;
-+ ath79_switch_data.phy_poll_mask |= BIT(4);
-+ ath79_init_mac(ath79_eth1_data.mac_addr, mac, 0);
-+ ath79_register_eth(1);
-+
-+ /* WAN */
-+ ath79_switch_data.phy4_mii_en = 1;
-+ ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_MII;
-+ ath79_eth0_data.duplex = DUPLEX_FULL;
-+ ath79_eth0_data.speed = SPEED_100;
-+ ath79_eth0_data.phy_mask = BIT(4);
-+ ath79_init_mac(ath79_eth0_data.mac_addr, mac, 1);
-+ ath79_register_eth(0);
-+
-+ ath79_init_mac(tmpmac, mac, 0);
-+ ath79_register_wmac(ee, tmpmac);
-+}
-+
-+static void __init tl_wa801n_v3_setup(void)
-+{
-+ tl_ap143_setup();
-+
-+ ath79_register_leds_gpio(-1, ARRAY_SIZE(tl_wa801n_v3_leds_gpio),
-+ tl_wa801n_v3_leds_gpio);
-+
-+ ath79_register_gpio_keys_polled(1, TL_WA801NDV3_KEYS_POLL_INTERVAL,
-+ ARRAY_SIZE(tl_wa801n_v3_gpio_keys),
-+ tl_wa801n_v3_gpio_keys);
-+}
-+
-+MIPS_MACHINE(ATH79_MACH_TL_WA801ND_V3, "TL-WA801ND-v3", "TP-LINK TL-WA801ND v3",
-+ tl_wa801n_v3_setup);
-diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
-index bb2bb94e04ee8f59db62907ace49952061b411dc..868a5021acb49878359497c90509de07faa3ca49 100644
---- a/target/linux/ar71xx/image/Makefile
-+++ b/target/linux/ar71xx/image/Makefile
-@@ -691,6 +691,13 @@ define Device/tl-wa801nd-v2
- TPLINK_HWID := 0x08010002
- endef
-
-+define Device/tl-wa801nd-v3
-+ $(Device/tplink-4mlzma)
-+ BOARDNAME := TL-WA801ND-v3
-+ DEVICE_PROFILE := TLWA801
-+ TPLINK_HWID := 0x08010003
-+endef
-+
- define Device/tl-wa830re-v2
- $(Device/tplink-4mlzma)
- BOARDNAME := TL-WA830RE-v2
-@@ -711,7 +718,7 @@ define Device/tl-wa860re-v1
- DEVICE_PROFILE := TLWA860
- TPLINK_HWID := 0x08600001
- endef
--TARGET_DEVICES += tl-wa801nd-v2 tl-wa830re-v2 tl-wa850re-v1 tl-wa860re-v1
-+TARGET_DEVICES += tl-wa801nd-v2 tl-wa801nd-v3 tl-wa830re-v2 tl-wa850re-v1 tl-wa860re-v1
-
- define Device/tl-wa901nd-v3
- $(Device/tplink-4mlzma)
-diff --git a/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch b/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch
-index c83ac2e89324deda3135aab84e8c4f4112ea728d..d23f0cf33e50da891e7135861f1defda047ff2c8 100644
---- a/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch
-+++ b/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch
-@@ -1,6 +1,6 @@
- --- a/arch/mips/ath79/machtypes.h
- +++ b/arch/mips/ath79/machtypes.h
--@@ -16,22 +16,204 @@
-+@@ -16,22 +16,205 @@
-
- enum ath79_mach_type {
- ATH79_MACH_GENERIC = 0,
-@@ -127,6 +127,7 @@
- + ATH79_MACH_TL_WA850RE, /* TP-LINK TL-WA850RE */
- + ATH79_MACH_TL_WA860RE, /* TP-LINK TL-WA860RE */
- + ATH79_MACH_TL_WA801ND_V2, /* TP-LINK TL-WA801ND v2 */
-++ ATH79_MACH_TL_WA801ND_V3, /* TP-LINK TL-WA801ND v3 */
- + ATH79_MACH_TL_WA830RE_V2, /* TP-LINK TL-WA830RE v2 */
- + ATH79_MACH_TL_WA901ND, /* TP-LINK TL-WA901ND */
- + ATH79_MACH_TL_WA901ND_V2, /* TP-LINK TL-WA901ND v2 */
-@@ -287,17 +288,10 @@
- config ATH79_MACH_AP121
- bool "Atheros AP121 reference board"
- select SOC_AR933X
--@@ -11,62 +84,1051 @@ config ATH79_MACH_AP121
-- select ATH79_DEV_M25P80
-- select ATH79_DEV_USB
-- select ATH79_DEV_WMAC
--- help
--- Say 'Y' here if you want your kernel to support the
--- Atheros AP121 reference board.
--+ help
--+ Say 'Y' here if you want your kernel to support the
--+ Atheros AP121 reference board.
--+
-+@@ -15,13 +88,25 @@ config ATH79_MACH_AP121
-+ Say 'Y' here if you want your kernel to support the
-+ Atheros AP121 reference board.
-+
- +config ATH79_MACH_AP132
- + bool "Atheros AP132 reference board"
- + select SOC_QCA955X
-@@ -310,32 +304,21 @@
- + Say 'Y' here if you want your kernel to support the
- + Atheros AP132 reference boards.
- +
--+config ATH79_MACH_AP136
--+ bool "Atheros AP136/AP135 reference board"
--+ select SOC_QCA955X
--+ select ATH79_DEV_GPIO_BUTTONS
--+ select ATH79_DEV_LEDS_GPIO
--+ select ATH79_DEV_NFC
--+ select ATH79_DEV_M25P80
--+ select ATH79_DEV_USB
--+ select ATH79_DEV_WMAC
--+ help
--+ Say 'Y' here if you want your kernel to support the
--+ Atheros AP136 or AP135 reference boards.
--+
--+config ATH79_MACH_AP81
--+ bool "Atheros AP81 reference board"
--+ select SOC_AR913X
--+ select ATH79_DEV_ETH
--+ select ATH79_DEV_GPIO_BUTTONS
--+ select ATH79_DEV_LEDS_GPIO
-+ config ATH79_MACH_AP136
-+ bool "Atheros AP136/AP135 reference board"
-+ select SOC_QCA955X
-+ select ATH79_DEV_GPIO_BUTTONS
-+ select ATH79_DEV_LEDS_GPIO
-+ select ATH79_DEV_NFC
-+- select ATH79_DEV_SPI
- + select ATH79_DEV_M25P80
--+ select ATH79_DEV_USB
--+ select ATH79_DEV_WMAC
--+ help
--+ Say 'Y' here if you want your kernel to support the
--+ Atheros AP81 reference board.
--+
-+ select ATH79_DEV_USB
-+ select ATH79_DEV_WMAC
-+ help
-+@@ -41,6 +126,24 @@ config ATH79_MACH_AP81
-+ Say 'Y' here if you want your kernel to support the
-+ Atheros AP81 reference board.
-+
- +config ATH79_MACH_AP83
- + bool "Atheros AP83 board support"
- + select SOC_AR913X
-@@ -354,21 +337,13 @@
- + select ATH79_DEV_M25P80
- + select ATH79_DEV_USB
- +
--+config ATH79_MACH_DB120
--+ bool "Atheros DB120 reference board"
--+ select SOC_AR934X
--+ select ATH79_DEV_AP9X_PCI if PCI
--+ select ATH79_DEV_ETH
--+ select ATH79_DEV_GPIO_BUTTONS
--+ select ATH79_DEV_LEDS_GPIO
--+ select ATH79_DEV_M25P80
--+ select ATH79_DEV_NFC
--+ select ATH79_DEV_USB
--+ select ATH79_DEV_WMAC
--+ help
--+ Say 'Y' here if you want your kernel to support the
--+ Atheros DB120 reference board.
--+
-+ config ATH79_MACH_DB120
-+ bool "Atheros DB120 reference board"
-+ select SOC_AR934X
-+@@ -56,6 +159,13 @@ config ATH79_MACH_DB120
-+ Say 'Y' here if you want your kernel to support the
-+ Atheros DB120 reference board.
-+
- +config ATH79_MACH_PB42
- + bool "Atheros PB42 board support"
- + select SOC_AR71XX
-@@ -376,18 +351,13 @@
- + select ATH79_DEV_GPIO_BUTTONS
- + select ATH79_DEV_M25P80
- +
--+config ATH79_MACH_PB44
--+ bool "Atheros PB44 reference board"
--+ select SOC_AR71XX
--+ select ATH79_DEV_ETH
--+ select ATH79_DEV_GPIO_BUTTONS
--+ select ATH79_DEV_LEDS_GPIO
--+ select ATH79_DEV_SPI
--+ select ATH79_DEV_USB
--+ help
--+ Say 'Y' here if you want your kernel to support the
--+ Atheros PB44 reference board.
--+
-+ config ATH79_MACH_PB44
-+ bool "Atheros PB44 reference board"
-+ select SOC_AR71XX
-+@@ -68,6 +178,967 @@ config ATH79_MACH_PB44
-+ Say 'Y' here if you want your kernel to support the
-+ Atheros PB44 reference board.
-+
- +config ATH79_MACH_PB92
- + bool "Atheros PB92 board support"
- + select SOC_AR724X
-@@ -1113,6 +1083,15 @@
- + select ATH79_DEV_M25P80
- + select ATH79_DEV_WMAC
- +
-++config ATH79_MACH_TL_WA801ND_V3
-++ bool "TP-LINK TL-WA801ND v3 support"
-++ select SOC_QCA953X
-++ select ATH79_DEV_ETH
-++ select ATH79_DEV_GPIO_BUTTONS
-++ select ATH79_DEV_LEDS_GPIO
-++ select ATH79_DEV_M25P80
-++ select ATH79_DEV_WMAC
-++
- +config ATH79_MACH_TL_WA830RE_V2
- + bool "TP-LINK TL-WA830RE v2 support"
- + select SOC_AR934X
-@@ -1172,28 +1151,17 @@
- + select ATH79_DEV_M25P80
- + select ATH79_DEV_USB
- + select ATH79_DEV_WMAC
--
---config ATH79_MACH_AP136
--- bool "Atheros AP136/AP135 reference board"
--- select SOC_QCA955X
-++
- +config ATH79_MACH_TL_WR720N_V3
- + bool "TP-LINK TL-WR720N v3/v4 support"
- + select SOC_AR933X
- + select ATH79_DEV_ETH
-- select ATH79_DEV_GPIO_BUTTONS
-- select ATH79_DEV_LEDS_GPIO
--- select ATH79_DEV_NFC
--- select ATH79_DEV_SPI
-++ select ATH79_DEV_GPIO_BUTTONS
-++ select ATH79_DEV_LEDS_GPIO
- + select ATH79_DEV_M25P80
-- select ATH79_DEV_USB
-- select ATH79_DEV_WMAC
--- help
--- Say 'Y' here if you want your kernel to support the
--- Atheros AP136 or AP135 reference boards.
--
---config ATH79_MACH_AP81
--- bool "Atheros AP81 reference board"
--- select SOC_AR913X
-++ select ATH79_DEV_USB
-++ select ATH79_DEV_WMAC
-++
- +config ATH79_MACH_TL_WR741ND
- + bool "TP-LINK TL-WR741ND support"
- + select SOC_AR724X
-@@ -1206,18 +1174,13 @@
- +config ATH79_MACH_TL_WR741ND_V4
- + bool "TP-LINK TL-WR741ND v4/TL-MR3220 v2 support"
- + select SOC_AR933X
-- select ATH79_DEV_ETH
-- select ATH79_DEV_GPIO_BUTTONS
-- select ATH79_DEV_LEDS_GPIO
-- select ATH79_DEV_M25P80
-- select ATH79_DEV_USB
-- select ATH79_DEV_WMAC
--- help
--- Say 'Y' here if you want your kernel to support the
--- Atheros AP81 reference board.
--
---config ATH79_MACH_DB120
--- bool "Atheros DB120 reference board"
-++ select ATH79_DEV_ETH
-++ select ATH79_DEV_GPIO_BUTTONS
-++ select ATH79_DEV_LEDS_GPIO
-++ select ATH79_DEV_M25P80
-++ select ATH79_DEV_USB
-++ select ATH79_DEV_WMAC
-++
- +config ATH79_MACH_TL_WR841N_V1
- + bool "TP-LINK TL-WR841N v1 support"
- + select SOC_AR71XX
-@@ -1268,21 +1231,15 @@
- +
- +config ATH79_MACH_TL_WR1041N_V2
- + bool "TP-LINK TL-WR1041N v2 support"
-- select SOC_AR934X
-- select ATH79_DEV_AP9X_PCI if PCI
-- select ATH79_DEV_ETH
-- select ATH79_DEV_GPIO_BUTTONS
-- select ATH79_DEV_LEDS_GPIO
-- select ATH79_DEV_M25P80
--- select ATH79_DEV_NFC
-- select ATH79_DEV_USB
-- select ATH79_DEV_WMAC
--- help
--- Say 'Y' here if you want your kernel to support the
--- Atheros DB120 reference board.
--
---config ATH79_MACH_PB44
--- bool "Atheros PB44 reference board"
-++ select SOC_AR934X
-++ select ATH79_DEV_AP9X_PCI if PCI
-++ select ATH79_DEV_ETH
-++ select ATH79_DEV_GPIO_BUTTONS
-++ select ATH79_DEV_LEDS_GPIO
-++ select ATH79_DEV_M25P80
-++ select ATH79_DEV_USB
-++ select ATH79_DEV_WMAC
-++
- +config ATH79_MACH_TL_WR1043ND
- + bool "TP-LINK TL-WR1043ND support"
- + select SOC_AR913X
-@@ -1325,12 +1282,11 @@
- +
- +config ATH79_MACH_TEW_673GRU
- + bool "TRENDnet TEW-673GRU support"
-- select SOC_AR71XX
-++ select SOC_AR71XX
- + select ATH79_DEV_AP9X_PCI if PCI
-- select ATH79_DEV_ETH
-- select ATH79_DEV_GPIO_BUTTONS
-- select ATH79_DEV_LEDS_GPIO
--- select ATH79_DEV_SPI
-++ select ATH79_DEV_ETH
-++ select ATH79_DEV_GPIO_BUTTONS
-++ select ATH79_DEV_LEDS_GPIO
- + select ATH79_DEV_M25P80
- + select ATH79_DEV_USB
- + select ATH79_NVRAM
-@@ -1361,14 +1317,12 @@
- + select ATH79_DEV_GPIO_BUTTONS
- + select ATH79_DEV_LEDS_GPIO
- + select ATH79_DEV_M25P80
-- select ATH79_DEV_USB
--- help
--- Say 'Y' here if you want your kernel to support the
--- Atheros PB44 reference board.
--
-++ select ATH79_DEV_USB
-++
- config ATH79_MACH_UBNT_XM
- bool "Ubiquiti Networks XM/UniFi boards"
--@@ -83,6 +1145,117 @@ config ATH79_MACH_UBNT_XM
-+ select SOC_AR724X
-+@@ -83,6 +1154,117 @@ config ATH79_MACH_UBNT_XM
- Say 'Y' here if you want your kernel to support the
- Ubiquiti Networks XM (rev 1.0) board.
-
-@@ -1486,7 +1440,7 @@
- endmenu
-
- config SOC_AR71XX
--@@ -124,7 +1297,10 @@ config ATH79_DEV_DSA
-+@@ -124,7 +1306,10 @@ config ATH79_DEV_DSA
- config ATH79_DEV_ETH
- def_bool n
-
-@@ -1498,7 +1452,7 @@
- def_bool n
-
- config ATH79_DEV_GPIO_BUTTONS
--@@ -154,6 +1330,11 @@ config ATH79_PCI_ATH9K_FIXUP
-+@@ -154,6 +1339,11 @@ config ATH79_PCI_ATH9K_FIXUP
- def_bool n
-
- config ATH79_ROUTERBOOT
-@@ -1512,7 +1466,7 @@
- endif
- --- a/arch/mips/ath79/Makefile
- +++ b/arch/mips/ath79/Makefile
--@@ -38,9 +38,129 @@ obj-$(CONFIG_ATH79_ROUTERBOOT) += route
-+@@ -38,9 +38,130 @@ obj-$(CONFIG_ATH79_ROUTERBOOT) += route
- #
- # Machines
- #
-@@ -1595,6 +1549,7 @@
- +obj-$(CONFIG_ATH79_MACH_TL_WA701ND_V2) += mach-tl-wa701nd-v2.o
- +obj-$(CONFIG_ATH79_MACH_TL_WA7210N_V2) += mach-tl-wa7210n-v2.o
- +obj-$(CONFIG_ATH79_MACH_TL_WA830RE_V2) += mach-tl-wa830re-v2.o
-++obj-$(CONFIG_ATH79_MACH_TL_WA801ND_V3) += mach-tl-wa801nd-v3.o
- +obj-$(CONFIG_ATH79_MACH_TL_WA901ND) += mach-tl-wa901nd.o
- +obj-$(CONFIG_ATH79_MACH_TL_WA901ND_V2) += mach-tl-wa901nd-v2.o
- +obj-$(CONFIG_ATH79_MACH_TL_WDR3500) += mach-tl-wdr3500.o
-diff --git a/tools/firmware-utils/src/mktplinkfw.c b/tools/firmware-utils/src/mktplinkfw.c
-index 6df869d59a6138d4c0dd1fbec5337a71c31eccd3..9785a3f232ed4457e77aee249c0da86b4e99c532 100644
---- a/tools/firmware-utils/src/mktplinkfw.c
-+++ b/tools/firmware-utils/src/mktplinkfw.c
-@@ -50,6 +50,7 @@
- #define HWID_TL_WA830RE_V1 0x08300010
- #define HWID_TL_WA830RE_V2 0x08300002
- #define HWID_TL_WA801ND_V2 0x08010002
-+#define HWID_TL_WA801ND_V3 0x08010003
- #define HWID_TL_WA901ND_V1 0x09010001
- #define HWID_TL_WA901ND_V2 0x09010002
- #define HWID_TL_WA901ND_V4 0x09010004
-@@ -296,6 +297,11 @@ static struct board_info boards[] = {
- .hw_id = HWID_TL_WA801ND_V2,
- .hw_rev = 1,
- .layout_id = "4Mlzma",
-+ },{
-+ .id = "TL-WA801NDv3",
-+ .hw_id = HWID_TL_WA801ND_V3,
-+ .hw_rev = 1,
-+ .layout_id = "4Mlzma",
- }, {
- .id = "TL-WA901NDv1",
- .hw_id = HWID_TL_WA901ND_V1,
-@@ -1207,4 +1213,3 @@ int main(int argc, char *argv[])
- out:
- return ret;
- }
--
diff --git a/patches/openwrt/0069-firmware-utils-mktplinkfw-backport-from-LEDE-a4fc62bc0ea4010ddbfbd738453c9db70988a57c.patch b/patches/openwrt/0069-firmware-utils-mktplinkfw-backport-from-LEDE-a4fc62bc0ea4010ddbfbd738453c9db70988a57c.patch
deleted file mode 100644
index 9c91219c770dcba82e59e66298034cd9197f3eda..0000000000000000000000000000000000000000
--- a/patches/openwrt/0069-firmware-utils-mktplinkfw-backport-from-LEDE-a4fc62bc0ea4010ddbfbd738453c9db70988a57c.patch
+++ /dev/null
@@ -1,856 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Sun, 28 Aug 2016 20:20:35 +0200
-Subject: firmware-utils: mktplinkfw: backport from LEDE a4fc62bc0ea4010ddbfbd738453c9db70988a57c
-
-diff --git a/tools/firmware-utils/Makefile b/tools/firmware-utils/Makefile
-index 03978456636ad50fc8128c0a5a51845135301a3d..aee8e87a1c0839f3220686e97cd8458516fc17cf 100644
---- a/tools/firmware-utils/Makefile
-+++ b/tools/firmware-utils/Makefile
-@@ -40,7 +40,7 @@ define Host/Compile
- $(call cc,encode_crc)
- $(call cc,nand_ecc)
- $(call cc,mkplanexfw sha1)
-- $(call cc,mktplinkfw md5)
-+ $(call cc,mktplinkfw md5, -Wall)
- $(call cc,mktplinkfw2 md5)
- $(call cc,tplink-safeloader md5, -Wall)
- $(call cc,pc1crypt)
-diff --git a/tools/firmware-utils/src/mktplinkfw.c b/tools/firmware-utils/src/mktplinkfw.c
-index 9785a3f232ed4457e77aee249c0da86b4e99c532..34e6546a2d7db72748146ef233830c2e8de9ce97 100644
---- a/tools/firmware-utils/src/mktplinkfw.c
-+++ b/tools/firmware-utils/src/mktplinkfw.c
-@@ -28,53 +28,10 @@
- #include "md5.h"
-
- #define ALIGN(x,a) ({ typeof(a) __a = (a); (((x) + __a - 1) & ~(__a - 1)); })
-+#define ARRAY_SIZE(a) (sizeof((a)) / sizeof((a)[0]))
-
- #define HEADER_VERSION_V1 0x01000000
--#define HWID_ANTMINER_S1 0x04440101
--#define HWID_ANTMINER_S3 0x04440301
--#define HWID_GL_INET_V1 0x08000001
--#define HWID_GS_OOLITE_V1 0x3C000101
--#define HWID_ONION_OMEGA 0x04700001
--#define HWID_TL_MR10U_V1 0x00100101
--#define HWID_TL_MR13U_V1 0x00130101
--#define HWID_TL_MR3020_V1 0x30200001
--#define HWID_TL_MR3220_V1 0x32200001
--#define HWID_TL_MR3220_V2 0x32200002
--#define HWID_TL_MR3420_V1 0x34200001
--#define HWID_TL_MR3420_V2 0x34200002
--#define HWID_TL_WA701N_V1 0x07010001
--#define HWID_TL_WA701N_V2 0x07010002
--#define HWID_TL_WA7210N_V2 0x72100002
--#define HWID_TL_WA7510N_V1 0x75100001
--#define HWID_TL_WA801ND_V1 0x08010001
--#define HWID_TL_WA830RE_V1 0x08300010
--#define HWID_TL_WA830RE_V2 0x08300002
--#define HWID_TL_WA801ND_V2 0x08010002
--#define HWID_TL_WA801ND_V3 0x08010003
--#define HWID_TL_WA901ND_V1 0x09010001
--#define HWID_TL_WA901ND_V2 0x09010002
--#define HWID_TL_WA901ND_V4 0x09010004
--#define HWID_TL_WDR4300_V1_IL 0x43008001
--#define HWID_TL_WDR4900_V1 0x49000001
--#define HWID_TL_WR703N_V1 0x07030101
--#define HWID_TL_WR720N_V3 0x07200103
--#define HWID_TL_WR720N_V4 0x07200104
--#define HWID_TL_WR741ND_V1 0x07410001
--#define HWID_TL_WR741ND_V4 0x07410004
--#define HWID_TL_WR740N_V1 0x07400001
--#define HWID_TL_WR740N_V3 0x07400003
--#define HWID_TL_WR743ND_V1 0x07430001
--#define HWID_TL_WR743ND_V2 0x07430002
--#define HWID_TL_WR841N_V1_5 0x08410002
--#define HWID_TL_WR841ND_V3 0x08410003
--#define HWID_TL_WR841ND_V5 0x08410005
--#define HWID_TL_WR841ND_V7 0x08410007
--#define HWID_TL_WR941ND_V2 0x09410002
--#define HWID_TL_WR941ND_V4 0x09410004
--#define HWID_TL_WR1043ND_V1 0x10430001
--#define HWID_TL_WR1043ND_V2 0x10430002
--#define HWID_TL_WR1041N_V2 0x10410002
--#define HWID_TL_WR2543N_V1 0x25430001
-+#define HEADER_VERSION_V2 0x02000000
-
- #define MD5SUM_LEN 16
-
-@@ -89,7 +46,7 @@ struct fw_header {
- char fw_version[36];
- uint32_t hw_id; /* hardware id */
- uint32_t hw_rev; /* hardware revision */
-- uint32_t unk1;
-+ uint32_t region_code; /* region code */
- uint8_t md5sum1[MD5SUM_LEN];
- uint32_t unk2;
- uint8_t md5sum2[MD5SUM_LEN];
-@@ -106,7 +63,10 @@ struct fw_header {
- uint16_t ver_hi;
- uint16_t ver_mid;
- uint16_t ver_lo;
-- uint8_t pad[354];
-+ uint8_t pad[130];
-+ char region_str1[32];
-+ char region_str2[32];
-+ uint8_t pad2[160];
- } __attribute__ ((packed));
-
- struct flash_layout {
-@@ -117,13 +77,12 @@ struct flash_layout {
- uint32_t rootfs_ofs;
- };
-
--struct board_info {
-- char *id;
-- uint32_t hw_id;
-- uint32_t hw_rev;
-- char *layout_id;
-+struct fw_region {
-+ char name[4];
-+ uint32_t code;
- };
-
-+
- /*
- * Globals
- */
-@@ -132,15 +91,17 @@ static char *progname;
- static char *vendor = "TP-LINK Technologies";
- static char *version = "ver. 1.0";
- static char *fw_ver = "0.0.0";
-+static uint32_t hdr_ver = HEADER_VERSION_V1;
-
--static char *board_id;
--static struct board_info *board;
- static char *layout_id;
- static struct flash_layout *layout;
- static char *opt_hw_id;
- static uint32_t hw_id;
- static char *opt_hw_rev;
- static uint32_t hw_rev;
-+static uint32_t opt_hdr_ver = 1;
-+static char *country;
-+static const struct fw_region *region;
- static int fw_ver_lo;
- static int fw_ver_mid;
- static int fw_ver_hi;
-@@ -163,12 +124,12 @@ static uint32_t reserved_space;
- static struct file_info inspect_info;
- static int extract = 0;
-
--char md5salt_normal[MD5SUM_LEN] = {
-+static const char md5salt_normal[MD5SUM_LEN] = {
- 0xdc, 0xd7, 0x3a, 0xa5, 0xc3, 0x95, 0x98, 0xfb,
- 0xdd, 0xf9, 0xe7, 0xf4, 0x0e, 0xae, 0x47, 0x38,
- };
-
--char md5salt_boot[MD5SUM_LEN] = {
-+static const char md5salt_boot[MD5SUM_LEN] = {
- 0x8c, 0xef, 0x33, 0x5b, 0xd5, 0xc5, 0xce, 0xfa,
- 0xa7, 0x9c, 0x28, 0xda, 0xb2, 0xe9, 0x0f, 0x42,
- };
-@@ -213,7 +174,7 @@ static struct flash_layout layouts[] = {
- }, {
- .id = "16Mppc",
- .fw_max_len = 0xf80000,
-- .kernel_la = 0x00000000,
-+ .kernel_la = 0x00000000 ,
- .kernel_ep = 0xc0000000,
- .rootfs_ofs = 0x2a0000,
- }, {
-@@ -221,235 +182,10 @@ static struct flash_layout layouts[] = {
- }
- };
-
--static struct board_info boards[] = {
-- {
-- .id = "TL-MR10Uv1",
-- .hw_id = HWID_TL_MR10U_V1,
-- .hw_rev = 1,
-- .layout_id = "4Mlzma",
-- }, {
-- .id = "TL-MR13Uv1",
-- .hw_id = HWID_TL_MR13U_V1,
-- .hw_rev = 1,
-- .layout_id = "4Mlzma",
-- }, {
-- .id = "TL-MR3020v1",
-- .hw_id = HWID_TL_MR3020_V1,
-- .hw_rev = 1,
-- .layout_id = "4Mlzma",
-- }, {
-- .id = "TL-MR3220v1",
-- .hw_id = HWID_TL_MR3220_V1,
-- .hw_rev = 1,
-- .layout_id = "4M",
-- }, {
-- .id = "TL-MR3220v2",
-- .hw_id = HWID_TL_MR3220_V2,
-- .hw_rev = 1,
-- .layout_id = "4Mlzma",
-- }, {
-- .id = "TL-MR3420v1",
-- .hw_id = HWID_TL_MR3420_V1,
-- .hw_rev = 1,
-- .layout_id = "4M",
-- }, {
-- .id = "TL-MR3420v2",
-- .hw_id = HWID_TL_MR3420_V2,
-- .hw_rev = 1,
-- .layout_id = "4Mlzma",
-- }, {
-- .id = "TL-WA701Nv1",
-- .hw_id = HWID_TL_WA701N_V1,
-- .hw_rev = 1,
-- .layout_id = "4M",
-- }, {
-- .id = "TL-WA701Nv2",
-- .hw_id = HWID_TL_WA701N_V2,
-- .hw_rev = 1,
-- .layout_id = "4Mlzma",
-- }, {
-- .id = "TL-WA7210N",
-- .hw_id = HWID_TL_WA7210N_V2,
-- .hw_rev = 2,
-- .layout_id = "4Mlzma",
-- }, {
-- .id = "TL-WA7510N",
-- .hw_id = HWID_TL_WA7510N_V1,
-- .hw_rev = 1,
-- .layout_id = "4M",
-- }, {
-- .id = "TL-WA801NDv1",
-- .hw_id = HWID_TL_WA801ND_V1,
-- .hw_rev = 1,
-- .layout_id = "4M",
-- }, {
-- .id = "TL-WA830REv1",
-- .hw_id = HWID_TL_WA830RE_V1,
-- .hw_rev = 1,
-- .layout_id = "4M",
-- }, {
-- .id = "TL-WA830REv2",
-- .hw_id = HWID_TL_WA830RE_V2,
-- .hw_rev = 1,
-- .layout_id = "4M",
-- }, {
-- .id = "TL-WA801NDv2",
-- .hw_id = HWID_TL_WA801ND_V2,
-- .hw_rev = 1,
-- .layout_id = "4Mlzma",
-- },{
-- .id = "TL-WA801NDv3",
-- .hw_id = HWID_TL_WA801ND_V3,
-- .hw_rev = 1,
-- .layout_id = "4Mlzma",
-- }, {
-- .id = "TL-WA901NDv1",
-- .hw_id = HWID_TL_WA901ND_V1,
-- .hw_rev = 1,
-- .layout_id = "4M",
-- }, {
-- .id = "TL-WA901NDv2",
-- .hw_id = HWID_TL_WA901ND_V2,
-- .hw_rev = 1,
-- .layout_id = "4M",
-- }, {
-- .id = "TL-WA901NDv4",
-- .hw_id = HWID_TL_WA901ND_V4,
-- .hw_rev = 1,
-- .layout_id = "4Mlzma",
-- }, {
-- .id = "TL-WDR4300v1",
-- .hw_id = HWID_TL_WDR4300_V1_IL,
-- .hw_rev = 1,
-- .layout_id = "8Mlzma",
-- }, {
-- .id = "TL-WDR4900v1",
-- .hw_id = HWID_TL_WDR4900_V1,
-- .hw_rev = 1,
-- .layout_id = "16Mppc",
-- }, {
-- .id = "TL-WR741NDv1",
-- .hw_id = HWID_TL_WR741ND_V1,
-- .hw_rev = 1,
-- .layout_id = "4M",
-- }, {
-- .id = "TL-WR741NDv4",
-- .hw_id = HWID_TL_WR741ND_V4,
-- .hw_rev = 1,
-- .layout_id = "4Mlzma",
-- }, {
-- .id = "TL-WR740Nv1",
-- .hw_id = HWID_TL_WR740N_V1,
-- .hw_rev = 1,
-- .layout_id = "4M",
-- }, {
-- .id = "TL-WR740Nv3",
-- .hw_id = HWID_TL_WR740N_V3,
-- .hw_rev = 1,
-- .layout_id = "4M",
-- }, {
-- .id = "TL-WR743NDv1",
-- .hw_id = HWID_TL_WR743ND_V1,
-- .hw_rev = 1,
-- .layout_id = "4M",
-- }, {
-- .id = "TL-WR743NDv2",
-- .hw_id = HWID_TL_WR743ND_V2,
-- .hw_rev = 1,
-- .layout_id = "4Mlzma",
-- }, {
-- .id = "TL-WR841Nv1.5",
-- .hw_id = HWID_TL_WR841N_V1_5,
-- .hw_rev = 2,
-- .layout_id = "4M",
-- }, {
-- .id = "TL-WR841NDv3",
-- .hw_id = HWID_TL_WR841ND_V3,
-- .hw_rev = 3,
-- .layout_id = "4M",
-- }, {
-- .id = "TL-WR841NDv5",
-- .hw_id = HWID_TL_WR841ND_V5,
-- .hw_rev = 1,
-- .layout_id = "4M",
-- }, {
-- .id = "TL-WR841NDv7",
-- .hw_id = HWID_TL_WR841ND_V7,
-- .hw_rev = 1,
-- .layout_id = "4M",
-- }, {
-- .id = "TL-WR941NDv2",
-- .hw_id = HWID_TL_WR941ND_V2,
-- .hw_rev = 2,
-- .layout_id = "4M",
-- }, {
-- .id = "TL-WR941NDv4",
-- .hw_id = HWID_TL_WR941ND_V4,
-- .hw_rev = 1,
-- .layout_id = "4M",
-- }, {
-- .id = "TL-WR1041Nv2",
-- .hw_id = HWID_TL_WR1041N_V2,
-- .hw_rev = 1,
-- .layout_id = "4Mlzma",
-- }, {
-- .id = "TL-WR1043NDv1",
-- .hw_id = HWID_TL_WR1043ND_V1,
-- .hw_rev = 1,
-- .layout_id = "8M",
-- }, {
-- .id = "TL-WR1043NDv2",
-- .hw_id = HWID_TL_WR1043ND_V2,
-- .hw_rev = 1,
-- .layout_id = "8Mlzma",
-- }, {
-- .id = "TL-WR2543Nv1",
-- .hw_id = HWID_TL_WR2543N_V1,
-- .hw_rev = 1,
-- .layout_id = "8Mlzma",
-- }, {
-- .id = "TL-WR703Nv1",
-- .hw_id = HWID_TL_WR703N_V1,
-- .hw_rev = 1,
-- .layout_id = "4Mlzma",
-- }, {
-- .id = "TL-WR720Nv3",
-- .hw_id = HWID_TL_WR720N_V3,
-- .hw_rev = 1,
-- .layout_id = "4Mlzma",
-- }, {
-- .id = "TL-WR720Nv4",
-- .hw_id = HWID_TL_WR720N_V4,
-- .hw_rev = 1,
-- .layout_id = "4Mlzma",
-- }, {
-- .id = "GL-INETv1",
-- .hw_id = HWID_GL_INET_V1,
-- .hw_rev = 1,
-- .layout_id = "8Mlzma",
-- }, {
-- .id = "GS-OOLITEv1",
-- .hw_id = HWID_GS_OOLITE_V1,
-- .hw_rev = 1,
-- .layout_id = "16Mlzma",
-- }, {
-- .id = "ONION-OMEGA",
-- .hw_id = HWID_ONION_OMEGA,
-- .hw_rev = 1,
-- .layout_id = "16Mlzma",
-- }, {
-- .id = "ANTMINER-S1",
-- .hw_id = HWID_ANTMINER_S1,
-- .hw_rev = 1,
-- .layout_id = "8Mlzma",
-- }, {
-- .id = "ANTMINER-S3",
-- .hw_id = HWID_ANTMINER_S3,
-- .hw_rev = 1,
-- .layout_id = "8Mlzma",
-- }, {
-- /* terminating entry */
-- }
-+static const struct fw_region regions[] = {
-+ /* Default region (universal) uses code 0 as well */
-+ {"US", 1},
-+ {"EU", 0},
- };
-
- /*
-@@ -464,7 +200,7 @@ static struct board_info boards[] = {
- #define ERRS(fmt, ...) do { \
- int save = errno; \
- fflush(0); \
-- fprintf(stderr, "[%s] *** error: " fmt "\n", \
-+ fprintf(stderr, "[%s] *** error: " fmt ": %s\n", \
- progname, ## __VA_ARGS__, strerror(save)); \
- } while (0)
-
-@@ -472,35 +208,7 @@ static struct board_info boards[] = {
- fprintf(stderr, "[%s] " fmt "\n", progname, ## __VA_ARGS__ ); \
- } while (0)
-
--static struct board_info *find_board(char *id)
--{
-- struct board_info *ret;
-- struct board_info *board;
--
-- ret = NULL;
-- for (board = boards; board->id != NULL; board++){
-- if (strcasecmp(id, board->id) == 0) {
-- ret = board;
-- break;
-- }
-- };
--
-- return ret;
--}
--
--static struct board_info *find_board_by_hwid(uint32_t hw_id)
--{
-- struct board_info *board;
--
-- for (board = boards; board->id != NULL; board++) {
-- if (hw_id == board->hw_id)
-- return board;
-- };
--
-- return NULL;
--}
--
--static struct flash_layout *find_layout(char *id)
-+static struct flash_layout *find_layout(const char *id)
- {
- struct flash_layout *ret;
- struct flash_layout *l;
-@@ -516,21 +224,29 @@ static struct flash_layout *find_layout(char *id)
- return ret;
- }
-
-+static const struct fw_region * find_region(const char *country) {
-+ size_t i;
-+
-+ for (i = 0; i < ARRAY_SIZE(regions); i++) {
-+ if (strcasecmp(regions[i].name, country) == 0)
-+ return ®ions[i];
-+ }
-+
-+ return NULL;
-+}
-+
- static void usage(int status)
- {
-- FILE *stream = (status != EXIT_SUCCESS) ? stderr : stdout;
-- struct board_info *board;
--
-- fprintf(stream, "Usage: %s [OPTIONS...]\n", progname);
-- fprintf(stream,
-+ fprintf(stderr, "Usage: %s [OPTIONS...]\n", progname);
-+ fprintf(stderr,
- "\n"
- "Options:\n"
--" -B <board> create image for the board specified with <board>\n"
- " -c use combined kernel image\n"
- " -E <ep> overwrite kernel entry point with <ep> (hexval prefixed with 0x)\n"
- " -L <la> overwrite kernel load address with <la> (hexval prefixed with 0x)\n"
- " -H <hwid> use hardware id specified with <hwid>\n"
- " -W <hwrev> use hardware revision specified with <hwrev>\n"
-+" -C <country> set region code to <country>\n"
- " -F <id> use flash layout specified with <id>\n"
- " -k <file> read kernel image from the file <file>\n"
- " -r <file> read rootfs image from the file <file>\n"
-@@ -543,6 +259,7 @@ static void usage(int status)
- " -N <vendor> set image vendor to <vendor>\n"
- " -V <version> set image version to <version>\n"
- " -v <version> set firmware version to <version>\n"
-+" -m <version> set header version to <version>\n"
- " -i <file> inspect given firmware file <file>\n"
- " -x extract kernel and rootfs while inspecting (requires -i)\n"
- " -X <size> reserve <size> bytes in the firmware image (hexval prefixed with 0x)\n"
-@@ -552,7 +269,7 @@ static void usage(int status)
- exit(status);
- }
-
--static int get_md5(char *data, int size, char *md5)
-+static void get_md5(const char *data, int size, uint8_t *md5)
- {
- MD5_CTX ctx;
-
-@@ -579,7 +296,7 @@ static int get_file_stat(struct file_info *fdata)
- return 0;
- }
-
--static int read_to_buf(struct file_info *fdata, char *buf)
-+static int read_to_buf(const struct file_info *fdata, char *buf)
- {
- FILE *f;
- int ret = EXIT_FAILURE;
-@@ -608,6 +325,7 @@ static int read_to_buf(struct file_info *fdata, char *buf)
- static int check_options(void)
- {
- int ret;
-+ int exceed_bytes;
-
- if (inspect_info.file_name) {
- ret = get_file_stat(&inspect_info);
-@@ -620,33 +338,28 @@ static int check_options(void)
- return -1;
- }
-
-- if (board_id == NULL && opt_hw_id == NULL) {
-- ERR("either board or hardware id must be specified");
-+ if (opt_hw_id == NULL) {
-+ ERR("hardware id not specified");
- return -1;
- }
-+ hw_id = strtoul(opt_hw_id, NULL, 0);
-
-- if (board_id) {
-- board = find_board(board_id);
-- if (board == NULL) {
-- ERR("unknown/unsupported board id \"%s\"", board_id);
-- return -1;
-- }
-- if (layout_id == NULL)
-- layout_id = board->layout_id;
-+ if (layout_id == NULL) {
-+ ERR("flash layout is not specified");
-+ return -1;
-+ }
-
-- hw_id = board->hw_id;
-- hw_rev = board->hw_rev;
-- } else {
-- if (layout_id == NULL) {
-- ERR("flash layout is not specified");
-+ if (opt_hw_rev)
-+ hw_rev = strtoul(opt_hw_rev, NULL, 0);
-+ else
-+ hw_rev = 1;
-+
-+ if (country) {
-+ region = find_region(country);
-+ if (!region) {
-+ ERR("unknown region code \"%s\"", country);
- return -1;
- }
-- hw_id = strtoul(opt_hw_id, NULL, 0);
--
-- if (opt_hw_rev)
-- hw_rev = strtoul(opt_hw_rev, NULL, 0);
-- else
-- hw_rev = 1;
- }
-
- layout = find_layout(layout_id);
-@@ -681,10 +394,10 @@ static int check_options(void)
- kernel_len = kernel_info.file_size;
-
- if (combined) {
-- if (kernel_info.file_size >
-- fw_max_len - sizeof(struct fw_header)) {
-+ exceed_bytes = kernel_info.file_size - (fw_max_len - sizeof(struct fw_header));
-+ if (exceed_bytes > 0) {
- if (!ignore_size) {
-- ERR("kernel image is too big");
-+ ERR("kernel image is too big by %i bytes", exceed_bytes);
- return -1;
- }
- layout->fw_max_len = sizeof(struct fw_header) +
-@@ -708,21 +421,21 @@ static int check_options(void)
-
- DBG("kernel length aligned to %u", kernel_len);
-
-- if (kernel_len + rootfs_info.file_size >
-- fw_max_len - sizeof(struct fw_header)) {
-- ERR("images are too big");
-+ exceed_bytes = kernel_len + rootfs_info.file_size - (fw_max_len - sizeof(struct fw_header));
-+ if (exceed_bytes > 0) {
-+ ERR("images are too big by %i bytes", exceed_bytes);
- return -1;
- }
- } else {
-- if (kernel_info.file_size >
-- rootfs_ofs - sizeof(struct fw_header)) {
-- ERR("kernel image is too big");
-+ exceed_bytes = kernel_info.file_size - (rootfs_ofs - sizeof(struct fw_header));
-+ if (exceed_bytes > 0) {
-+ ERR("kernel image is too big by %i bytes", exceed_bytes);
- return -1;
- }
-
-- if (rootfs_info.file_size >
-- (fw_max_len - rootfs_ofs)) {
-- ERR("rootfs image is too big");
-+ exceed_bytes = rootfs_info.file_size - (fw_max_len - rootfs_ofs);
-+ if (exceed_bytes > 0) {
-+ ERR("rootfs image is too big by %i bytes", exceed_bytes);
- return -1;
- }
- }
-@@ -739,6 +452,15 @@ static int check_options(void)
- return -1;
- }
-
-+ if (opt_hdr_ver == 1) {
-+ hdr_ver = HEADER_VERSION_V1;
-+ } else if (opt_hdr_ver == 2) {
-+ hdr_ver = HEADER_VERSION_V2;
-+ } else {
-+ ERR("invalid header version '%u'", opt_hdr_ver);
-+ return -1;
-+ }
-+
- return 0;
- }
-
-@@ -748,7 +470,7 @@ static void fill_header(char *buf, int len)
-
- memset(hdr, 0, sizeof(struct fw_header));
-
-- hdr->version = htonl(HEADER_VERSION_V1);
-+ hdr->version = htonl(hdr_ver);
- strncpy(hdr->vendor_name, vendor, sizeof(hdr->vendor_name));
- strncpy(hdr->fw_version, version, sizeof(hdr->fw_version));
- hdr->hw_id = htonl(hw_id);
-@@ -773,6 +495,18 @@ static void fill_header(char *buf, int len)
- hdr->ver_mid = htons(fw_ver_mid);
- hdr->ver_lo = htons(fw_ver_lo);
-
-+ if (region) {
-+ hdr->region_code = htonl(region->code);
-+ snprintf(
-+ hdr->region_str1, sizeof(hdr->region_str1), "00000000;%02X%02X%02X%02X;",
-+ region->name[0], region->name[1], region->name[2], region->name[3]
-+ );
-+ snprintf(
-+ hdr->region_str2, sizeof(hdr->region_str2), "%02X%02X%02X%02X",
-+ region->name[0], region->name[1], region->name[2], region->name[3]
-+ );
-+ }
-+
- get_md5(buf, len, hdr->md5sum1);
- }
-
-@@ -810,7 +544,7 @@ static int pad_jffs2(char *buf, int currlen)
- return len;
- }
-
--static int write_fw(char *data, int len)
-+static int write_fw(const char *data, int len)
- {
- FILE *f;
- int ret = EXIT_FAILURE;
-@@ -902,61 +636,22 @@ static int build_fw(void)
- }
-
- /* Helper functions to inspect_fw() representing different output formats */
--static inline void inspect_fw_pstr(char *label, char *str)
-+static inline void inspect_fw_pstr(const char *label, const char *str)
- {
- printf("%-23s: %s\n", label, str);
- }
-
--static inline void inspect_fw_phex(char *label, uint32_t val)
-+static inline void inspect_fw_phex(const char *label, uint32_t val)
- {
- printf("%-23s: 0x%08x\n", label, val);
- }
-
--static inline void inspect_fw_phexpost(char *label,
-- uint32_t val, char *post)
--{
-- printf("%-23s: 0x%08x (%s)\n", label, val, post);
--}
--
--static inline void inspect_fw_phexdef(char *label,
-- uint32_t val, uint32_t defval)
--{
-- printf("%-23s: 0x%08x ", label, val);
--
-- if (val == defval)
-- printf("(== OpenWrt default)\n");
-- else
-- printf("(OpenWrt default: 0x%08x)\n", defval);
--}
--
--static inline void inspect_fw_phexexp(char *label,
-- uint32_t val, uint32_t expval)
--{
-- printf("%-23s: 0x%08x ", label, val);
--
-- if (val == expval)
-- printf("(ok)\n");
-- else
-- printf("(expected: 0x%08x)\n", expval);
--}
--
--static inline void inspect_fw_phexdec(char *label, uint32_t val)
-+static inline void inspect_fw_phexdec(const char *label, uint32_t val)
- {
- printf("%-23s: 0x%08x / %8u bytes\n", label, val, val);
- }
-
--static inline void inspect_fw_phexdecdef(char *label,
-- uint32_t val, uint32_t defval)
--{
-- printf("%-23s: 0x%08x / %8u bytes ", label, val, val);
--
-- if (val == defval)
-- printf("(== OpenWrt default)\n");
-- else
-- printf("(OpenWrt default: 0x%08x)\n", defval);
--}
--
--static inline void inspect_fw_pmd5sum(char *label, uint8_t *val, char *text)
-+static inline void inspect_fw_pmd5sum(const char *label, const uint8_t *val, const char *text)
- {
- int i;
-
-@@ -971,7 +666,6 @@ static int inspect_fw(void)
- char *buf;
- struct fw_header *hdr;
- uint8_t md5sum[MD5SUM_LEN];
-- struct board_info *board;
- int ret = EXIT_FAILURE;
-
- buf = malloc(inspect_info.file_size);
-@@ -988,16 +682,14 @@ static int inspect_fw(void)
- inspect_fw_pstr("File name", inspect_info.file_name);
- inspect_fw_phexdec("File size", inspect_info.file_size);
-
-- if (ntohl(hdr->version) != HEADER_VERSION_V1) {
-- ERR("file does not seem to have V1 header!\n");
-+ if ((ntohl(hdr->version) != HEADER_VERSION_V1) &&
-+ (ntohl(hdr->version) != HEADER_VERSION_V2)) {
-+ ERR("file does not seem to have V1/V2 header!\n");
- goto out_free_buf;
- }
-
- inspect_fw_phexdec("Version 1 Header size", sizeof(struct fw_header));
-
-- if (ntohl(hdr->unk1) != 0)
-- inspect_fw_phexdec("Unknown value 1", hdr->unk1);
--
- memcpy(md5sum, hdr->md5sum1, sizeof(md5sum));
- if (ntohl(hdr->boot_len) == 0)
- memcpy(hdr->md5sum1, md5salt_normal, sizeof(md5sum));
-@@ -1022,19 +714,9 @@ static int inspect_fw(void)
-
- inspect_fw_pstr("Vendor name", hdr->vendor_name);
- inspect_fw_pstr("Firmware version", hdr->fw_version);
-- board = find_board_by_hwid(ntohl(hdr->hw_id));
-- if (board) {
-- layout = find_layout(board->layout_id);
-- inspect_fw_phexpost("Hardware ID",
-- ntohl(hdr->hw_id), board->id);
-- inspect_fw_phexexp("Hardware Revision",
-- ntohl(hdr->hw_rev), board->hw_rev);
-- } else {
-- inspect_fw_phexpost("Hardware ID",
-- ntohl(hdr->hw_id), "unknown");
-- inspect_fw_phex("Hardware Revision",
-- ntohl(hdr->hw_rev));
-- }
-+ inspect_fw_phex("Hardware ID", ntohl(hdr->hw_id));
-+ inspect_fw_phex("Hardware Revision", ntohl(hdr->hw_rev));
-+ inspect_fw_phex("Region code", ntohl(hdr->region_code));
-
- printf("\n");
-
-@@ -1042,24 +724,12 @@ static int inspect_fw(void)
- ntohl(hdr->kernel_ofs));
- inspect_fw_phexdec("Kernel data length",
- ntohl(hdr->kernel_len));
-- if (board) {
-- inspect_fw_phexdef("Kernel load address",
-- ntohl(hdr->kernel_la),
-- layout ? layout->kernel_la : 0xffffffff);
-- inspect_fw_phexdef("Kernel entry point",
-- ntohl(hdr->kernel_ep),
-- layout ? layout->kernel_ep : 0xffffffff);
-- inspect_fw_phexdecdef("Rootfs data offset",
-- ntohl(hdr->rootfs_ofs),
-- layout ? layout->rootfs_ofs : 0xffffffff);
-- } else {
-- inspect_fw_phex("Kernel load address",
-- ntohl(hdr->kernel_la));
-- inspect_fw_phex("Kernel entry point",
-- ntohl(hdr->kernel_ep));
-- inspect_fw_phexdec("Rootfs data offset",
-- ntohl(hdr->rootfs_ofs));
-- }
-+ inspect_fw_phex("Kernel load address",
-+ ntohl(hdr->kernel_la));
-+ inspect_fw_phex("Kernel entry point",
-+ ntohl(hdr->kernel_ep));
-+ inspect_fw_phexdec("Rootfs data offset",
-+ ntohl(hdr->rootfs_ofs));
- inspect_fw_phexdec("Rootfs data length",
- ntohl(hdr->rootfs_len));
- inspect_fw_phexdec("Boot loader data offset",
-@@ -1115,16 +785,13 @@ static int inspect_fw(void)
- int main(int argc, char *argv[])
- {
- int ret = EXIT_FAILURE;
-- int err;
--
-- FILE *outfile;
-
- progname = basename(argv[0]);
-
- while ( 1 ) {
- int c;
-
-- c = getopt(argc, argv, "a:B:H:E:F:L:V:N:W:ci:k:r:R:o:xX:hsSjv:");
-+ c = getopt(argc, argv, "a:H:E:F:L:m:V:N:W:C:ci:k:r:R:o:xX:hsSjv:");
- if (c == -1)
- break;
-
-@@ -1132,9 +799,6 @@ int main(int argc, char *argv[])
- case 'a':
- sscanf(optarg, "0x%x", &rootfs_align);
- break;
-- case 'B':
-- board_id = optarg;
-- break;
- case 'H':
- opt_hw_id = optarg;
- break;
-@@ -1147,9 +811,15 @@ int main(int argc, char *argv[])
- case 'W':
- opt_hw_rev = optarg;
- break;
-+ case 'C':
-+ country = optarg;
-+ break;
- case 'L':
- sscanf(optarg, "0x%x", &kernel_la);
- break;
-+ case 'm':
-+ sscanf(optarg, "%u", &opt_hdr_ver);
-+ break;
- case 'V':
- version = optarg;
- break;
diff --git a/patches/openwrt/0070-ar71xx-backport-support-for-new-TP-Link-region-codes.patch b/patches/openwrt/0070-ar71xx-backport-support-for-new-TP-Link-region-codes.patch
deleted file mode 100644
index 3e9dd9818ba8d3ab92f3ac6374d6393193579789..0000000000000000000000000000000000000000
--- a/patches/openwrt/0070-ar71xx-backport-support-for-new-TP-Link-region-codes.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Sun, 28 Aug 2016 20:38:58 +0200
-Subject: ar71xx: backport support for new TP-Link region codes
-
-Generate flashable images for the Archer C7 v2 with current stock firmware
-again.
-
-diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
-index 868a5021acb49878359497c90509de07faa3ca49..95f6d46d15b43faabb0bbf9301476d3ea5bee470 100644
---- a/target/linux/ar71xx/image/Makefile
-+++ b/target/linux/ar71xx/image/Makefile
-@@ -58,13 +58,14 @@ define Build/mktplinkfw
- -o $@.new \
- -j -X 0x40000 \
- -a $(call rootfs_align,$(FILESYSTEM)) \
-- $(if $(findstring sysupgrade,$1),-s) && mv $@.new $@ || rm -f $@
-+ $(wordlist 2,$(words $(1)),$(1)) \
-+ $(if $(findstring sysupgrade,$(word 1,$(1))),-s) && mv $@.new $@ || rm -f $@
- endef
-
- # -c combined image
- define Build/mktplinkfw-initramfs
- $(STAGING_DIR_HOST)/bin/mktplinkfw \
-- -H $(TPLINK_HWID) -W $(TPLINK_HWREV) -F $(TPLINK_FLASHLAYOUT) -N OpenWrt -V $(REVISION) \
-+ -H $(TPLINK_HWID) -W $(TPLINK_HWREV) -F $(TPLINK_FLASHLAYOUT) -N OpenWrt -V $(REVISION) $(1) \
- -k $@ \
- -o $@.new \
- -s -S \
-@@ -300,6 +301,9 @@ define Device/archer-c7-v2
- BOARDNAME := ARCHER-C7
- DEVICE_PROFILE := ARCHERC7
- TPLINK_HWID := 0xc7000002
-+ IMAGES := sysupgrade.bin factory.bin factory-us.bin factory-eu.bin
-+ IMAGE/factory-us.bin := append-rootfs | mktplinkfw factory -C US
-+ IMAGE/factory-eu.bin := append-rootfs | mktplinkfw factory -C EU
- endef
- TARGET_DEVICES += archer-c5 archer-c7-v1 archer-c7-v2
-
diff --git a/patches/openwrt/0071-ath10k-firmware-add-ath10k-firmware-qca988x-11s.patch b/patches/openwrt/0071-ath10k-firmware-add-ath10k-firmware-qca988x-11s.patch
deleted file mode 100644
index 46e178b7e491caa75d80affdfec357de3f1889a0..0000000000000000000000000000000000000000
--- a/patches/openwrt/0071-ath10k-firmware-add-ath10k-firmware-qca988x-11s.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Fri, 9 Sep 2016 01:54:44 +0200
-Subject: ath10k-firmware: add ath10k-firmware-qca988x-11s
-
-diff --git a/package/firmware/ath10k-firmware/Makefile b/package/firmware/ath10k-firmware/Makefile
-index 624da6a1ed43ea37bbb3409b3dbe4b3af01263b5..3a4f0c59eb89a32f78f0104d2420b921d6660ddc 100644
---- a/package/firmware/ath10k-firmware/Makefile
-+++ b/package/firmware/ath10k-firmware/Makefile
-@@ -8,7 +8,7 @@
- include $(TOPDIR)/rules.mk
-
- PKG_NAME:=ath10k-firmware
--PKG_SOURCE_VERSION:=b00eb8d30fbebb6a5047ccacefa8c37e072fca9c
-+PKG_SOURCE_VERSION:=307cb46b06661ebd3186723b5002de769c7add83
- PKG_VERSION:=2014-11-13-$(PKG_SOURCE_VERSION)
- PKG_RELEASE:=1
-
-@@ -104,6 +104,11 @@ $(Package/ath10k-firmware-default)
- TITLE:=ath10k firmware for QCA99x0 devices
- endef
-
-+define Package/ath10k-firmware-qca988x-11s
-+$(Package/ath10k-firmware-default)
-+ TITLE:=ath10k firmware for QCA988x devices (with 11s support)
-+endef
-+
- define Package/ath10k-firmware-qca988x-ct
- $(Package/ath10k-firmware-default)
- TITLE:=ath10k CT 10.1 firmware for QCA988x devices
-@@ -188,17 +193,27 @@ endef
- define Package/ath10k-firmware-qca988x/install
- $(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA988X/hw2.0
- $(INSTALL_DATA) \
-- $(PKG_BUILD_DIR)/QCA988X/board.bin \
-+ $(PKG_BUILD_DIR)/QCA988X/hw2.0/board.bin \
- $(1)/lib/firmware/ath10k/QCA988X/hw2.0/
- $(INSTALL_DATA) \
- $(DL_DIR)/$(QCA988X_FIRMWARE_FILE) \
- $(1)/lib/firmware/ath10k/QCA988X/hw2.0/firmware-5.bin
- endef
-
-+define Package/ath10k-firmware-qca988x-11s/install
-+ $(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA988X/hw2.0
-+ $(INSTALL_DATA) \
-+ $(PKG_BUILD_DIR)/QCA988X/hw2.0/board.bin \
-+ $(1)/lib/firmware/ath10k/QCA988X/hw2.0/
-+ $(INSTALL_DATA) \
-+ $(PKG_BUILD_DIR)/QCA988X/hw2.0/10.2.4.70/firmware-5.bin_10.2.4.70.54 \
-+ $(1)/lib/firmware/ath10k/QCA988X/hw2.0/firmware-5.bin
-+endef
-+
- define Package/ath10k-firmware-qca988x-ct/install
- $(INSTALL_DIR) $(1)/lib/firmware/ath10k/QCA988X/hw2.0
- $(INSTALL_DATA) \
-- $(PKG_BUILD_DIR)/QCA988X/board.bin \
-+ $(PKG_BUILD_DIR)/QCA988X/hw2.0/board.bin \
- $(1)/lib/firmware/ath10k/QCA988X/hw2.0/
- $(INSTALL_DATA) \
- $(DL_DIR)/$(QCA988X_FIRMWARE_FILE_CT) \
-@@ -268,6 +283,8 @@ $(eval $(call BuildPackage,ath10k-firmware-qca99x0))
- $(eval $(call BuildPackage,ath10k-firmware-qca6174))
- $(eval $(call BuildPackage,ath10k-firmware-qca9984))
-
-+$(eval $(call BuildPackage,ath10k-firmware-qca988x-11s))
-+
- $(eval $(call BuildPackage,ath10k-firmware-qca988x-ct))
- $(eval $(call BuildPackage,ath10k-firmware-qca99x0-ct))
- $(eval $(call BuildPackage,ath10k-firmware-qca9984-ct))
diff --git a/patches/openwrt/0072-ath9k-revert-temperature-compensation-support-patch-FS-111.patch b/patches/openwrt/0072-ath9k-revert-temperature-compensation-support-patch-FS-111.patch
deleted file mode 100644
index 9a6fb9b6b1061fac828e6f92f1801bf6e9e57624..0000000000000000000000000000000000000000
--- a/patches/openwrt/0072-ath9k-revert-temperature-compensation-support-patch-FS-111.patch
+++ /dev/null
@@ -1,124 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Tue, 11 Oct 2016 02:54:27 +0200
-Subject: ath9k: revert temperature compensation support patch (FS#111)
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
-
-Backport of LEDE 3e4d0e3e77dcf9b2116e5ed53f30e2bf53b1c6b7
-
-diff --git a/package/kernel/mac80211/patches/328-ath9k_hw-implement-temperature-compensation-support-.patch b/package/kernel/mac80211/patches/328-ath9k_hw-implement-temperature-compensation-support-.patch
-deleted file mode 100644
-index cff32ad47cb0b905d9cfa4eb021258b644b2a47a..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/328-ath9k_hw-implement-temperature-compensation-support-.patch
-+++ /dev/null
-@@ -1,97 +0,0 @@
--From: Felix Fietkau <nbd@nbd.name>
--Date: Mon, 11 Jul 2016 11:35:55 +0200
--Subject: [PATCH] ath9k_hw: implement temperature compensation support for
-- AR9003+
--
--Signed-off-by: Felix Fietkau <nbd@nbd.name>
-----
--
----- a/drivers/net/wireless/ath/ath9k/ar9003_calib.c
--+++ b/drivers/net/wireless/ath/ath9k/ar9003_calib.c
--@@ -33,6 +33,7 @@ struct coeff {
--
-- enum ar9003_cal_types {
-- IQ_MISMATCH_CAL = BIT(0),
--+ TEMP_COMP_CAL = BIT(1),
-- };
--
-- static void ar9003_hw_setup_calibration(struct ath_hw *ah,
--@@ -58,6 +59,12 @@ static void ar9003_hw_setup_calibration(
-- /* Kick-off cal */
-- REG_SET_BIT(ah, AR_PHY_TIMING4, AR_PHY_TIMING4_DO_CAL);
-- break;
--+ case TEMP_COMP_CAL:
--+ ath_dbg(common, CALIBRATE,
--+ "starting Temperature Compensation Calibration\n");
--+ REG_SET_BIT(ah, AR_CH0_THERM, AR_CH0_THERM_LOCAL);
--+ REG_SET_BIT(ah, AR_CH0_THERM, AR_CH0_THERM_START);
--+ break;
-- default:
-- ath_err(common, "Invalid calibration type\n");
-- break;
--@@ -86,7 +93,8 @@ static bool ar9003_hw_per_calibration(st
-- /*
-- * Accumulate cal measures for active chains
-- */
--- cur_caldata->calCollect(ah);
--+ if (cur_caldata->calCollect)
--+ cur_caldata->calCollect(ah);
-- ah->cal_samples++;
--
-- if (ah->cal_samples >= cur_caldata->calNumSamples) {
--@@ -99,7 +107,8 @@ static bool ar9003_hw_per_calibration(st
-- /*
-- * Process accumulated data
-- */
--- cur_caldata->calPostProc(ah, numChains);
--+ if (cur_caldata->calPostProc)
--+ cur_caldata->calPostProc(ah, numChains);
--
-- /* Calibration has finished. */
-- caldata->CalValid |= cur_caldata->calType;
--@@ -314,9 +323,16 @@ static const struct ath9k_percal_data iq
-- ar9003_hw_iqcalibrate
-- };
--
--+static const struct ath9k_percal_data temp_cal_single_sample = {
--+ TEMP_COMP_CAL,
--+ MIN_CAL_SAMPLES,
--+ PER_MAX_LOG_COUNT,
--+};
--+
-- static void ar9003_hw_init_cal_settings(struct ath_hw *ah)
-- {
-- ah->iq_caldata.calData = &iq_cal_single_sample;
--+ ah->temp_caldata.calData = &temp_cal_single_sample;
--
-- if (AR_SREV_9300_20_OR_LATER(ah)) {
-- ah->enabled_cals |= TX_IQ_CAL;
--@@ -324,7 +340,7 @@ static void ar9003_hw_init_cal_settings(
-- ah->enabled_cals |= TX_IQ_ON_AGC_CAL;
-- }
--
--- ah->supp_cals = IQ_MISMATCH_CAL;
--+ ah->supp_cals = IQ_MISMATCH_CAL | TEMP_COMP_CAL;
-- }
--
-- #define OFF_UPPER_LT 24
--@@ -1383,6 +1399,9 @@ static void ar9003_hw_init_cal_common(st
-- INIT_CAL(&ah->iq_caldata);
-- INSERT_CAL(ah, &ah->iq_caldata);
--
--+ INIT_CAL(&ah->temp_caldata);
--+ INSERT_CAL(ah, &ah->temp_caldata);
--+
-- /* Initialize current pointer to first element in list */
-- ah->cal_list_curr = ah->cal_list;
--
----- a/drivers/net/wireless/ath/ath9k/hw.h
--+++ b/drivers/net/wireless/ath/ath9k/hw.h
--@@ -830,6 +830,7 @@ struct ath_hw {
-- /* Calibration */
-- u32 supp_cals;
-- struct ath9k_cal_list iq_caldata;
--+ struct ath9k_cal_list temp_caldata;
-- struct ath9k_cal_list adcgain_caldata;
-- struct ath9k_cal_list adcdc_caldata;
-- struct ath9k_cal_list *cal_list;
-diff --git a/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch b/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch
-index 461564350feb43410e5c702a8a67514cdfaa3961..6edef0975431165285a7b937442b5d89b362c807 100644
---- a/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch
-+++ b/package/kernel/mac80211/patches/542-ath9k_debugfs_diag.patch
-@@ -84,7 +84,7 @@
- bool reset_power_on;
- bool htc_reset_init;
-
--@@ -1068,6 +1076,7 @@ void ath9k_hw_check_nav(struct ath_hw *a
-+@@ -1067,6 +1075,7 @@ void ath9k_hw_check_nav(struct ath_hw *a
- bool ath9k_hw_check_alive(struct ath_hw *ah);
-
- bool ath9k_hw_setpower(struct ath_hw *ah, enum ath9k_power_mode mode);
diff --git a/patches/openwrt/0073-ath9k-remove-intermediate-queueing-patch-until-it-is-fixed-properly.patch b/patches/openwrt/0073-ath9k-remove-intermediate-queueing-patch-until-it-is-fixed-properly.patch
deleted file mode 100644
index 28f9e7c8fc344938bb5cf41d109b37cfeaa88c2b..0000000000000000000000000000000000000000
--- a/patches/openwrt/0073-ath9k-remove-intermediate-queueing-patch-until-it-is-fixed-properly.patch
+++ /dev/null
@@ -1,885 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Thu, 13 Oct 2016 10:01:19 +0200
-Subject: ath9k: remove intermediate queueing patch until it is fixed properly
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
-
-Backport of LEDE 04a69843198f2252992812e35ac05016db4a1a94
-
-diff --git a/package/kernel/mac80211/patches/320-ath9k-Switch-to-using-mac80211-intermediate-software.patch b/package/kernel/mac80211/patches/320-ath9k-Switch-to-using-mac80211-intermediate-software.patch
-deleted file mode 100644
-index f8b8f86e03ba0786ef410db31d6de2ab691430bd..0000000000000000000000000000000000000000
---- a/package/kernel/mac80211/patches/320-ath9k-Switch-to-using-mac80211-intermediate-software.patch
-+++ /dev/null
-@@ -1,871 +0,0 @@
--From: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= <toke@toke.dk>
--Date: Wed, 6 Jul 2016 21:34:17 +0200
--Subject: [PATCH] ath9k: Switch to using mac80211 intermediate software queues.
--MIME-Version: 1.0
--Content-Type: text/plain; charset=UTF-8
--Content-Transfer-Encoding: 8bit
--
--This switches ath9k over to using the mac80211 intermediate software
--queueing mechanism for data packets. It removes the queueing inside the
--driver, except for the retry queue, and instead pulls from mac80211 when
--a packet is needed. The retry queue is used to store a packet that was
--pulled but can't be sent immediately.
--
--The old code path in ath_tx_start that would queue packets has been
--removed completely, as has the qlen limit tunables (since there's no
--longer a queue in the driver to limit).
--
--Based on Tim's original patch set, but reworked quite thoroughly.
--
--Cc: Tim Shepard <shep@alum.mit.edu>
--Cc: Felix Fietkau <nbd@nbd.name>
--Signed-off-by: Toke Høiland-Jørgensen <toke@toke.dk>
-----
--
----- a/drivers/net/wireless/ath/ath9k/ath9k.h
--+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
--@@ -91,7 +91,6 @@ int ath_descdma_setup(struct ath_softc *
-- #define ATH_RXBUF 512
-- #define ATH_TXBUF 512
-- #define ATH_TXBUF_RESERVE 5
---#define ATH_MAX_QDEPTH (ATH_TXBUF / 4 - ATH_TXBUF_RESERVE)
-- #define ATH_TXMAXTRY 13
-- #define ATH_MAX_SW_RETRIES 30
--
--@@ -145,7 +144,9 @@ int ath_descdma_setup(struct ath_softc *
-- #define BAW_WITHIN(_start, _bawsz, _seqno) \
-- ((((_seqno) - (_start)) & 4095) < (_bawsz))
--
---#define ATH_AN_2_TID(_an, _tidno) (&(_an)->tid[(_tidno)])
--+#define ATH_STA_2_TID(_sta, _tidno) ((struct ath_atx_tid *)(_sta)->txq[_tidno]->drv_priv)
--+#define ATH_VIF_2_TID(_vif) ((struct ath_atx_tid *)(_vif)->txq->drv_priv)
--+#define ATH_AN_2_TID(_an, _tidno) ((_an)->sta ? ATH_STA_2_TID((_an)->sta, _tidno) : ATH_VIF_2_TID((_an)->vif))
--
-- #define IS_HT_RATE(rate) (rate & 0x80)
-- #define IS_CCK_RATE(rate) ((rate >= 0x18) && (rate <= 0x1e))
--@@ -164,7 +165,6 @@ struct ath_txq {
-- spinlock_t axq_lock;
-- u32 axq_depth;
-- u32 axq_ampdu_depth;
--- bool stopped;
-- bool axq_tx_inprogress;
-- struct list_head txq_fifo[ATH_TXFIFO_DEPTH];
-- u8 txq_headidx;
--@@ -232,7 +232,6 @@ struct ath_buf {
--
-- struct ath_atx_tid {
-- struct list_head list;
--- struct sk_buff_head buf_q;
-- struct sk_buff_head retry_q;
-- struct ath_node *an;
-- struct ath_txq *txq;
--@@ -247,13 +246,13 @@ struct ath_atx_tid {
-- s8 bar_index;
-- bool active;
-- bool clear_ps_filter;
--+ bool has_queued;
-- };
--
-- struct ath_node {
-- struct ath_softc *sc;
-- struct ieee80211_sta *sta; /* station struct we're part of */
-- struct ieee80211_vif *vif; /* interface with which we're associated */
--- struct ath_atx_tid tid[IEEE80211_NUM_TIDS];
--
-- u16 maxampdu;
-- u8 mpdudensity;
--@@ -276,7 +275,6 @@ struct ath_tx_control {
-- struct ath_node *an;
-- struct ieee80211_sta *sta;
-- u8 paprd;
--- bool force_channel;
-- };
--
--
--@@ -293,7 +291,6 @@ struct ath_tx {
-- struct ath_descdma txdma;
-- struct ath_txq *txq_map[IEEE80211_NUM_ACS];
-- struct ath_txq *uapsdq;
--- u32 txq_max_pending[IEEE80211_NUM_ACS];
-- u16 max_aggr_framelen[IEEE80211_NUM_ACS][4][32];
-- };
--
--@@ -585,6 +582,7 @@ void ath9k_release_buffered_frames(struc
-- u16 tids, int nframes,
-- enum ieee80211_frame_release_type reason,
-- bool more_data);
--+void ath9k_wake_tx_queue(struct ieee80211_hw *hw, struct ieee80211_txq *queue);
--
-- /********/
-- /* VIFs */
----- a/drivers/net/wireless/ath/ath9k/channel.c
--+++ b/drivers/net/wireless/ath/ath9k/channel.c
--@@ -1007,7 +1007,6 @@ static void ath_scan_send_probe(struct a
-- goto error;
--
-- txctl.txq = sc->tx.txq_map[IEEE80211_AC_VO];
--- txctl.force_channel = true;
-- if (ath_tx_start(sc->hw, skb, &txctl))
-- goto error;
--
--@@ -1130,7 +1129,6 @@ ath_chanctx_send_vif_ps_frame(struct ath
-- memset(&txctl, 0, sizeof(txctl));
-- txctl.txq = sc->tx.txq_map[IEEE80211_AC_VO];
-- txctl.sta = sta;
--- txctl.force_channel = true;
-- if (ath_tx_start(sc->hw, skb, &txctl)) {
-- ieee80211_free_txskb(sc->hw, skb);
-- return false;
----- a/drivers/net/wireless/ath/ath9k/debug.c
--+++ b/drivers/net/wireless/ath/ath9k/debug.c
--@@ -600,7 +600,6 @@ static int read_file_xmit(struct seq_fil
-- PR("MPDUs XRetried: ", xretries);
-- PR("Aggregates: ", a_aggr);
-- PR("AMPDUs Queued HW:", a_queued_hw);
--- PR("AMPDUs Queued SW:", a_queued_sw);
-- PR("AMPDUs Completed:", a_completed);
-- PR("AMPDUs Retried: ", a_retries);
-- PR("AMPDUs XRetried: ", a_xretries);
--@@ -629,8 +628,7 @@ static void print_queue(struct ath_softc
-- seq_printf(file, "%s: %d ", "qnum", txq->axq_qnum);
-- seq_printf(file, "%s: %2d ", "qdepth", txq->axq_depth);
-- seq_printf(file, "%s: %2d ", "ampdu-depth", txq->axq_ampdu_depth);
--- seq_printf(file, "%s: %3d ", "pending", txq->pending_frames);
--- seq_printf(file, "%s: %d\n", "stopped", txq->stopped);
--+ seq_printf(file, "%s: %3d\n", "pending", txq->pending_frames);
--
-- ath_txq_unlock(sc, txq);
-- }
--@@ -1208,7 +1206,6 @@ static const char ath9k_gstrings_stats[]
-- AMKSTR(d_tx_mpdu_xretries),
-- AMKSTR(d_tx_aggregates),
-- AMKSTR(d_tx_ampdus_queued_hw),
--- AMKSTR(d_tx_ampdus_queued_sw),
-- AMKSTR(d_tx_ampdus_completed),
-- AMKSTR(d_tx_ampdu_retries),
-- AMKSTR(d_tx_ampdu_xretries),
--@@ -1288,7 +1285,6 @@ void ath9k_get_et_stats(struct ieee80211
-- AWDATA(xretries);
-- AWDATA(a_aggr);
-- AWDATA(a_queued_hw);
--- AWDATA(a_queued_sw);
-- AWDATA(a_completed);
-- AWDATA(a_retries);
-- AWDATA(a_xretries);
--@@ -1346,14 +1342,6 @@ int ath9k_init_debug(struct ath_hw *ah)
-- read_file_xmit);
-- debugfs_create_devm_seqfile(sc->dev, "queues", sc->debug.debugfs_phy,
-- read_file_queues);
--- debugfs_create_u32("qlen_bk", S_IRUSR | S_IWUSR, sc->debug.debugfs_phy,
--- &sc->tx.txq_max_pending[IEEE80211_AC_BK]);
--- debugfs_create_u32("qlen_be", S_IRUSR | S_IWUSR, sc->debug.debugfs_phy,
--- &sc->tx.txq_max_pending[IEEE80211_AC_BE]);
--- debugfs_create_u32("qlen_vi", S_IRUSR | S_IWUSR, sc->debug.debugfs_phy,
--- &sc->tx.txq_max_pending[IEEE80211_AC_VI]);
--- debugfs_create_u32("qlen_vo", S_IRUSR | S_IWUSR, sc->debug.debugfs_phy,
--- &sc->tx.txq_max_pending[IEEE80211_AC_VO]);
-- debugfs_create_devm_seqfile(sc->dev, "misc", sc->debug.debugfs_phy,
-- read_file_misc);
-- debugfs_create_devm_seqfile(sc->dev, "reset", sc->debug.debugfs_phy,
----- a/drivers/net/wireless/ath/ath9k/debug.h
--+++ b/drivers/net/wireless/ath/ath9k/debug.h
--@@ -147,7 +147,6 @@ struct ath_interrupt_stats {
-- * @completed: Total MPDUs (non-aggr) completed
-- * @a_aggr: Total no. of aggregates queued
-- * @a_queued_hw: Total AMPDUs queued to hardware
--- * @a_queued_sw: Total AMPDUs queued to software queues
-- * @a_completed: Total AMPDUs completed
-- * @a_retries: No. of AMPDUs retried (SW)
-- * @a_xretries: No. of AMPDUs dropped due to xretries
--@@ -174,7 +173,6 @@ struct ath_tx_stats {
-- u32 xretries;
-- u32 a_aggr;
-- u32 a_queued_hw;
--- u32 a_queued_sw;
-- u32 a_completed;
-- u32 a_retries;
-- u32 a_xretries;
----- a/drivers/net/wireless/ath/ath9k/debug_sta.c
--+++ b/drivers/net/wireless/ath/ath9k/debug_sta.c
--@@ -52,8 +52,8 @@ static ssize_t read_file_node_aggr(struc
-- "TID", "SEQ_START", "SEQ_NEXT", "BAW_SIZE",
-- "BAW_HEAD", "BAW_TAIL", "BAR_IDX", "SCHED", "PAUSED");
--
--- for (tidno = 0, tid = &an->tid[tidno];
--- tidno < IEEE80211_NUM_TIDS; tidno++, tid++) {
--+ for (tidno = 0; tidno < IEEE80211_NUM_TIDS; tidno++) {
--+ tid = ATH_STA_2_TID(an->sta, tidno);
-- txq = tid->txq;
-- ath_txq_lock(sc, txq);
-- if (tid->active) {
----- a/drivers/net/wireless/ath/ath9k/init.c
--+++ b/drivers/net/wireless/ath/ath9k/init.c
--@@ -358,7 +358,6 @@ static int ath9k_init_queues(struct ath_
-- for (i = 0; i < IEEE80211_NUM_ACS; i++) {
-- sc->tx.txq_map[i] = ath_txq_setup(sc, ATH9K_TX_QUEUE_DATA, i);
-- sc->tx.txq_map[i]->mac80211_qnum = i;
--- sc->tx.txq_max_pending[i] = ATH_MAX_QDEPTH;
-- }
-- return 0;
-- }
--@@ -873,6 +872,7 @@ static void ath9k_set_hw_capab(struct at
-- hw->max_rate_tries = 10;
-- hw->sta_data_size = sizeof(struct ath_node);
-- hw->vif_data_size = sizeof(struct ath_vif);
--+ hw->txq_data_size = sizeof(struct ath_atx_tid);
-- hw->extra_tx_headroom = 4;
--
-- hw->wiphy->available_antennas_rx = BIT(ah->caps.max_rxchains) - 1;
----- a/drivers/net/wireless/ath/ath9k/main.c
--+++ b/drivers/net/wireless/ath/ath9k/main.c
--@@ -2695,4 +2695,5 @@ struct ieee80211_ops ath9k_ops = {
-- .sw_scan_start = ath9k_sw_scan_start,
-- .sw_scan_complete = ath9k_sw_scan_complete,
-- .get_txpower = ath9k_get_txpower,
--+ .wake_tx_queue = ath9k_wake_tx_queue,
-- };
----- a/drivers/net/wireless/ath/ath9k/xmit.c
--+++ b/drivers/net/wireless/ath/ath9k/xmit.c
--@@ -65,6 +65,8 @@ static struct ath_buf *ath_tx_setup_buff
-- struct ath_txq *txq,
-- struct ath_atx_tid *tid,
-- struct sk_buff *skb);
--+static int ath_tx_prepare(struct ieee80211_hw *hw, struct sk_buff *skb,
--+ struct ath_tx_control *txctl);
--
-- enum {
-- MCS_HT20,
--@@ -118,6 +120,26 @@ static void ath_tx_queue_tid(struct ath_
-- list_add_tail(&tid->list, list);
-- }
--
--+void ath9k_wake_tx_queue(struct ieee80211_hw *hw, struct ieee80211_txq *queue)
--+{
--+ struct ath_softc *sc = hw->priv;
--+ struct ath_common *common = ath9k_hw_common(sc->sc_ah);
--+ struct ath_atx_tid *tid = (struct ath_atx_tid *) queue->drv_priv;
--+ struct ath_txq *txq = tid->txq;
--+
--+ ath_dbg(common, QUEUE, "Waking TX queue: %pM (%d)\n",
--+ queue->sta ? queue->sta->addr : queue->vif->addr,
--+ tid->tidno);
--+
--+ ath_txq_lock(sc, txq);
--+
--+ tid->has_queued = true;
--+ ath_tx_queue_tid(sc, txq, tid);
--+ ath_txq_schedule(sc, txq);
--+
--+ ath_txq_unlock(sc, txq);
--+}
--+
-- static struct ath_frame_info *get_frame_info(struct sk_buff *skb)
-- {
-- struct ieee80211_tx_info *tx_info = IEEE80211_SKB_CB(skb);
--@@ -160,7 +182,6 @@ static void ath_set_rates(struct ieee802
-- static void ath_txq_skb_done(struct ath_softc *sc, struct ath_txq *txq,
-- struct sk_buff *skb)
-- {
--- struct ieee80211_tx_info *info = IEEE80211_SKB_CB(skb);
-- struct ath_frame_info *fi = get_frame_info(skb);
-- int q = fi->txq;
--
--@@ -171,14 +192,6 @@ static void ath_txq_skb_done(struct ath_
-- if (WARN_ON(--txq->pending_frames < 0))
-- txq->pending_frames = 0;
--
--- if (txq->stopped &&
--- txq->pending_frames < sc->tx.txq_max_pending[q]) {
--- if (ath9k_is_chanctx_enabled())
--- ieee80211_wake_queue(sc->hw, info->hw_queue);
--- else
--- ieee80211_wake_queue(sc->hw, q);
--- txq->stopped = false;
--- }
-- }
--
-- static struct ath_atx_tid *
--@@ -188,9 +201,47 @@ ath_get_skb_tid(struct ath_softc *sc, st
-- return ATH_AN_2_TID(an, tidno);
-- }
--
--+static struct sk_buff *
--+ath_tid_pull(struct ath_atx_tid *tid)
--+{
--+ struct ath_softc *sc = tid->an->sc;
--+ struct ieee80211_hw *hw = sc->hw;
--+ struct ath_tx_control txctl = {
--+ .txq = tid->txq,
--+ .sta = tid->an->sta,
--+ };
--+ struct sk_buff *skb;
--+ struct ath_frame_info *fi;
--+ int q;
--+
--+ if (!tid->has_queued)
--+ return NULL;
--+
--+ skb = ieee80211_tx_dequeue(hw, container_of((void*)tid, struct ieee80211_txq, drv_priv));
--+ if (!skb) {
--+ tid->has_queued = false;
--+ return NULL;
--+ }
--+
--+ if (ath_tx_prepare(hw, skb, &txctl)) {
--+ ieee80211_free_txskb(hw, skb);
--+ return NULL;
--+ }
--+
--+ q = skb_get_queue_mapping(skb);
--+ if (tid->txq == sc->tx.txq_map[q]) {
--+ fi = get_frame_info(skb);
--+ fi->txq = q;
--+ ++tid->txq->pending_frames;
--+ }
--+
--+ return skb;
--+ }
--+
--+
-- static bool ath_tid_has_buffered(struct ath_atx_tid *tid)
-- {
--- return !skb_queue_empty(&tid->buf_q) || !skb_queue_empty(&tid->retry_q);
--+ return !skb_queue_empty(&tid->retry_q) || tid->has_queued;
-- }
--
-- static struct sk_buff *ath_tid_dequeue(struct ath_atx_tid *tid)
--@@ -199,46 +250,11 @@ static struct sk_buff *ath_tid_dequeue(s
--
-- skb = __skb_dequeue(&tid->retry_q);
-- if (!skb)
--- skb = __skb_dequeue(&tid->buf_q);
--+ skb = ath_tid_pull(tid);
--
-- return skb;
-- }
--
---/*
--- * ath_tx_tid_change_state:
--- * - clears a-mpdu flag of previous session
--- * - force sequence number allocation to fix next BlockAck Window
--- */
---static void
---ath_tx_tid_change_state(struct ath_softc *sc, struct ath_atx_tid *tid)
---{
--- struct ath_txq *txq = tid->txq;
--- struct ieee80211_tx_info *tx_info;
--- struct sk_buff *skb, *tskb;
--- struct ath_buf *bf;
--- struct ath_frame_info *fi;
---
--- skb_queue_walk_safe(&tid->buf_q, skb, tskb) {
--- fi = get_frame_info(skb);
--- bf = fi->bf;
---
--- tx_info = IEEE80211_SKB_CB(skb);
--- tx_info->flags &= ~IEEE80211_TX_CTL_AMPDU;
---
--- if (bf)
--- continue;
---
--- bf = ath_tx_setup_buffer(sc, txq, tid, skb);
--- if (!bf) {
--- __skb_unlink(skb, &tid->buf_q);
--- ath_txq_skb_done(sc, txq, skb);
--- ieee80211_free_txskb(sc->hw, skb);
--- continue;
--- }
--- }
---
---}
---
-- static void ath_tx_flush_tid(struct ath_softc *sc, struct ath_atx_tid *tid)
-- {
-- struct ath_txq *txq = tid->txq;
--@@ -873,20 +889,16 @@ static int ath_compute_num_delims(struct
--
-- static struct ath_buf *
-- ath_tx_get_tid_subframe(struct ath_softc *sc, struct ath_txq *txq,
--- struct ath_atx_tid *tid, struct sk_buff_head **q)
--+ struct ath_atx_tid *tid)
-- {
-- struct ieee80211_tx_info *tx_info;
-- struct ath_frame_info *fi;
--- struct sk_buff *skb;
--+ struct sk_buff *skb, *first_skb = NULL;
-- struct ath_buf *bf;
-- u16 seqno;
--
-- while (1) {
--- *q = &tid->retry_q;
--- if (skb_queue_empty(*q))
--- *q = &tid->buf_q;
---
--- skb = skb_peek(*q);
--+ skb = ath_tid_dequeue(tid);
-- if (!skb)
-- break;
--
--@@ -898,7 +910,6 @@ ath_tx_get_tid_subframe(struct ath_softc
-- bf->bf_state.stale = false;
--
-- if (!bf) {
--- __skb_unlink(skb, *q);
-- ath_txq_skb_done(sc, txq, skb);
-- ieee80211_free_txskb(sc->hw, skb);
-- continue;
--@@ -927,8 +938,19 @@ ath_tx_get_tid_subframe(struct ath_softc
-- seqno = bf->bf_state.seqno;
--
-- /* do not step over block-ack window */
--- if (!BAW_WITHIN(tid->seq_start, tid->baw_size, seqno))
--+ if (!BAW_WITHIN(tid->seq_start, tid->baw_size, seqno)) {
--+ __skb_queue_tail(&tid->retry_q, skb);
--+
--+ /* If there are other skbs in the retry q, they are
--+ * probably within the BAW, so loop immediately to get
--+ * one of them. Otherwise the queue can get stuck. */
--+ if (!skb_queue_is_first(&tid->retry_q, skb) && skb != first_skb) {
--+ if(!first_skb) /* infinite loop prevention */
--+ first_skb = skb;
--+ continue;
--+ }
-- break;
--+ }
--
-- if (tid->bar_index > ATH_BA_INDEX(tid->seq_start, seqno)) {
-- struct ath_tx_status ts = {};
--@@ -936,7 +958,6 @@ ath_tx_get_tid_subframe(struct ath_softc
--
-- INIT_LIST_HEAD(&bf_head);
-- list_add(&bf->list, &bf_head);
--- __skb_unlink(skb, *q);
-- ath_tx_update_baw(sc, tid, seqno);
-- ath_tx_complete_buf(sc, bf, txq, &bf_head, &ts, 0);
-- continue;
--@@ -948,11 +969,10 @@ ath_tx_get_tid_subframe(struct ath_softc
-- return NULL;
-- }
--
---static bool
--+static int
-- ath_tx_form_aggr(struct ath_softc *sc, struct ath_txq *txq,
-- struct ath_atx_tid *tid, struct list_head *bf_q,
--- struct ath_buf *bf_first, struct sk_buff_head *tid_q,
--- int *aggr_len)
--+ struct ath_buf *bf_first)
-- {
-- #define PADBYTES(_len) ((4 - ((_len) % 4)) % 4)
-- struct ath_buf *bf = bf_first, *bf_prev = NULL;
--@@ -962,12 +982,13 @@ ath_tx_form_aggr(struct ath_softc *sc, s
-- struct ieee80211_tx_info *tx_info;
-- struct ath_frame_info *fi;
-- struct sk_buff *skb;
--- bool closed = false;
--+
--
-- bf = bf_first;
-- aggr_limit = ath_lookup_rate(sc, bf, tid);
--
--- do {
--+ while (bf)
--+ {
-- skb = bf->bf_mpdu;
-- fi = get_frame_info(skb);
--
--@@ -976,12 +997,12 @@ ath_tx_form_aggr(struct ath_softc *sc, s
-- if (nframes) {
-- if (aggr_limit < al + bpad + al_delta ||
-- ath_lookup_legacy(bf) || nframes >= h_baw)
--- break;
--+ goto stop;
--
-- tx_info = IEEE80211_SKB_CB(bf->bf_mpdu);
-- if ((tx_info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE) ||
-- !(tx_info->flags & IEEE80211_TX_CTL_AMPDU))
--- break;
--+ goto stop;
-- }
--
-- /* add padding for previous frame to aggregation length */
--@@ -1003,20 +1024,18 @@ ath_tx_form_aggr(struct ath_softc *sc, s
-- ath_tx_addto_baw(sc, tid, bf);
-- bf->bf_state.ndelim = ndelim;
--
--- __skb_unlink(skb, tid_q);
-- list_add_tail(&bf->list, bf_q);
-- if (bf_prev)
-- bf_prev->bf_next = bf;
--
-- bf_prev = bf;
--
--- bf = ath_tx_get_tid_subframe(sc, txq, tid, &tid_q);
--- if (!bf) {
--- closed = true;
--- break;
--- }
--- } while (ath_tid_has_buffered(tid));
---
--+ bf = ath_tx_get_tid_subframe(sc, txq, tid);
--+ }
--+ goto finish;
--+stop:
--+ __skb_queue_tail(&tid->retry_q, bf->bf_mpdu);
--+finish:
-- bf = bf_first;
-- bf->bf_lastbf = bf_prev;
--
--@@ -1027,9 +1046,7 @@ ath_tx_form_aggr(struct ath_softc *sc, s
-- TX_STAT_INC(txq->axq_qnum, a_aggr);
-- }
--
--- *aggr_len = al;
---
--- return closed;
--+ return al;
-- #undef PADBYTES
-- }
--
--@@ -1406,18 +1423,15 @@ static void ath_tx_fill_desc(struct ath_
-- static void
-- ath_tx_form_burst(struct ath_softc *sc, struct ath_txq *txq,
-- struct ath_atx_tid *tid, struct list_head *bf_q,
--- struct ath_buf *bf_first, struct sk_buff_head *tid_q)
--+ struct ath_buf *bf_first)
-- {
-- struct ath_buf *bf = bf_first, *bf_prev = NULL;
--- struct sk_buff *skb;
-- int nframes = 0;
--
-- do {
-- struct ieee80211_tx_info *tx_info;
--- skb = bf->bf_mpdu;
--
-- nframes++;
--- __skb_unlink(skb, tid_q);
-- list_add_tail(&bf->list, bf_q);
-- if (bf_prev)
-- bf_prev->bf_next = bf;
--@@ -1426,13 +1440,15 @@ ath_tx_form_burst(struct ath_softc *sc,
-- if (nframes >= 2)
-- break;
--
--- bf = ath_tx_get_tid_subframe(sc, txq, tid, &tid_q);
--+ bf = ath_tx_get_tid_subframe(sc, txq, tid);
-- if (!bf)
-- break;
--
-- tx_info = IEEE80211_SKB_CB(bf->bf_mpdu);
--- if (tx_info->flags & IEEE80211_TX_CTL_AMPDU)
--+ if (tx_info->flags & IEEE80211_TX_CTL_AMPDU) {
--+ __skb_queue_tail(&tid->retry_q, bf->bf_mpdu);
-- break;
--+ }
--
-- ath_set_rates(tid->an->vif, tid->an->sta, bf, false);
-- } while (1);
--@@ -1443,34 +1459,33 @@ static bool ath_tx_sched_aggr(struct ath
-- {
-- struct ath_buf *bf;
-- struct ieee80211_tx_info *tx_info;
--- struct sk_buff_head *tid_q;
-- struct list_head bf_q;
-- int aggr_len = 0;
--- bool aggr, last = true;
--+ bool aggr;
--
-- if (!ath_tid_has_buffered(tid))
-- return false;
--
-- INIT_LIST_HEAD(&bf_q);
--
--- bf = ath_tx_get_tid_subframe(sc, txq, tid, &tid_q);
--+ bf = ath_tx_get_tid_subframe(sc, txq, tid);
-- if (!bf)
-- return false;
--
-- tx_info = IEEE80211_SKB_CB(bf->bf_mpdu);
-- aggr = !!(tx_info->flags & IEEE80211_TX_CTL_AMPDU);
-- if ((aggr && txq->axq_ampdu_depth >= ATH_AGGR_MIN_QDEPTH) ||
--- (!aggr && txq->axq_depth >= ATH_NON_AGGR_MIN_QDEPTH)) {
--+ (!aggr && txq->axq_depth >= ATH_NON_AGGR_MIN_QDEPTH)) {
--+ __skb_queue_tail(&tid->retry_q, bf->bf_mpdu);
-- *stop = true;
-- return false;
-- }
--
-- ath_set_rates(tid->an->vif, tid->an->sta, bf, false);
-- if (aggr)
--- last = ath_tx_form_aggr(sc, txq, tid, &bf_q, bf,
--- tid_q, &aggr_len);
--+ aggr_len = ath_tx_form_aggr(sc, txq, tid, &bf_q, bf);
-- else
--- ath_tx_form_burst(sc, txq, tid, &bf_q, bf, tid_q);
--+ ath_tx_form_burst(sc, txq, tid, &bf_q, bf);
--
-- if (list_empty(&bf_q))
-- return false;
--@@ -1513,9 +1528,6 @@ int ath_tx_aggr_start(struct ath_softc *
-- an->mpdudensity = density;
-- }
--
--- /* force sequence number allocation for pending frames */
--- ath_tx_tid_change_state(sc, txtid);
---
-- txtid->active = true;
-- *ssn = txtid->seq_start = txtid->seq_next;
-- txtid->bar_index = -1;
--@@ -1540,7 +1552,6 @@ void ath_tx_aggr_stop(struct ath_softc *
-- ath_txq_lock(sc, txq);
-- txtid->active = false;
-- ath_tx_flush_tid(sc, txtid);
--- ath_tx_tid_change_state(sc, txtid);
-- ath_txq_unlock_complete(sc, txq);
-- }
--
--@@ -1550,14 +1561,12 @@ void ath_tx_aggr_sleep(struct ieee80211_
-- struct ath_common *common = ath9k_hw_common(sc->sc_ah);
-- struct ath_atx_tid *tid;
-- struct ath_txq *txq;
--- bool buffered;
-- int tidno;
--
-- ath_dbg(common, XMIT, "%s called\n", __func__);
--
--- for (tidno = 0, tid = &an->tid[tidno];
--- tidno < IEEE80211_NUM_TIDS; tidno++, tid++) {
---
--+ for (tidno = 0; tidno < IEEE80211_NUM_TIDS; tidno++) {
--+ tid = ATH_AN_2_TID(an, tidno);
-- txq = tid->txq;
--
-- ath_txq_lock(sc, txq);
--@@ -1567,13 +1576,12 @@ void ath_tx_aggr_sleep(struct ieee80211_
-- continue;
-- }
--
--- buffered = ath_tid_has_buffered(tid);
--+ if (!skb_queue_empty(&tid->retry_q))
--+ ieee80211_sta_set_buffered(sta, tid->tidno, true);
--
-- list_del_init(&tid->list);
--
-- ath_txq_unlock(sc, txq);
---
--- ieee80211_sta_set_buffered(sta, tidno, buffered);
-- }
-- }
--
--@@ -1586,19 +1594,16 @@ void ath_tx_aggr_wakeup(struct ath_softc
--
-- ath_dbg(common, XMIT, "%s called\n", __func__);
--
--- for (tidno = 0, tid = &an->tid[tidno];
--- tidno < IEEE80211_NUM_TIDS; tidno++, tid++) {
---
--+ for (tidno = 0; tidno < IEEE80211_NUM_TIDS; tidno++) {
--+ tid = ATH_AN_2_TID(an, tidno);
-- txq = tid->txq;
--
-- ath_txq_lock(sc, txq);
-- tid->clear_ps_filter = true;
---
-- if (ath_tid_has_buffered(tid)) {
-- ath_tx_queue_tid(sc, txq, tid);
-- ath_txq_schedule(sc, txq);
-- }
---
-- ath_txq_unlock_complete(sc, txq);
-- }
-- }
--@@ -1621,11 +1626,6 @@ void ath_tx_aggr_resume(struct ath_softc
--
-- tid->baw_size = IEEE80211_MIN_AMPDU_BUF << sta->ht_cap.ampdu_factor;
--
--- if (ath_tid_has_buffered(tid)) {
--- ath_tx_queue_tid(sc, txq, tid);
--- ath_txq_schedule(sc, txq);
--- }
---
-- ath_txq_unlock_complete(sc, txq);
-- }
--
--@@ -1641,7 +1641,6 @@ void ath9k_release_buffered_frames(struc
-- struct ieee80211_tx_info *info;
-- struct list_head bf_q;
-- struct ath_buf *bf_tail = NULL, *bf;
--- struct sk_buff_head *tid_q;
-- int sent = 0;
-- int i;
--
--@@ -1656,11 +1655,10 @@ void ath9k_release_buffered_frames(struc
--
-- ath_txq_lock(sc, tid->txq);
-- while (nframes > 0) {
--- bf = ath_tx_get_tid_subframe(sc, sc->tx.uapsdq, tid, &tid_q);
--+ bf = ath_tx_get_tid_subframe(sc, sc->tx.uapsdq, tid);
-- if (!bf)
-- break;
--
--- __skb_unlink(bf->bf_mpdu, tid_q);
-- list_add_tail(&bf->list, &bf_q);
-- ath_set_rates(tid->an->vif, tid->an->sta, bf, true);
-- if (bf_isampdu(bf)) {
--@@ -1675,7 +1673,7 @@ void ath9k_release_buffered_frames(struc
-- sent++;
-- TX_STAT_INC(txq->axq_qnum, a_queued_hw);
--
--- if (an->sta && !ath_tid_has_buffered(tid))
--+ if (an->sta && skb_queue_empty(&tid->retry_q))
-- ieee80211_sta_set_buffered(an->sta, i, false);
-- }
-- ath_txq_unlock_complete(sc, tid->txq);
--@@ -1902,13 +1900,7 @@ bool ath_drain_all_txq(struct ath_softc
-- if (!ATH_TXQ_SETUP(sc, i))
-- continue;
--
--- /*
--- * The caller will resume queues with ieee80211_wake_queues.
--- * Mark the queue as not stopped to prevent ath_tx_complete
--- * from waking the queue too early.
--- */
-- txq = &sc->tx.txq[i];
--- txq->stopped = false;
-- ath_draintxq(sc, txq);
-- }
--
--@@ -2308,15 +2300,12 @@ int ath_tx_start(struct ieee80211_hw *hw
-- struct ath_txq *txq = txctl->txq;
-- struct ath_atx_tid *tid = NULL;
-- struct ath_buf *bf;
--- bool queue, ps_resp;
--+ bool ps_resp;
-- int q, ret;
--
-- if (vif)
-- avp = (void *)vif->drv_priv;
--
--- if (info->flags & IEEE80211_TX_CTL_TX_OFFCHAN)
--- txctl->force_channel = true;
---
-- ps_resp = !!(info->control.flags & IEEE80211_TX_CTRL_PS_RESPONSE);
--
-- ret = ath_tx_prepare(hw, skb, txctl);
--@@ -2331,63 +2320,13 @@ int ath_tx_start(struct ieee80211_hw *hw
--
-- q = skb_get_queue_mapping(skb);
--
--+ if (ps_resp)
--+ txq = sc->tx.uapsdq;
--+
-- ath_txq_lock(sc, txq);
-- if (txq == sc->tx.txq_map[q]) {
-- fi->txq = q;
--- if (++txq->pending_frames > sc->tx.txq_max_pending[q] &&
--- !txq->stopped) {
--- if (ath9k_is_chanctx_enabled())
--- ieee80211_stop_queue(sc->hw, info->hw_queue);
--- else
--- ieee80211_stop_queue(sc->hw, q);
--- txq->stopped = true;
--- }
--- }
---
--- queue = ieee80211_is_data_present(hdr->frame_control);
---
--- /* If chanctx, queue all null frames while NOA could be there */
--- if (ath9k_is_chanctx_enabled() &&
--- ieee80211_is_nullfunc(hdr->frame_control) &&
--- !txctl->force_channel)
--- queue = true;
---
--- /* Force queueing of all frames that belong to a virtual interface on
--- * a different channel context, to ensure that they are sent on the
--- * correct channel.
--- */
--- if (((avp && avp->chanctx != sc->cur_chan) ||
--- sc->cur_chan->stopped) && !txctl->force_channel) {
--- if (!txctl->an)
--- txctl->an = &avp->mcast_node;
--- queue = true;
--- ps_resp = false;
--- }
---
--- if (txctl->an && queue)
--- tid = ath_get_skb_tid(sc, txctl->an, skb);
---
--- if (ps_resp) {
--- ath_txq_unlock(sc, txq);
--- txq = sc->tx.uapsdq;
--- ath_txq_lock(sc, txq);
--- } else if (txctl->an && queue) {
--- WARN_ON(tid->txq != txctl->txq);
---
--- if (info->flags & IEEE80211_TX_CTL_CLEAR_PS_FILT)
--- tid->clear_ps_filter = true;
---
--- /*
--- * Add this frame to software queue for scheduling later
--- * for aggregation.
--- */
--- TX_STAT_INC(txq->axq_qnum, a_queued_sw);
--- __skb_queue_tail(&tid->buf_q, skb);
--- if (!txctl->an->sleeping)
--- ath_tx_queue_tid(sc, txq, tid);
---
--- ath_txq_schedule(sc, txq);
--- goto out;
--+ ++txq->pending_frames;
-- }
--
-- bf = ath_tx_setup_buffer(sc, txq, tid, skb);
--@@ -2871,9 +2810,8 @@ void ath_tx_node_init(struct ath_softc *
-- struct ath_atx_tid *tid;
-- int tidno, acno;
--
--- for (tidno = 0, tid = &an->tid[tidno];
--- tidno < IEEE80211_NUM_TIDS;
--- tidno++, tid++) {
--+ for (tidno = 0; tidno < IEEE80211_NUM_TIDS; tidno++) {
--+ tid = ATH_AN_2_TID(an, tidno);
-- tid->an = an;
-- tid->tidno = tidno;
-- tid->seq_start = tid->seq_next = 0;
--@@ -2881,11 +2819,14 @@ void ath_tx_node_init(struct ath_softc *
-- tid->baw_head = tid->baw_tail = 0;
-- tid->active = false;
-- tid->clear_ps_filter = true;
--- __skb_queue_head_init(&tid->buf_q);
--+ tid->has_queued = false;
-- __skb_queue_head_init(&tid->retry_q);
-- INIT_LIST_HEAD(&tid->list);
-- acno = TID_TO_WME_AC(tidno);
-- tid->txq = sc->tx.txq_map[acno];
--+
--+ if (!an->sta)
--+ break; /* just one multicast ath_atx_tid */
-- }
-- }
--
--@@ -2895,9 +2836,8 @@ void ath_tx_node_cleanup(struct ath_soft
-- struct ath_txq *txq;
-- int tidno;
--
--- for (tidno = 0, tid = &an->tid[tidno];
--- tidno < IEEE80211_NUM_TIDS; tidno++, tid++) {
---
--+ for (tidno = 0; tidno < IEEE80211_NUM_TIDS; tidno++) {
--+ tid = ATH_AN_2_TID(an, tidno);
-- txq = tid->txq;
--
-- ath_txq_lock(sc, txq);
--@@ -2909,6 +2849,9 @@ void ath_tx_node_cleanup(struct ath_soft
-- tid->active = false;
--
-- ath_txq_unlock(sc, txq);
--+
--+ if (!an->sta)
--+ break; /* just one multicast ath_atx_tid */
-- }
-- }
--
diff --git a/patches/openwrt/0074-ar71xx-set-EU-region-code-for-TP-Link-TL-WA901ND-v4.patch b/patches/openwrt/0074-ar71xx-set-EU-region-code-for-TP-Link-TL-WA901ND-v4.patch
deleted file mode 100644
index 0632a054e10c355eefe3f14d87beefa0f81d20f9..0000000000000000000000000000000000000000
--- a/patches/openwrt/0074-ar71xx-set-EU-region-code-for-TP-Link-TL-WA901ND-v4.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Sat, 15 Oct 2016 19:10:33 +0200
-Subject: ar71xx: set EU region code for TP-Link TL-WA901ND v4
-
-There is no US firmware for the TL-WA901ND v4 yet, so we'll just
-unconditionally set the EU region for now.
-
-This makes LEDE flashable on these devices again. The format of the region
-string is slightly different from the one used on the Archer C7 that is
-generated by mktplinkfw (the second half of the region string is missing),
-but it's similar enough to make it work.
-
-Tested-by: Jannis Pinter <jannis@pinterjann.is>
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-Backport of LEDE 83f7ec31f8f9641ef842212c45db61b72682debf
-
-diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
-index 95f6d46d15b43faabb0bbf9301476d3ea5bee470..9ac1d60078cf108276d6f29c42bdb738fab6ad9d 100644
---- a/target/linux/ar71xx/image/Makefile
-+++ b/target/linux/ar71xx/image/Makefile
-@@ -736,6 +736,7 @@ define Device/tl-wa901nd-v4
- BOARDNAME := TL-WA901ND-v4
- DEVICE_PROFILE := TLWA901
- TPLINK_HWID := 0x09010004
-+ IMAGE/factory.bin := append-rootfs | mktplinkfw factory -C EU
- endef
-
- TARGET_DEVICES += tl-wa901nd-v3 tl-wa901nd-v4
diff --git a/patches/openwrt/0075-ar71xx-fix-syntax-error-in-etc-uci-defaults-01_leds.patch b/patches/openwrt/0075-ar71xx-fix-syntax-error-in-etc-uci-defaults-01_leds.patch
deleted file mode 100644
index 131141cee37a2a127cefbb02b3465c681f837e25..0000000000000000000000000000000000000000
--- a/patches/openwrt/0075-ar71xx-fix-syntax-error-in-etc-uci-defaults-01_leds.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Sat, 5 Nov 2016 04:31:47 +0100
-Subject: ar71xx: fix syntax error in /etc/uci-defaults/01_leds
-
-Fixes f98117a "CC: ar71xx: backport LED fix for TL-WR841N-v11".
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
-index f1266d88f1b6a441e58b0a008ca915a4b5958928..87d6fcc4d74571ca98acc53ae76ea6f305d8c8c6 100644
---- a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
-+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
-@@ -500,7 +500,7 @@ tl-wa830re-v2)
- ucidef_set_led_wlan "wlan" "WLAN" "tp-link:green:wlan" "phy0tpt"
- ;;
-
--tl-wr841n-v9) | \
-+tl-wr841n-v9 | \
- tl-wr841n-v11)
- ucidef_set_led_netdev "wan" "WAN" "tp-link:green:wan" "eth1"
- ucidef_set_led_switch "lan1" "LAN1" "tp-link:green:lan1" "switch0" "0x10"
diff --git a/patches/openwrt/0076-ar71xx-generate-region-coded-factory-images-for-TP-Link-TL-WR841ND-v11.patch b/patches/openwrt/0076-ar71xx-generate-region-coded-factory-images-for-TP-Link-TL-WR841ND-v11.patch
deleted file mode 100644
index deb51586cd4fb3f1d976cb52764638fadd54d9b6..0000000000000000000000000000000000000000
--- a/patches/openwrt/0076-ar71xx-generate-region-coded-factory-images-for-TP-Link-TL-WR841ND-v11.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Fri, 11 Nov 2016 03:29:59 +0100
-Subject: ar71xx: generate region-coded factory images for TP-Link TL-WR841ND v11
-
-The latest stock firmwares for US and EU regions have started checking the
-region code.
-
-Tested-by: Andreas Ziegler <ml@andreas-ziegler.de>
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-Backport of LEDE 9cac5e8be014b89326880ae5d7b885013614e0ca
-
-diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
-index 9ac1d60078cf108276d6f29c42bdb738fab6ad9d..6346eb9ffa6c9bbeb1eaa5de229cf69ce12c1f83 100644
---- a/target/linux/ar71xx/image/Makefile
-+++ b/target/linux/ar71xx/image/Makefile
-@@ -602,6 +602,9 @@ define Device/tl-wr841n-v11
- BOARDNAME := TL-WR841N-v11
- DEVICE_PROFILE := TLWR841
- TPLINK_HWID := 0x08410011
-+ IMAGES += factory-us.bin factory-eu.bin
-+ IMAGE/factory-us.bin := append-rootfs | mktplinkfw factory -C US
-+ IMAGE/factory-eu.bin := append-rootfs | mktplinkfw factory -C EU
- endef
-
- define Device/tl-wr842n-v2
diff --git a/patches/openwrt/0077-x86-64-add-pata-drivers.patch b/patches/openwrt/0077-x86-64-add-pata-drivers.patch
deleted file mode 100644
index df197b0ed5d497b850f8e5d75eaf893775479ea4..0000000000000000000000000000000000000000
--- a/patches/openwrt/0077-x86-64-add-pata-drivers.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Andreas Ziegler <github@andreas-ziegler.de>
-Date: Wed, 9 Nov 2016 04:39:16 +0100
-Subject: x86-64: add pata drivers
-
-diff --git a/target/linux/x86/64/config-default b/target/linux/x86/64/config-default
-index 1caad741a623e9481907dff59c37de8c173bb7d7..1fda58562c6821e8524d00617ed040d11ee731d7 100644
---- a/target/linux/x86/64/config-default
-+++ b/target/linux/x86/64/config-default
-@@ -131,6 +131,14 @@ CONFIG_PARAVIRT_CLOCK=y
- # CONFIG_PARAVIRT_DEBUG is not set
- # CONFIG_PARAVIRT_SPINLOCKS is not set
- # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
-+CONFIG_PATA_AMD=y
-+CONFIG_PATA_ATIIXP=y
-+CONFIG_PATA_LEGACY=y
-+CONFIG_PATA_MPIIX=y
-+CONFIG_PATA_OLDPIIX=y
-+CONFIG_PATA_PLATFORM=y
-+CONFIG_PATA_SC1200=y
-+CONFIG_PATA_VIA=y
- CONFIG_PCIEAER=y
- CONFIG_PCIEPORTBUS=y
- # CONFIG_PCI_IOAPIC is not set
diff --git a/patches/openwrt/0078-x86-add-mmc-drivers-to-generic-64.patch b/patches/openwrt/0078-x86-add-mmc-drivers-to-generic-64.patch
deleted file mode 100644
index deee9aa4f24921a12a74f13c2faf0ac9927843d7..0000000000000000000000000000000000000000
--- a/patches/openwrt/0078-x86-add-mmc-drivers-to-generic-64.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From: Andreas Ziegler <github@andreas-ziegler.de>
-Date: Wed, 9 Nov 2016 04:39:59 +0100
-Subject: x86: add mmc drivers to generic+64
-
-diff --git a/target/linux/x86/64/config-default b/target/linux/x86/64/config-default
-index 1fda58562c6821e8524d00617ed040d11ee731d7..9d2cfdbd9f7c2006b543599d398f2d5966f6333e 100644
---- a/target/linux/x86/64/config-default
-+++ b/target/linux/x86/64/config-default
-@@ -117,6 +117,14 @@ CONFIG_LPC_ICH=y
- CONFIG_MEMORY_BALLOON=y
- # CONFIG_MEMORY_HOTPLUG is not set
- CONFIG_MFD_CORE=y
-+CONFIG_MMC=y
-+CONFIG_MMC_BLOCK=y
-+CONFIG_MMC_RICOH_MMC=y
-+CONFIG_MMC_SDHCI=y
-+CONFIG_MMC_SDHCI_PCI=y
-+# CONFIG_MMC_SDHCI_PLTFM is not set
-+# CONFIG_MMC_TIFM_SD is not set
-+# CONFIG_MMC_WBSD is not set
- CONFIG_MODULES_USE_ELF_RELA=y
- # CONFIG_MPSC is not set
- CONFIG_MUTEX_SPIN_ON_OWNER=y
-diff --git a/target/linux/x86/generic/config-default b/target/linux/x86/generic/config-default
-index 4fc513154bd566319d77e6e42622ef362baeb094..1d72811f4b67225043513dec9173a79969c49313 100644
---- a/target/linux/x86/generic/config-default
-+++ b/target/linux/x86/generic/config-default
-@@ -136,6 +136,14 @@ CONFIG_ISO9660_FS=y
- # CONFIG_LEDS_CLEVO_MAIL is not set
- # CONFIG_MDA_CONSOLE is not set
- # CONFIG_MIXCOMWD is not set
-+CONFIG_MMC=y
-+CONFIG_MMC_BLOCK=y
-+CONFIG_MMC_RICOH_MMC=y
-+CONFIG_MMC_SDHCI=y
-+CONFIG_MMC_SDHCI_PCI=y
-+# CONFIG_MMC_SDHCI_PLTFM is not set
-+# CONFIG_MMC_TIFM_SD is not set
-+# CONFIG_MMC_WBSD is not set
- # CONFIG_MOUSE_BCM5974 is not set
- # CONFIG_MOUSE_CYAPA is not set
- CONFIG_MOUSE_PS2=y
diff --git a/patches/openwrt/0079-ath9k-fix-ath9k_hw_gpio_get-to-return-0-or-1-on-success.patch b/patches/openwrt/0079-ath9k-fix-ath9k_hw_gpio_get-to-return-0-or-1-on-success.patch
deleted file mode 100644
index 86ecfcb7578cea16bbaa8f1844a8189e5e32a5fe..0000000000000000000000000000000000000000
--- a/patches/openwrt/0079-ath9k-fix-ath9k_hw_gpio_get-to-return-0-or-1-on-success.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Tue, 15 Nov 2016 19:26:52 +0100
-Subject: ath9k: fix ath9k_hw_gpio_get() to return 0 or 1 on success
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-Backport of LEDE a250556d27556ec94a8d800fd27be40c2de8139c
-
-diff --git a/package/kernel/mac80211/patches/331-ath9k-fix-ath9k_hw_gpio_get-to-return-0-or-1-on-succ.patch b/package/kernel/mac80211/patches/331-ath9k-fix-ath9k_hw_gpio_get-to-return-0-or-1-on-succ.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..627b401300ad9fc0d5527ce9e7325c87b33e6313
---- /dev/null
-+++ b/package/kernel/mac80211/patches/331-ath9k-fix-ath9k_hw_gpio_get-to-return-0-or-1-on-succ.patch
-@@ -0,0 +1,29 @@
-+From: Matthias Schiffer <mschiffer@universe-factory.net>
-+Date: Tue, 15 Nov 2016 16:08:29 +0100
-+Subject: [PATCH] ath9k: fix ath9k_hw_gpio_get() to return 0 or 1 on success
-+
-+Commit b2d70d4944c1 ("ath9k: make GPIO API to support both of WMAC and
-+SOC") refactored ath9k_hw_gpio_get() to support both WMAC and SOC GPIOs,
-+changing the return on success from 1 to BIT(gpio). This broke some callers
-+like ath_is_rfkill_set().
-+
-+Instead of fixing all callers, change ath9k_hw_gpio_get() back to only
-+return 0 or 1.
-+
-+Fixes: b2d70d4944c1 ("ath9k: make GPIO API to support both of WMAC and SOC")
-+Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-+---
-+ drivers/net/wireless/ath/ath9k/hw.c | 2 +-
-+ 1 file changed, 1 insertion(+), 1 deletion(-)
-+
-+--- a/drivers/net/wireless/ath/ath9k/hw.c
-++++ b/drivers/net/wireless/ath/ath9k/hw.c
-+@@ -2816,7 +2816,7 @@ u32 ath9k_hw_gpio_get(struct ath_hw *ah,
-+ WARN_ON(1);
-+ }
-+
-+- return val;
-++ return !!val;
-+ }
-+ EXPORT_SYMBOL(ath9k_hw_gpio_get);
-+
diff --git a/patches/openwrt/0080-ar71xx-ramips-reduce-CPU-load-and-flickering-on-devices-using-rsslieds.patch b/patches/openwrt/0080-ar71xx-ramips-reduce-CPU-load-and-flickering-on-devices-using-rsslieds.patch
deleted file mode 100644
index f0c1cff0c7d002dd91f33d1b22397c59559532b7..0000000000000000000000000000000000000000
--- a/patches/openwrt/0080-ar71xx-ramips-reduce-CPU-load-and-flickering-on-devices-using-rsslieds.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From: Martin Weinelt <martin@darmstadt.freifunk.net>
-Date: Wed, 2 Nov 2016 16:10:44 +0100
-Subject: ar71xx, ramips: reduce CPU load and flickering on devices using rsslieds
-
-Polling every 40ms causes more than 10% CPU load on weak devices. An
-interval of 200ms is much more reasonable.
-
-Signed-off-by: Martin Weinelt <martin@darmstadt.freifunk.net>
-[Matthias Schiffer: adapt OpenWrt patch; add ramips; extend commit message]
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-Backport of LEDE 5247ac2f805e39afe2e6e30980e439ea8b8ae7f8
-
-diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
-index 87d6fcc4d74571ca98acc53ae76ea6f305d8c8c6..2a0f9969cd22543de6e54a484052a27414c5d093 100644
---- a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
-+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
-@@ -18,14 +18,14 @@ alfa-nx)
- ;;
-
- all0258n)
-- ucidef_set_rssimon "wlan0" "40000" "1"
-+ ucidef_set_rssimon "wlan0" "200000" "1"
- ucidef_set_led_rssi "rssilow" "RSSILOW" "all0258n:red:rssilow" "wlan0" "1" "40" "0" "6"
- ucidef_set_led_rssi "rssimedium" "RSSIMEDIUM" "all0258n:yellow:rssimedium" "wlan0" "30" "80" "-29" "5"
- ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "all0258n:green:rssihigh" "wlan0" "70" "100" "-69" "8"
- ;;
-
- all0315n)
-- ucidef_set_rssimon "wlan0" "40000" "1"
-+ ucidef_set_rssimon "wlan0" "200000" "1"
- ucidef_set_led_rssi "rssilow" "RSSILOW" "all0315n:red:rssilow" "wlan0" "1" "40" "0" "6"
- ucidef_set_led_rssi "rssimedium" "RSSIMEDIUM" "all0315n:yellow:rssimedium" "wlan0" "30" "80" "-29" "5"
- ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "all0315n:green:rssihigh" "wlan0" "70" "100" "-69" "8"
-@@ -82,7 +82,7 @@ cpe210|\
- cpe510)
- ucidef_set_led_switch "lan0" "LAN0" "tp-link:green:lan0" "switch0" "0x20"
- ucidef_set_led_switch "lan1" "LAN1" "tp-link:green:lan1" "switch0" "0x10"
-- ucidef_set_rssimon "wlan0" "40000" "1"
-+ ucidef_set_rssimon "wlan0" "200000" "1"
- ucidef_set_led_rssi "rssilow" "RSSILOW" "tp-link:green:link1" "wlan0" "1" "100" "0" "13"
- ucidef_set_led_rssi "rssimediumlow" "RSSIMEDIUMLOW" "tp-link:green:link2" "wlan0" "26" "100" "-25" "13"
- ucidef_set_led_rssi "rssimediumhigh" "RSSIMEDIUMHIGH" "tp-link:green:link3" "wlan0" "51" "100" "-50" "13"
-@@ -271,7 +271,7 @@ mynet-n600)
-
- mynet-rext)
- ucidef_set_led_netdev "lan" "LAN" "wd:blue:ethernet" "eth0"
-- ucidef_set_rssimon "wlan0" "40000" "1"
-+ ucidef_set_rssimon "wlan0" "200000" "1"
- ucidef_set_led_rssi "rssilow" "RSSILOW" "wd:blue:quality1" "wlan0" "1" "40" "0" "6"
- ucidef_set_led_rssi "rssimedium" "RSSIMEDIUM" "wd:blue:quality2" "wlan0" "30" "80" "-29" "5"
- ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "wd:blue:quality3" "wlan0" "70" "100" "-69" "8"
-@@ -381,7 +381,7 @@ tl-mr3420-v2)
-
- tl-wa7210n-v2)
- ucidef_set_led_netdev "lan" "LAN" "tp-link:green:lan" "eth0"
-- ucidef_set_rssimon "wlan0" "40000" "1"
-+ ucidef_set_rssimon "wlan0" "200000" "1"
- ucidef_set_led_rssi "rssilow" "RSSILOW" "tp-link:green:signal1" "wlan0" "1" "100" "0" "13"
- ucidef_set_led_rssi "rssimediumlow" "RSSIMEDIUMLOW" "tp-link:green:signal2" "wlan0" "26" "100" "-25" "13"
- ucidef_set_led_rssi "rssimediumhigh" "RSSIMEDIUMHIGH" "tp-link:green:signal3" "wlan0" "51" "100" "-50" "13"
-@@ -391,7 +391,7 @@ tl-wa7210n-v2)
- tl-wa750re)
- ucidef_set_led_netdev "lan" "LAN" "tp-link:orange:lan" "eth0"
- ucidef_set_led_wlan "wlan" "WLAN" "tp-link:orange:wlan" "phy0tpt"
-- ucidef_set_rssimon "wlan0" "40000" "1"
-+ ucidef_set_rssimon "wlan0" "200000" "1"
- ucidef_set_led_rssi "rssilow" "RSSILOW" "tp-link:orange:signal1" "wlan0" "1" "100" "0" "13"
- ucidef_set_led_rssi "rssimediumlow" "RSSIMEDIUMLOW" "tp-link:orange:signal2" "wlan0" "20" "100" "-19" "13"
- ucidef_set_led_rssi "rssimedium" "RSSIMEDIUM" "tp-link:orange:signal3" "wlan0" "40" "100" "-39" "13"
-@@ -402,7 +402,7 @@ tl-wa750re)
- tl-wa850re)
- ucidef_set_led_netdev "lan" "LAN" "tp-link:blue:lan" "eth0"
- ucidef_set_led_wlan "wlan" "WLAN" "tp-link:blue:wlan" "phy0tpt"
-- ucidef_set_rssimon "wlan0" "40000" "1"
-+ ucidef_set_rssimon "wlan0" "200000" "1"
- ucidef_set_led_rssi "rssilow" "RSSILOW" "tp-link:blue:signal1" "wlan0" "1" "100" "0" "13"
- ucidef_set_led_rssi "rssimediumlow" "RSSIMEDIUMLOW" "tp-link:blue:signal2" "wlan0" "20" "100" "-19" "13"
- ucidef_set_led_rssi "rssimedium" "RSSIMEDIUM" "tp-link:blue:signal3" "wlan0" "40" "100" "-39" "13"
-@@ -553,7 +553,7 @@ tl-wr2543n)
-
- tube2h)
- ucidef_set_led_netdev "lan" "LAN" "alfa:blue:lan" "eth0"
-- ucidef_set_rssimon "wlan0" "40000" "1"
-+ ucidef_set_rssimon "wlan0" "200000" "1"
- ucidef_set_led_rssi "signal1" "SIGNAL1" "alfa:red:signal1" "wlan0" "1" "100" "0" "13"
- ucidef_set_led_rssi "signal2" "SIGNAL2" "alfa:orange:signal2" "wlan0" "26" "100" "-25" "13"
- ucidef_set_led_rssi "signal3" "SIGNAL3" "alfa:green:signal3" "wlan0" "51" "100" "-50" "13"
-diff --git a/target/linux/ramips/base-files/etc/board.d/01_leds b/target/linux/ramips/base-files/etc/board.d/01_leds
-index 5fb28a52f7632bf09e7f62ff77dcd7254a2ebcc2..2b0341d3991e03e1f95376992b840ad10c41cdf4 100755
---- a/target/linux/ramips/base-files/etc/board.d/01_leds
-+++ b/target/linux/ramips/base-files/etc/board.d/01_leds
-@@ -40,7 +40,7 @@ case $board in
- set_usb_led "airlive:green:mobile"
- ;;
- all0256n)
-- ucidef_set_rssimon "wlan0" "40000" "1"
-+ ucidef_set_rssimon "wlan0" "200000" "1"
- ucidef_set_led_rssi "rssilow" "RSSILOW" "all0256n:green:rssilow" "wlan0" "1" "40" "0" "6"
- ucidef_set_led_rssi "rssimedium" "RSSIMEDIUM" "all0256n:green:rssimed" "wlan0" "30" "80" "-29" "5"
- ucidef_set_led_rssi "rssihigh" "RSSIHIGH" "all0256n:green:rssihigh" "wlan0" "70" "100" "-69" "8"
diff --git a/patches/openwrt/0081-kernel-add-at803x-fix-for-sgmii-mode.patch b/patches/openwrt/0081-kernel-add-at803x-fix-for-sgmii-mode.patch
deleted file mode 100644
index 83b71e7d334ef5f985eb814abb011f08914e7543..0000000000000000000000000000000000000000
--- a/patches/openwrt/0081-kernel-add-at803x-fix-for-sgmii-mode.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From: Felix Fietkau <nbd@openwrt.org>
-Date: Sun, 27 Nov 2016 22:49:27 +0100
-Subject: kernel: add at803x fix for sgmii mode
-
-Some (possibly broken) bootloaders incorreclty initialize at8033
-phy. This patch enables sgmii autonegotiation mode.
-
-Signed-off-by: Roman Yeryomin <roman@advem.lv>
-
-Origin: backport, https://git.lede-project.org/?p=source.git;a=commit;h=e14d2aee0ab91c43d0bb14baf84cc9b997185870
-Bug-gluon: https://github.com/freifunk-gluon/gluon/issues/911
-
-diff --git a/target/linux/ar71xx/patches-3.18/735-net-phy-at803x-fix-at8033-sgmii-mode.patch b/target/linux/ar71xx/patches-3.18/735-net-phy-at803x-fix-at8033-sgmii-mode.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..4a8f532aa36f729339e01ebadd6ea3cb292d7ac9
---- /dev/null
-+++ b/target/linux/ar71xx/patches-3.18/735-net-phy-at803x-fix-at8033-sgmii-mode.patch
-@@ -0,0 +1,96 @@
-+--- a/drivers/net/phy/at803x.c
-++++ b/drivers/net/phy/at803x.c
-+@@ -36,6 +36,9 @@
-+ #define AT803X_INER 0x0012
-+ #define AT803X_INER_INIT 0xec00
-+ #define AT803X_INSR 0x0013
-++#define AT803X_REG_CHIP_CONFIG 0x1f
-++#define AT803X_BT_BX_REG_SEL 0x8000
-++#define AT803X_SGMII_ANEG_EN 0x1000
-+
-+ #define AT803X_PCS_SMART_EEE_CTRL3 0x805D
-+ #define AT803X_SMART_EEE_CTRL3_LPI_TX_DELAY_SEL_MASK 0x3
-+@@ -49,9 +52,10 @@
-+ #define AT803X_DEBUG_SYSTEM_MODE_CTRL 0x05
-+ #define AT803X_DEBUG_RGMII_TX_CLK_DLY BIT(8)
-+
-+-#define ATH8030_PHY_ID 0x004dd076
-+-#define ATH8031_PHY_ID 0x004dd074
-+-#define ATH8035_PHY_ID 0x004dd072
-++#define AT803X_PHY_ID_MASK 0xffffffef
-++#define ATH8030_PHY_ID 0x004dd076
-++#define ATH8031_PHY_ID 0x004dd074
-++#define ATH8035_PHY_ID 0x004dd072
-+
-+ MODULE_DESCRIPTION("Atheros 803x PHY driver");
-+ MODULE_AUTHOR("Matus Ujhelyi");
-+@@ -267,6 +271,27 @@ static int at803x_config_init(struct phy
-+ {
-+ struct at803x_platform_data *pdata;
-+ int ret;
-++ u32 v;
-++
-++ if (phydev->drv->phy_id == ATH8031_PHY_ID &&
-++ phydev->interface == PHY_INTERFACE_MODE_SGMII)
-++ {
-++ v = phy_read(phydev, AT803X_REG_CHIP_CONFIG);
-++ /* select SGMII/fiber page */
-++ ret = phy_write(phydev, AT803X_REG_CHIP_CONFIG,
-++ v & ~AT803X_BT_BX_REG_SEL);
-++ if (ret)
-++ return ret;
-++ /* enable SGMII autonegotiation */
-++ ret = phy_write(phydev, MII_BMCR, AT803X_SGMII_ANEG_EN);
-++ if (ret)
-++ return ret;
-++ /* select copper page */
-++ ret = phy_write(phydev, AT803X_REG_CHIP_CONFIG,
-++ v | AT803X_BT_BX_REG_SEL);
-++ if (ret)
-++ return ret;
-++ }
-+
-+ ret = genphy_config_init(phydev);
-+ if (ret < 0)
-+@@ -393,7 +418,7 @@ static struct phy_driver at803x_driver[]
-+ /* ATHEROS 8035 */
-+ .phy_id = ATH8035_PHY_ID,
-+ .name = "Atheros 8035 ethernet",
-+- .phy_id_mask = 0xffffffef,
-++ .phy_id_mask = AT803X_PHY_ID_MASK,
-+ .probe = at803x_probe,
-+ .config_init = at803x_config_init,
-+ .link_change_notify = at803x_link_change_notify,
-+@@ -412,7 +437,7 @@ static struct phy_driver at803x_driver[]
-+ /* ATHEROS 8030 */
-+ .phy_id = ATH8030_PHY_ID,
-+ .name = "Atheros 8030 ethernet",
-+- .phy_id_mask = 0xffffffef,
-++ .phy_id_mask = AT803X_PHY_ID_MASK,
-+ .probe = at803x_probe,
-+ .config_init = at803x_config_init,
-+ .link_change_notify = at803x_link_change_notify,
-+@@ -430,8 +455,8 @@ static struct phy_driver at803x_driver[]
-+ }, {
-+ /* ATHEROS 8031 */
-+ .phy_id = ATH8031_PHY_ID,
-+- .name = "Atheros 8031 ethernet",
-+- .phy_id_mask = 0xffffffef,
-++ .name = "Atheros 8031/8033 ethernet",
-++ .phy_id_mask = AT803X_PHY_ID_MASK,
-+ .probe = at803x_probe,
-+ .config_init = at803x_config_init,
-+ .link_change_notify = at803x_link_change_notify,
-+@@ -465,9 +490,9 @@ module_init(atheros_init);
-+ module_exit(atheros_exit);
-+
-+ static struct mdio_device_id __maybe_unused atheros_tbl[] = {
-+- { ATH8030_PHY_ID, 0xffffffef },
-+- { ATH8031_PHY_ID, 0xffffffef },
-+- { ATH8035_PHY_ID, 0xffffffef },
-++ { ATH8030_PHY_ID, AT803X_PHY_ID_MASK },
-++ { ATH8031_PHY_ID, AT803X_PHY_ID_MASK },
-++ { ATH8035_PHY_ID, AT803X_PHY_ID_MASK },
-+ { }
-+ };
-+
diff --git a/patches/openwrt/0082-ar71xx-fix-LEDs-and-sysupgrade-support-for-TL-WA801ND-v3.patch b/patches/openwrt/0082-ar71xx-fix-LEDs-and-sysupgrade-support-for-TL-WA801ND-v3.patch
deleted file mode 100644
index 7086cdffc3c1775858b11a68180a6f0de11b6bcb..0000000000000000000000000000000000000000
--- a/patches/openwrt/0082-ar71xx-fix-LEDs-and-sysupgrade-support-for-TL-WA801ND-v3.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Tue, 6 Dec 2016 16:18:49 +0100
-Subject: ar71xx: fix LEDs and sysupgrade support for TL-WA801ND v3
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh
-index 2c5d6af8f4e2c5ce71adc0b63d32b8506e01b6a2..6b0caa676e6fc23be94c5eae77ae72e76f07fec3 100644
---- a/target/linux/ar71xx/base-files/etc/diag.sh
-+++ b/target/linux/ar71xx/base-files/etc/diag.sh
-@@ -274,6 +274,7 @@ get_status_led() {
- tl-wr1043nd-v2 | \
- tl-wr741nd | \
- tl-wr741nd-v4 | \
-+ tl-wa801nd-v3 | \
- tl-wr841n-v1 | \
- tl-wr841n-v7 | \
- tl-wr841n-v8 | \
-diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
-index 2a0f9969cd22543de6e54a484052a27414c5d093..849755fb752c62a6fabf0ec609381b5d22991f1a 100644
---- a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
-+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
-@@ -536,6 +536,11 @@ tl-wa901nd-v3)
- ucidef_set_led_wlan "wlan" "WLAN" "tp-link:green:wlan" "phy0tpt"
- ;;
-
-+tl-wa801nd-v3)
-+ ucidef_set_led_netdev "lan" "LAN" "tp-link:green:lan" "eth1"
-+ ucidef_set_led_wlan "wlan" "WLAN" "tp-link:green:wlan" "phy0tpt"
-+ ;;
-+
- tl-wr941nd | \
- tl-wr1041n-v2)
- ucidef_set_led_wlan "wlan" "WLAN" "tp-link:green:wlan" "phy0tpt"
-diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
-index 4003b21df26917a521ed96db82a970a82cdbc2cb..ee2e596e1f5e462e544a919ca8ebca525e43cec9 100755
---- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
-+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
-@@ -349,6 +349,7 @@ platform_check_image() {
- tl-wa850re | \
- tl-wa860re | \
- tl-wa801nd-v2 | \
-+ tl-wa801nd-v3 | \
- tl-wa901nd | \
- tl-wa901nd-v2 | \
- tl-wa901nd-v3 | \
-diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wa801nd-v3.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wa801nd-v3.c
-index 39cdb10ee340650bc69e4f6054b06a4ae7421e57..054c14ee73faf629e1faf1efb19e804734602981 100644
---- a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wa801nd-v3.c
-+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wa801nd-v3.c
-@@ -24,7 +24,7 @@
- #include "machtypes.h"
-
- #define TL_WA801NDV3_GPIO_LED_WLAN 12
--#define TL_WA801NDV3_GPIO_LED_QSS 13
-+#define TL_WA801NDV3_GPIO_LED_SYSTEM 13
- #define TL_WA801NDV3_GPIO_LED_SECURITY_RED 11
- #define TL_WA801NDV3_GPIO_LED_SECURITY_GREEN 15
- #define TL_WA801NDV3_GPIO_LED_LAN 3
-@@ -46,8 +46,8 @@ static struct flash_platform_data tl_wa801n_v3_flash_data = {
-
- static struct gpio_led tl_wa801n_v3_leds_gpio[] __initdata = {
- {
-- .name = "tp-link:green:qss",
-- .gpio = TL_WA801NDV3_GPIO_LED_QSS,
-+ .name = "tp-link:green:system",
-+ .gpio = TL_WA801NDV3_GPIO_LED_SYSTEM,
- .active_low = 1,
- }, {
- .name = "tp-link:green:lan",
diff --git a/patches/openwrt/0083-ar71xx-simplify-model-detection-for-TP-Link-Pharos-devices.patch b/patches/openwrt/0083-ar71xx-simplify-model-detection-for-TP-Link-Pharos-devices.patch
deleted file mode 100644
index 9c743dfa199e9ca733ff2abaafbe8b9923729a0a..0000000000000000000000000000000000000000
--- a/patches/openwrt/0083-ar71xx-simplify-model-detection-for-TP-Link-Pharos-devices.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Sun, 11 Dec 2016 17:54:49 +0100
-Subject: ar71xx: simplify model detection for TP-Link Pharos devices
-
-This also makes the detection more flexible, as it doesn't need to check
-for each model explicitly.
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
-index 5928439f3ae253fc15eeb2ac30451ff467411e88..4a9a730caa3b7fa6321192812f407caf736f65a9 100755
---- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
-+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
-@@ -329,24 +329,10 @@ tplink_pharos_get_model_string() {
- tplink_pharos_board_detect() {
- local model_string="$(tplink_pharos_get_model_string | tr -d '\r')"
- local oIFS="$IFS"; IFS=":"; set -- $model_string; IFS="$oIFS"
-- local model
-
-- case "$1" in
-- 'CPE210(TP-LINK|UN|N300-2)')
-- model='TP-Link CPE210'
-- ;;
-- 'CPE220(TP-LINK|UN|N300-2)')
-- model='TP-Link CPE220'
-- ;;
-- 'CPE510(TP-LINK|UN|N300-5)')
-- model='TP-Link CPE510'
-- ;;
-- 'CPE520(TP-LINK|UN|N300-5)')
-- model='TP-Link CPE520'
-- ;;
-- esac
-+ local model="${1%%\(*}"
-
-- [ -n "$model" ] && AR71XX_MODEL="$model v$2"
-+ AR71XX_MODEL="TP-Link $model v$2"
- }
-
- gl_inet_board_detect() {
diff --git a/patches/openwrt/0084-ar71xx-generic-add-Support-for-TP-LINK-TL-WR940N-v4.patch b/patches/openwrt/0084-ar71xx-generic-add-Support-for-TP-LINK-TL-WR940N-v4.patch
deleted file mode 100644
index 0711f78d6fe144a4e787daa857fa36c00ca97134..0000000000000000000000000000000000000000
--- a/patches/openwrt/0084-ar71xx-generic-add-Support-for-TP-LINK-TL-WR940N-v4.patch
+++ /dev/null
@@ -1,400 +0,0 @@
-From: David Lutz <kpanic@hirnduenger.de>
-Date: Sun, 11 Dec 2016 21:06:14 +0100
-Subject: ar71xx-generic: add Support for TP-LINK TL-WR940N v4
-
-Signed-off-by: David Lutz <kpanic@hirnduenger.de>
-
-diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh
-index 6b0caa676e6fc23be94c5eae77ae72e76f07fec3..67043d432cf7a469bf1ded14bc354274ab16e3e6 100644
---- a/target/linux/ar71xx/base-files/etc/diag.sh
-+++ b/target/linux/ar71xx/base-files/etc/diag.sh
-@@ -296,6 +296,7 @@ get_status_led() {
- tl-wr703n | \
- tl-wr710n | \
- tl-wr720n-v3 | \
-+ tl-wr940n-v4 | \
- tl-wr941nd-v6)
- status_led="tp-link:blue:system"
- ;;
-diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
-index 849755fb752c62a6fabf0ec609381b5d22991f1a..e47cbb0b01ef4a335c059a74af66d9f8999b3b3d 100644
---- a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
-+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
-@@ -486,6 +486,7 @@ tl-wr941nd-v5)
- ucidef_set_led_wlan "wlan" "WLAN" "tp-link:green:wlan" "phy0tpt"
- ;;
-
-+tl-wr940n-v4 | \
- tl-wr941nd-v6)
- ucidef_set_led_netdev "wan" "WAN" "tp-link:blue:wan" "eth0"
- ucidef_set_led_switch "lan1" "LAN1" "tp-link:blue:lan1" "switch0" "0x10"
-diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
-index 027a671215e5acd70cee06620c6648506ad6be47..878623ce3fd8b7c585da73c7bd72794a144096a3 100755
---- a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
-+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
-@@ -229,6 +229,7 @@ tl-wr841n-v8 |\
- tl-wr842n-v2 |\
- tl-wr941nd-v5 |\
- tl-wr941nd-v6 |\
-+tl-wr940n-v4 |\
- wnr2000-v3 |\
- wnr2000-v4 |\
- wnr2200 |\
-diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
-index 4a9a730caa3b7fa6321192812f407caf736f65a9..6df0d8a8d0d52c103b9ded2170af19a9a6b5f8bb 100755
---- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
-+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
-@@ -235,6 +235,9 @@ tplink_board_detect() {
- "090100"*)
- model="TP-Link TL-WA901N/ND"
- ;;
-+ "094000"*)
-+ model="TP-Link TL-WR940N"
-+ ;;
- "094100"*)
- if [ "$hwid" = "09410002" -a "$mid" = "00420001" ]; then
- model="Rosewill RNX-N360RT"
-@@ -884,6 +887,9 @@ ar71xx_board_detect() {
- *"TL-WR941N/ND v6")
- name="tl-wr941nd-v6"
- ;;
-+ *"TL-WR940N v4")
-+ name="tl-wr940n-v4"
-+ ;;
- *"TL-WR703N v1")
- name="tl-wr703n"
- ;;
-diff --git a/target/linux/ar71xx/base-files/lib/preinit/05_set_preinit_iface_ar71xx b/target/linux/ar71xx/base-files/lib/preinit/05_set_preinit_iface_ar71xx
-index f552453e43363c5ab687116eee1889af8171dbb6..e5e4abd547f38ecda4a0cb67858df8f5d3477d59 100644
---- a/target/linux/ar71xx/base-files/lib/preinit/05_set_preinit_iface_ar71xx
-+++ b/target/linux/ar71xx/base-files/lib/preinit/05_set_preinit_iface_ar71xx
-@@ -36,6 +36,7 @@ set_preinit_iface() {
- tl-wr841n-v8 |\
- tl-wr842n-v2 |\
- tl-wr941nd-v6 |\
-+ tl-wr940n-v4 |\
- wnr2000-v3 |\
- wnr2200 |\
- wnr612-v2 |\
-diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
-index ee2e596e1f5e462e544a919ca8ebca525e43cec9..76c252ccb14db970aac63ea1d2eaddca3d867867 100755
---- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
-+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
-@@ -373,6 +373,7 @@ platform_check_image() {
- tl-wr941nd | \
- tl-wr941nd-v5 | \
- tl-wr941nd-v6 | \
-+ tl-wr940n-v4 | \
- tl-wr1041n-v2 | \
- tl-wr1043nd | \
- tl-wr1043nd-v2 | \
-diff --git a/target/linux/ar71xx/config-3.18 b/target/linux/ar71xx/config-3.18
-index d7cbe2e79af31a0ff88d946323e237f3215620a0..050362614a464b56d3740a7954686fe4e5b37803 100644
---- a/target/linux/ar71xx/config-3.18
-+++ b/target/linux/ar71xx/config-3.18
-@@ -141,6 +141,7 @@ CONFIG_ATH79_MACH_TL_WR841N_V8=y
- CONFIG_ATH79_MACH_TL_WR841N_V9=y
- CONFIG_ATH79_MACH_TL_WR941ND=y
- CONFIG_ATH79_MACH_TL_WR941ND_V6=y
-+CONFIG_ATH79_MACH_TL_WR940N_V4=y
- CONFIG_ATH79_MACH_TUBE2H=y
- CONFIG_ATH79_MACH_UBNT=y
- CONFIG_ATH79_MACH_UBNT_UNIFIAC=y
-diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr940n-v4.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr940n-v4.c
-new file mode 100644
-index 0000000000000000000000000000000000000000..d693b947c843d2a74cd252503fa8bf68b20da4ab
---- /dev/null
-+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr940n-v4.c
-@@ -0,0 +1,149 @@
-+/*
-+ * TP-LINK TL-WR940N v4 board support
-+ *
-+ * Copyright (C) 2016 David Lutz <kpanic@ff3l.net>
-+ *
-+ * This program is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 as published
-+ * by the Free Software Foundation.
-+ */
-+
-+#include <linux/gpio.h>
-+#include <linux/platform_device.h>
-+
-+#include <asm/mach-ath79/ath79.h>
-+#include <asm/mach-ath79/ar71xx_regs.h>
-+
-+#include "common.h"
-+#include "dev-eth.h"
-+#include "dev-gpio-buttons.h"
-+#include "dev-leds-gpio.h"
-+#include "dev-m25p80.h"
-+#include "dev-wmac.h"
-+#include "machtypes.h"
-+
-+
-+#define TL_WR940N_V4_GPIO_LED_QSS 3
-+#define TL_WR940N_V4_GPIO_LED_WAN 14
-+#define TL_WR940N_V4_GPIO_LED_WAN_RED 15
-+#define TL_WR940N_V4_GPIO_LED_LAN4 4
-+#define TL_WR940N_V4_GPIO_LED_LAN3 18
-+#define TL_WR940N_V4_GPIO_LED_LAN2 6
-+#define TL_WR940N_V4_GPIO_LED_LAN1 8
-+#define TL_WR940N_V4_GPIO_LED_WLAN 7
-+#define TL_WR940N_V4_GPIO_LED_SYSTEM 5
-+
-+#define TL_WR940N_V4_GPIO_BTN_RESET 1
-+#define TL_WR940N_V4_GPIO_BTN_RFKILL 2
-+
-+#define TL_WR940N_V4_KEYS_POLL_INTERVAL 20
-+#define TL_WR940N_V4_KEYS_DEBOUNCE_INTERVAL (3 * TL_WR940N_V4_KEYS_POLL_INTERVAL)
-+
-+
-+static struct gpio_led tl_wr940n_v4_leds_gpio[] __initdata = {
-+ {
-+ .name = "tp-link:blue:qss",
-+ .gpio = TL_WR940N_V4_GPIO_LED_QSS,
-+ .active_low = 1,
-+ },
-+ {
-+ .name = "tp-link:blue:wan",
-+ .gpio = TL_WR940N_V4_GPIO_LED_WAN,
-+ .active_low = 1,
-+ },
-+ {
-+ .name = "tp-link:red:wan",
-+ .gpio = TL_WR940N_V4_GPIO_LED_WAN_RED,
-+ .active_low = 0,
-+ },
-+ {
-+ .name = "tp-link:blue:lan1",
-+ .gpio = TL_WR940N_V4_GPIO_LED_LAN1,
-+ .active_low = 1,
-+ },
-+ {
-+ .name = "tp-link:blue:lan2",
-+ .gpio = TL_WR940N_V4_GPIO_LED_LAN2,
-+ .active_low = 1,
-+ },
-+ {
-+ .name = "tp-link:blue:lan3",
-+ .gpio = TL_WR940N_V4_GPIO_LED_LAN3,
-+ .active_low = 1,
-+ },
-+ {
-+ .name = "tp-link:blue:lan4",
-+ .gpio = TL_WR940N_V4_GPIO_LED_LAN4,
-+ .active_low = 1,
-+ },
-+ {
-+ .name = "tp-link:blue:wlan",
-+ .gpio = TL_WR940N_V4_GPIO_LED_WLAN,
-+ .active_low = 1,
-+ },
-+ {
-+ .name = "tp-link:blue:system",
-+ .gpio = TL_WR940N_V4_GPIO_LED_SYSTEM,
-+ .active_low = 1,
-+ },
-+};
-+
-+static struct gpio_keys_button tl_wr940n_v4_gpio_keys[] __initdata = {
-+ {
-+ .desc = "Reset button",
-+ .type = EV_KEY,
-+ .code = KEY_RESTART,
-+ .debounce_interval = TL_WR940N_V4_KEYS_DEBOUNCE_INTERVAL,
-+ .gpio = TL_WR940N_V4_GPIO_BTN_RESET,
-+ .active_low = 1,
-+ }, {
-+ .desc = "RFKILL button",
-+ .type = EV_KEY,
-+ .code = KEY_RFKILL,
-+ .debounce_interval = TL_WR940N_V4_KEYS_DEBOUNCE_INTERVAL,
-+ .gpio = TL_WR940N_V4_GPIO_BTN_RFKILL,
-+ .active_low = 1,
-+ }
-+};
-+
-+
-+static const char *tl_wr940n_v4_part_probes[] = {
-+ "tp-link",
-+ NULL,
-+};
-+
-+static struct flash_platform_data tl_wr940n_v4_flash_data = {
-+ .part_probes = tl_wr940n_v4_part_probes,
-+};
-+
-+
-+static void __init tl_wr940n_v4_setup(void)
-+{
-+ u8 *mac = (u8 *) KSEG1ADDR(0x1f01fc00);
-+ u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
-+
-+ ath79_register_m25p80(&tl_wr940n_v4_flash_data);
-+
-+ ath79_register_leds_gpio(-1, ARRAY_SIZE(tl_wr940n_v4_leds_gpio),
-+ tl_wr940n_v4_leds_gpio);
-+
-+ ath79_register_gpio_keys_polled(-1, TL_WR940N_V4_KEYS_POLL_INTERVAL,
-+ ARRAY_SIZE(tl_wr940n_v4_gpio_keys),
-+ tl_wr940n_v4_gpio_keys);
-+
-+ ath79_register_mdio(0, 0x0);
-+
-+ ath79_init_mac(ath79_eth0_data.mac_addr, mac, 1);
-+ ath79_init_mac(ath79_eth1_data.mac_addr, mac, -1);
-+
-+ ath79_switch_data.phy4_mii_en = 1;
-+
-+ ath79_register_eth(0);
-+ ath79_register_eth(1);
-+
-+ ath79_register_wmac(ee, mac);
-+
-+}
-+
-+MIPS_MACHINE(ATH79_MACH_TL_WR940N_V4, "TL-WR940N-v4", "TP-LINK TL-WR940N v4",
-+ tl_wr940n_v4_setup);
-diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
-index 6346eb9ffa6c9bbeb1eaa5de229cf69ce12c1f83..b35c713f3c92c3d02f26f4bf535aeec34fd71b12 100644
---- a/target/linux/ar71xx/image/Makefile
-+++ b/target/linux/ar71xx/image/Makefile
-@@ -650,6 +650,16 @@ define Device/tl-wr941nd-v6
- TPLINK_HWID := 0x09410006
- endef
-
-+define Device/tl-wr940n-v4
-+ $(Device/tplink-4mlzma)
-+ BOARDNAME := TL-WR940N-v4
-+ DEVICE_PROFILE := TLWR941
-+ TPLINK_HWID := 0x09400004
-+ IMAGES += factory-us.bin factory-eu.bin
-+ IMAGE/factory-us.bin := append-rootfs | mktplinkfw factory -C US
-+ IMAGE/factory-eu.bin := append-rootfs | mktplinkfw factory -C EU
-+endef
-+
- # Chinese version (unlike European) is similar to the TL-WDR3500
- define Device/tl-wr941nd-v6-cn
- $(Device/tplink-4mlzma)
-@@ -657,7 +667,7 @@ define Device/tl-wr941nd-v6-cn
- DEVICE_PROFILE := TLWR941
- TPLINK_HWID := 0x09410006
- endef
--TARGET_DEVICES += tl-wr941nd-v5 tl-wr941nd-v6 tl-wr941nd-v6-cn
-+TARGET_DEVICES += tl-wr941nd-v5 tl-wr941nd-v6 tl-wr941nd-v6-cn tl-wr940n-v4
-
- define Device/tl-wr1041n-v2
- $(Device/tplink-4mlzma)
-diff --git a/target/linux/ar71xx/mikrotik/config-default b/target/linux/ar71xx/mikrotik/config-default
-index 2b1fe2491c7a00449453efdc4969015ec1b28291..75155b22489a60748b3b1357a1d9c549092255ba 100644
---- a/target/linux/ar71xx/mikrotik/config-default
-+++ b/target/linux/ar71xx/mikrotik/config-default
-@@ -94,6 +94,7 @@ CONFIG_ATH79_MACH_RBSXTLITE=y
- # CONFIG_ATH79_MACH_TL_WR841N_V8 is not set
- # CONFIG_ATH79_MACH_TL_WR841N_V9 is not set
- # CONFIG_ATH79_MACH_TL_WR941ND is not set
-+# CONFIG_ATH79_MACH_TL_WR940N_V4 is not set
- # CONFIG_ATH79_MACH_TUBE2H is not set
- # CONFIG_ATH79_MACH_UBNT is not set
- # CONFIG_ATH79_MACH_UBNT_XM is not set
-diff --git a/target/linux/ar71xx/nand/config-default b/target/linux/ar71xx/nand/config-default
-index f62cf1a4399718b2f4e94a974d26ddaf8d46a8ec..802d6e0502b51a4ecf2259c20e9b6667cd255680 100644
---- a/target/linux/ar71xx/nand/config-default
-+++ b/target/linux/ar71xx/nand/config-default
-@@ -57,6 +57,7 @@
- # CONFIG_ATH79_MACH_TL_WR841N_V1 is not set
- # CONFIG_ATH79_MACH_TL_WR841N_V8 is not set
- # CONFIG_ATH79_MACH_TL_WR941ND is not set
-+# CONFIG_ATH79_MACH_TL_WR940N_V4 is not set
- # CONFIG_ATH79_MACH_UBNT is not set
- # CONFIG_ATH79_MACH_UBNT_XM is not set
- # CONFIG_ATH79_MACH_UBNT_UNIFIAC is not set
-diff --git a/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch b/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch
-index d23f0cf33e50da891e7135861f1defda047ff2c8..b7517464742679b66c3bd916b9b2a2fcc34b65e1 100644
---- a/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch
-+++ b/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch
-@@ -1,6 +1,6 @@
- --- a/arch/mips/ath79/machtypes.h
- +++ b/arch/mips/ath79/machtypes.h
--@@ -16,22 +16,205 @@
-+@@ -16,22 +16,206 @@
-
- enum ath79_mach_type {
- ATH79_MACH_GENERIC = 0,
-@@ -154,6 +154,7 @@
- + ATH79_MACH_TL_WR941ND, /* TP-LINK TL-WR941ND */
- + ATH79_MACH_TL_WR941ND_V5, /* TP-LINK TL-WR941ND v5 */
- + ATH79_MACH_TL_WR941ND_V6, /* TP-LINK TL-WR941ND v6 */
-++ ATH79_MACH_TL_WR940N_V4, /* TP-LINK TL-WR940N v4 */
- + ATH79_MACH_TUBE2H, /* Alfa Network Tube2H */
- + ATH79_MACH_UBNT_AIRGW, /* Ubiquiti AirGateway */
- ATH79_MACH_UBNT_AIRROUTER, /* Ubiquiti AirRouter */
-@@ -354,7 +355,7 @@
- config ATH79_MACH_PB44
- bool "Atheros PB44 reference board"
- select SOC_AR71XX
--@@ -68,6 +178,967 @@ config ATH79_MACH_PB44
-+@@ -68,6 +178,976 @@ config ATH79_MACH_PB44
- Say 'Y' here if you want your kernel to support the
- Atheros PB44 reference board.
-
-@@ -1229,6 +1230,15 @@
- + select ATH79_DEV_M25P80
- + select ATH79_DEV_WMAC
- +
-++config ATH79_MACH_TL_WR940N_V4
-++ bool "TP-LINK TL-WR940N v4 support"
-++ select SOC_QCA956X
-++ select ATH79_DEV_ETH
-++ select ATH79_DEV_GPIO_BUTTONS
-++ select ATH79_DEV_LEDS_GPIO
-++ select ATH79_DEV_M25P80
-++ select ATH79_DEV_WMAC
-++
- +config ATH79_MACH_TL_WR1041N_V2
- + bool "TP-LINK TL-WR1041N v2 support"
- + select SOC_AR934X
-@@ -1322,7 +1332,7 @@
- config ATH79_MACH_UBNT_XM
- bool "Ubiquiti Networks XM/UniFi boards"
- select SOC_AR724X
--@@ -83,6 +1154,117 @@ config ATH79_MACH_UBNT_XM
-+@@ -83,6 +1163,117 @@ config ATH79_MACH_UBNT_XM
- Say 'Y' here if you want your kernel to support the
- Ubiquiti Networks XM (rev 1.0) board.
-
-@@ -1440,7 +1450,7 @@
- endmenu
-
- config SOC_AR71XX
--@@ -124,7 +1306,10 @@ config ATH79_DEV_DSA
-+@@ -124,7 +1315,10 @@ config ATH79_DEV_DSA
- config ATH79_DEV_ETH
- def_bool n
-
-@@ -1452,7 +1462,7 @@
- def_bool n
-
- config ATH79_DEV_GPIO_BUTTONS
--@@ -154,6 +1339,11 @@ config ATH79_PCI_ATH9K_FIXUP
-+@@ -154,6 +1348,11 @@ config ATH79_PCI_ATH9K_FIXUP
- def_bool n
-
- config ATH79_ROUTERBOOT
-@@ -1466,7 +1476,7 @@
- endif
- --- a/arch/mips/ath79/Makefile
- +++ b/arch/mips/ath79/Makefile
--@@ -38,9 +38,130 @@ obj-$(CONFIG_ATH79_ROUTERBOOT) += route
-+@@ -38,9 +47,131 @@ obj-$(CONFIG_ATH79_ROUTERBOOT) += route
- #
- # Machines
- #
-@@ -1561,6 +1571,7 @@
- +obj-$(CONFIG_ATH79_MACH_TL_WR841N_V9) += mach-tl-wr841n-v9.o
- +obj-$(CONFIG_ATH79_MACH_TL_WR941ND) += mach-tl-wr941nd.o
- +obj-$(CONFIG_ATH79_MACH_TL_WR941ND_V6) += mach-tl-wr941nd-v6.o
-++obj-$(CONFIG_ATH79_MACH_TL_WR940N_V4) += mach-tl-wr940n-v4.o
- +obj-$(CONFIG_ATH79_MACH_TL_WR1041N_V2) += mach-tl-wr1041n-v2.o
- +obj-$(CONFIG_ATH79_MACH_TL_WR1043ND) += mach-tl-wr1043nd.o
- +obj-$(CONFIG_ATH79_MACH_TL_WR1043ND_V2) += mach-tl-wr1043nd-v2.o
diff --git a/patches/openwrt/0085-x86-preserve-partition-table-on-sysupgrade.patch b/patches/openwrt/0085-x86-preserve-partition-table-on-sysupgrade.patch
deleted file mode 100644
index 8b50fcaaf1d467a72cd781b0e2e0463b73963f34..0000000000000000000000000000000000000000
--- a/patches/openwrt/0085-x86-preserve-partition-table-on-sysupgrade.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-From: Jo-Philipp Wich <jow@openwrt.org>
-Date: Tue, 9 Feb 2016 12:33:17 +0000
-Subject: x86: preserve partition table on sysupgrade
-
-With this patch sysupgrade will write directly to the partitions
-instead of to the main disk. The UUID is copied from the image
-to the MBR as well. This prevents the mbr from being completely
-overwritten and losing the partition table. The -p option has
-been added to maintain the original behavior and overwite the
-entire disk with the new image. Tests have been added to ensure
-that the image partitions match up with the active partitions.
-
-Signed-off-by: Rob Mosher <nyt-openwrt@countercultured.net>
-
-Backport of OpenWrt r48682
-
-diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh
-index 761b4c17957e2cf63b88025520b6fba59c890255..dc865544f65c16399dcced55b8b09c671b31b5d1 100644
---- a/package/base-files/files/lib/upgrade/common.sh
-+++ b/package/base-files/files/lib/upgrade/common.sh
-@@ -67,6 +67,7 @@ run_ramfs() { # <command> [...]
- install_bin /usr/sbin/ubirsvol
- install_bin /usr/sbin/ubirmvol
- install_bin /usr/sbin/ubimkvol
-+ install_bin /usr/sbin/partx
- for file in $RAMFS_COPY_BIN; do
- install_bin ${file//:/ }
- done
-diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade
-index ef83c4b00f1a88ae5d68fc70adf51a6af3dc109c..759c841e131a415c8009995c372cce1f55fb78a0 100755
---- a/package/base-files/files/sbin/sysupgrade
-+++ b/package/base-files/files/sbin/sysupgrade
-@@ -10,6 +10,7 @@ export INTERACTIVE=0
- export VERBOSE=1
- export SAVE_CONFIG=1
- export SAVE_OVERLAY=0
-+export SAVE_PARTITIONS=1
- export DELAY=
- export CONF_IMAGE=
- export CONF_BACKUP_LIST=0
-@@ -29,6 +30,7 @@ while [ -n "$1" ]; do
- -q) export VERBOSE="$(($VERBOSE - 1))";;
- -n) export SAVE_CONFIG=0;;
- -c) export SAVE_OVERLAY=1;;
-+ -p) export SAVE_PARTITIONS=0;;
- -b|--create-backup) export CONF_BACKUP="$2" NEED_IMAGE=1; shift;;
- -r|--restore-backup) export CONF_RESTORE="$2" NEED_IMAGE=1; shift;;
- -l|--list-backup) export CONF_BACKUP_LIST=1; break;;
-@@ -62,6 +64,7 @@ upgrade-option:
- -i interactive mode
- -c attempt to preserve all changed files in /etc/
- -n do not save configuration over reflash
-+ -p do not attempt to restore the partition table after flash.
- -T | --test
- Verify image and config .tar.gz but do not actually flash.
- -F | --force
-diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile
-index ba733c02480b248aa95331da2bcd8fee3e25f812..29a232296a02b253344927a61eecb40503473d59 100644
---- a/target/linux/x86/Makefile
-+++ b/target/linux/x86/Makefile
-@@ -13,6 +13,8 @@ FEATURES:=squashfs ext4 vdi vmdk pcmcia targz
- SUBTARGETS=generic xen_domu ep80579 geode kvm_guest rdc 64
- MAINTAINER:=Felix Fietkau <nbd@openwrt.org>
-
-+DEFAULT_PACKAGES += partx-utils
-+
- KERNEL_PATCHVER:=3.18
-
- KERNELNAME:=bzImage
-diff --git a/target/linux/x86/base-files/lib/upgrade/platform.sh b/target/linux/x86/base-files/lib/upgrade/platform.sh
-index adc119c897ed840aef17c2041a48244d0922564e..c21f1a7e5feba553110f138c14977daaa472da70 100644
---- a/target/linux/x86/base-files/lib/upgrade/platform.sh
-+++ b/target/linux/x86/base-files/lib/upgrade/platform.sh
-@@ -55,12 +55,59 @@ platform_copy_config() {
- fi
- }
-
-+get_partitions() { # <device> <filename>
-+ local disk="$1"
-+ local filename="$2"
-+
-+ if [ -b "$disk" -o -f "$disk" ]; then
-+ echo "Reading partition table from $filename..."
-+ partx -r "$disk" -gbo NR,START,SECTORS > "/tmp/partx.$filename"
-+ fi
-+}
-+
- platform_do_upgrade() {
- platform_export_bootpart
-+ disk="${BOOTPART%[0-9]}"
-
-- if [ -b "${BOOTPART%[0-9]}" ]; then
-+ if [ -b "$disk" ]; then
- sync
-- get_image "$@" | dd of="${BOOTPART%[0-9]}" bs=4096 conv=fsync
-+ if [ "$SAVE_PARTITIONS" = "1" ]; then
-+ get_partitions "$disk" bootdisk
-+
-+
-+ #get block size
-+ sectors="$(partx -r $disk -gbo SECTORS --nr 1:1)"
-+ size="$(partx -r $disk -gbo SIZE --nr 1:1)"
-+ ibs="$(($size / $sectors))"
-+
-+ #extract the boot sector from the image
-+ get_image "$@" | dd of=/tmp/image.bs count=1 bs=512b
-+
-+ get_partitions /tmp/image.bs image
-+
-+ #compare tables
-+ diff="$(grep -F -x -v -f /tmp/partx.bootdisk /tmp/partx.image)"
-+ if [ -n "$diff" ]; then
-+ echo "Partition layout is changed. Full image will be written."
-+ ask_bool 0 "Abort" && exit
-+
-+ get_image "$@" | dd of="$disk" bs=4096 conv=fsync
-+ return 0
-+ fi
-+
-+ #iterate over each partition from the image and write it to the boot disk
-+ while read part start size; do
-+ echo "Writing image to $disk$part..."
-+ get_image "$@" | dd of="$disk$part" ibs="$ibs" obs=1M skip="$start" count="$size" conv=fsync
-+ done < /tmp/partx.image
-+
-+ #copy partition uuid
-+ echo "Writing new UUID to $disk$part..."
-+ get_image "$@" | dd of="$disk" bs=1 skip=440 count=4 seek=440 conv=fsync
-+ else
-+ get_image "$@" | dd of="$disk" bs=4096 conv=fsync
-+ fi
-+
- sleep 1
- fi
- }
diff --git a/patches/openwrt/0086-x86-make-sysupgrade-work-without-partx.patch b/patches/openwrt/0086-x86-make-sysupgrade-work-without-partx.patch
deleted file mode 100644
index 852c088d2136237acf8ca0dd5ac3a96cff12a5e9..0000000000000000000000000000000000000000
--- a/patches/openwrt/0086-x86-make-sysupgrade-work-without-partx.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From: Jo-Philipp Wich <jo@mein.io>
-Date: Wed, 30 Mar 2016 03:10:51 +0200
-Subject: x86: make sysupgrade work without partx
-
-Signed-off-by: Jo-Philipp Wich <jo@mein.io>
-
-Backport of LEDE 9f422eba7c1a297a96a03b1cce05fa3cb9d71a4a
-
-diff --git a/target/linux/x86/base-files/lib/upgrade/platform.sh b/target/linux/x86/base-files/lib/upgrade/platform.sh
-index c21f1a7e5feba553110f138c14977daaa472da70..f12deebf6484df6f3f69e453ad67688a76d57972 100644
---- a/target/linux/x86/base-files/lib/upgrade/platform.sh
-+++ b/target/linux/x86/base-files/lib/upgrade/platform.sh
-@@ -61,7 +61,27 @@ get_partitions() { # <device> <filename>
-
- if [ -b "$disk" -o -f "$disk" ]; then
- echo "Reading partition table from $filename..."
-- partx -r "$disk" -gbo NR,START,SECTORS > "/tmp/partx.$filename"
-+
-+ local magic="$(hexdump -v -n 2 -s 0x1FE -e '1/2 "0x%04X"' "$disk")"
-+ if [ "$magic" != 0xAA55 ]; then
-+ echo "Invalid partition table on $disk"
-+ exit
-+ fi
-+
-+ rm -f "/tmp/partmap.$filename"
-+
-+ local part
-+ for part in 1 2 3 4; do
-+ set -- $(hexdump -v -n 12 -s "$((0x1B2 + $part * 16))" -e '3/4 "0x%08X "' "$disk")
-+
-+ local type="$(($1 % 256))"
-+ local lba="$(($2))"
-+ local num="$(($3))"
-+
-+ [ $type -gt 0 ] || continue
-+
-+ printf "%2d %5d %7d\n" $part $lba $num >> "/tmp/partmap.$filename"
-+ done
- fi
- }
-
-@@ -76,9 +96,11 @@ platform_do_upgrade() {
-
-
- #get block size
-- sectors="$(partx -r $disk -gbo SECTORS --nr 1:1)"
-- size="$(partx -r $disk -gbo SIZE --nr 1:1)"
-- ibs="$(($size / $sectors))"
-+ if [ -f "/sys/block/${disk##*/}/queue/physical_block_size" ]; then
-+ ibs="$(cat "/sys/block/${disk##*/}/queue/physical_block_size")"
-+ else
-+ ibs=512
-+ fi
-
- #extract the boot sector from the image
- get_image "$@" | dd of=/tmp/image.bs count=1 bs=512b
-@@ -86,7 +108,7 @@ platform_do_upgrade() {
- get_partitions /tmp/image.bs image
-
- #compare tables
-- diff="$(grep -F -x -v -f /tmp/partx.bootdisk /tmp/partx.image)"
-+ diff="$(grep -F -x -v -f /tmp/partmap.bootdisk /tmp/partmap.image)"
- if [ -n "$diff" ]; then
- echo "Partition layout is changed. Full image will be written."
- ask_bool 0 "Abort" && exit
-@@ -99,7 +121,7 @@ platform_do_upgrade() {
- while read part start size; do
- echo "Writing image to $disk$part..."
- get_image "$@" | dd of="$disk$part" ibs="$ibs" obs=1M skip="$start" count="$size" conv=fsync
-- done < /tmp/partx.image
-+ done < /tmp/partmap.image
-
- #copy partition uuid
- echo "Writing new UUID to $disk$part..."
diff --git a/patches/openwrt/0087-x86-search-PARTUUID-in-any-block-device.patch b/patches/openwrt/0087-x86-search-PARTUUID-in-any-block-device.patch
deleted file mode 100644
index 19f3652c4f6872db3ede96fed665ef4233e157b8..0000000000000000000000000000000000000000
--- a/patches/openwrt/0087-x86-search-PARTUUID-in-any-block-device.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Jo-Philipp Wich <jo@mein.io>
-Date: Wed, 30 Mar 2016 03:19:23 +0200
-Subject: x86: search PARTUUID in any block device
-
-Signed-off-by: Jo-Philipp Wich <jo@mein.io>
-
-Backport of LEDE 924fb794bde41eca8289c6cf10322bf6683b4a80
-
-diff --git a/target/linux/x86/base-files/lib/upgrade/platform.sh b/target/linux/x86/base-files/lib/upgrade/platform.sh
-index f12deebf6484df6f3f69e453ad67688a76d57972..29eac77dfb0ae52f241696f3f62dce7d16106b20 100644
---- a/target/linux/x86/base-files/lib/upgrade/platform.sh
-+++ b/target/linux/x86/base-files/lib/upgrade/platform.sh
-@@ -17,7 +17,8 @@ platform_export_bootpart() {
- PARTUUID=[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-02)
- uuid="${disk#PARTUUID=}"
- uuid="${uuid%-02}"
-- for disk in /dev/[hsv]d[a-z] /dev/xvd[a-z]; do
-+ for disk in /dev/*; do
-+ [ -b "$disk" ] || continue
- set -- $(dd if=$disk bs=1 skip=440 count=4 2>/dev/null | hexdump -v -e '4/1 "%02x "')
- if [ "$4$3$2$1" = "$uuid" ]; then
- export BOOTPART="${disk}1"
diff --git a/patches/openwrt/0088-x86-generalize-partition-discovery-for-sysupgrade.patch b/patches/openwrt/0088-x86-generalize-partition-discovery-for-sysupgrade.patch
deleted file mode 100644
index 3c973aeae34be78e30adc61c198dc66fdd419d57..0000000000000000000000000000000000000000
--- a/patches/openwrt/0088-x86-generalize-partition-discovery-for-sysupgrade.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-From: Jo-Philipp Wich <jo@mein.io>
-Date: Tue, 24 May 2016 12:07:02 +0200
-Subject: x86: generalize partition discovery for sysupgrade
-
-Generalize the partition discovery in sysupgrade in order to fix sysupgrade
-and config backup/recovery on MMC block devices which use a different naming
-scheme compared to mtdblock or sd* devices.
-
-The change also adds the find applet to the ramdisk utilities so that upgrade
-code can rely on it.
-
-The commit is based on the initial submission by Russell Senior at
-http://patchwork.ozlabs.org/patch/625440/ .
-
-Signed-off-by: Russell Senior <russell@personaltelco.net>
-Signed-off-by: Jo-Philipp Wich <jo@mein.io>
-
-Backport of LEDE 1012701014bd944197031a3c0023527861b521b4
-
-diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh
-index dc865544f65c16399dcced55b8b09c671b31b5d1..14684959dd46d04b1c4b72213dbe06943ae64686 100644
---- a/package/base-files/files/lib/upgrade/common.sh
-+++ b/package/base-files/files/lib/upgrade/common.sh
-@@ -53,7 +53,7 @@ run_ramfs() { # <command> [...]
- /bin/dd /bin/vi /bin/ls /bin/cat /usr/bin/awk /usr/bin/hexdump \
- /bin/sleep /bin/zcat /usr/bin/bzcat /usr/bin/printf /usr/bin/wc \
- /bin/cut /usr/bin/printf /bin/sync /bin/mkdir /bin/rmdir \
-- /bin/rm /usr/bin/basename /bin/kill /bin/chmod
-+ /bin/rm /usr/bin/basename /bin/kill /bin/chmod /usr/bin/find
-
- install_bin /sbin/mtd
- install_bin /sbin/mount_root
-diff --git a/target/linux/x86/base-files/lib/preinit/79_move_config b/target/linux/x86/base-files/lib/preinit/79_move_config
-index 1d4873d78b480cb3f11e04e6246559417b431a8a..5ac81cb90d1c15782a9c4f271720cfa66d6d03a9 100644
---- a/target/linux/x86/base-files/lib/preinit/79_move_config
-+++ b/target/linux/x86/base-files/lib/preinit/79_move_config
-@@ -2,10 +2,12 @@
- # Copyright (C) 2012-2015 OpenWrt.org
-
- move_config() {
-+ local partdev
-+
- . /lib/upgrade/platform.sh
-
-- if platform_export_bootpart; then
-- mount -t ext4 -o rw,noatime "$BOOTPART" /mnt
-+ if platform_export_bootdevice && platform_export_partdevice partdev 1; then
-+ mount -t ext4 -o rw,noatime "/dev/$partdev" /mnt
- mv -f /mnt/sysupgrade.tgz /
- umount /mnt
- fi
-diff --git a/target/linux/x86/base-files/lib/upgrade/platform.sh b/target/linux/x86/base-files/lib/upgrade/platform.sh
-index 29eac77dfb0ae52f241696f3f62dce7d16106b20..c8bc3f7f608fc82ee3afc049b64af3a740fd2c37 100644
---- a/target/linux/x86/base-files/lib/upgrade/platform.sh
-+++ b/target/linux/x86/base-files/lib/upgrade/platform.sh
-@@ -1,5 +1,21 @@
--platform_export_bootpart() {
-- local cmdline uuid disk
-+platform_export_partdevice() {
-+ local var="$1" offset="$2"
-+ local uevent MAJOR MINOR DEVNAME DEVTYPE
-+
-+ for uevent in /sys/class/block/*/uevent; do
-+ . "$uevent"
-+ if [ $BOOTDEV_MAJOR = $MAJOR -a $(($BOOTDEV_MINOR + $offset)) = $MINOR -a -b "/dev/$DEVNAME" ]; then
-+ export "$var=$DEVNAME"
-+ return 0
-+ fi
-+ done
-+
-+ return 1
-+}
-+
-+platform_export_bootdevice() {
-+ local cmdline uuid disk uevent
-+ local MAJOR MINOR DEVNAME DEVTYPE
-
- if read cmdline < /proc/cmdline; then
- case "$cmdline" in
-@@ -17,20 +33,27 @@ platform_export_bootpart() {
- PARTUUID=[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-02)
- uuid="${disk#PARTUUID=}"
- uuid="${uuid%-02}"
-- for disk in /dev/*; do
-- [ -b "$disk" ] || continue
-+ for disk in $(find /dev -type b); do
- set -- $(dd if=$disk bs=1 skip=440 count=4 2>/dev/null | hexdump -v -e '4/1 "%02x "')
- if [ "$4$3$2$1" = "$uuid" ]; then
-- export BOOTPART="${disk}1"
-- return 0
-+ uevent="/sys/class/block/${disk##*/}/uevent"
-+ break
- fi
- done
- ;;
- /dev/*)
-- export BOOTPART="${disk%[0-9]}1"
-- return 0
-+ uevent="/sys/class/block/${disk##*/}/uevent"
- ;;
- esac
-+
-+ if [ -e "$uevent" ]; then
-+ . "$uevent"
-+
-+ export BOOTDEV_MAJOR=$MAJOR
-+ export BOOTDEV_MINOR=$MINOR
-+
-+ return 0
-+ fi
- fi
-
- return 1
-@@ -49,8 +72,10 @@ platform_check_image() {
- }
-
- platform_copy_config() {
-- if [ -b "$BOOTPART" ]; then
-- mount -t ext4 -o rw,noatime "$BOOTPART" /mnt
-+ local partdev
-+
-+ if platform_export_partdevice partdev 1; then
-+ mount -t ext4 -o rw,noatime "/dev/$partdev" /mnt
- cp -af "$CONF_TAR" /mnt/
- umount /mnt
- fi
-@@ -87,18 +112,16 @@ get_partitions() { # <device> <filename>
- }
-
- platform_do_upgrade() {
-- platform_export_bootpart
-- disk="${BOOTPART%[0-9]}"
-+ local diskdev partdev ibs diff
-
-- if [ -b "$disk" ]; then
-+ if platform_export_bootdevice && platform_export_partdevice diskdev 0; then
- sync
- if [ "$SAVE_PARTITIONS" = "1" ]; then
-- get_partitions "$disk" bootdisk
--
-+ get_partitions "/dev/$diskdev" bootdisk
-
- #get block size
-- if [ -f "/sys/block/${disk##*/}/queue/physical_block_size" ]; then
-- ibs="$(cat "/sys/block/${disk##*/}/queue/physical_block_size")"
-+ if [ -f "/sys/block/$diskdev/queue/physical_block_size" ]; then
-+ ibs="$(cat "/sys/block/$diskdev/queue/physical_block_size")"
- else
- ibs=512
- fi
-@@ -114,21 +137,25 @@ platform_do_upgrade() {
- echo "Partition layout is changed. Full image will be written."
- ask_bool 0 "Abort" && exit
-
-- get_image "$@" | dd of="$disk" bs=4096 conv=fsync
-+ get_image "$@" | dd of="/dev/$diskdev" bs=4096 conv=fsync
- return 0
- fi
-
- #iterate over each partition from the image and write it to the boot disk
- while read part start size; do
-- echo "Writing image to $disk$part..."
-- get_image "$@" | dd of="$disk$part" ibs="$ibs" obs=1M skip="$start" count="$size" conv=fsync
-+ if platform_export_partdevice partdev $part; then
-+ echo "Writing image to /dev/$partdev..."
-+ get_image "$@" | dd of="/dev/$partdev" ibs="$ibs" obs=1M skip="$start" count="$size" conv=fsync
-+ else
-+ echo "Unable to find partition $part device, skipped."
-+ fi
- done < /tmp/partmap.image
-
- #copy partition uuid
-- echo "Writing new UUID to $disk$part..."
-- get_image "$@" | dd of="$disk" bs=1 skip=440 count=4 seek=440 conv=fsync
-+ echo "Writing new UUID to /dev/$diskdev..."
-+ get_image "$@" | dd of="/dev/$diskdev" bs=1 skip=440 count=4 seek=440 conv=fsync
- else
-- get_image "$@" | dd of="$disk" bs=4096 conv=fsync
-+ get_image "$@" | dd of="/dev/$diskdev" bs=4096 conv=fsync
- fi
-
- sleep 1
diff --git a/patches/openwrt/0089-ar71xx-rename-mktplinkfw-initramfs-to-more-generic-mktplinkfw-combined.patch b/patches/openwrt/0089-ar71xx-rename-mktplinkfw-initramfs-to-more-generic-mktplinkfw-combined.patch
deleted file mode 100644
index a12c1f98eeb41e1905a87bde1924a20f27368654..0000000000000000000000000000000000000000
--- a/patches/openwrt/0089-ar71xx-rename-mktplinkfw-initramfs-to-more-generic-mktplinkfw-combined.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Fri, 9 Dec 2016 13:08:51 +0100
-Subject: ar71xx: rename mktplinkfw-initramfs to more generic mktplinkfw-combined
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-Backport of LEDE 0495181529e6069af03704f4b5ae71883a2cd6b6
-
-diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
-index b35c713f3c92c3d02f26f4bf535aeec34fd71b12..638e97f088b5420cf4f2a3c706875677815240e1 100644
---- a/target/linux/ar71xx/image/Makefile
-+++ b/target/linux/ar71xx/image/Makefile
-@@ -63,7 +63,7 @@ define Build/mktplinkfw
- endef
-
- # -c combined image
--define Build/mktplinkfw-initramfs
-+define Build/mktplinkfw-combined
- $(STAGING_DIR_HOST)/bin/mktplinkfw \
- -H $(TPLINK_HWID) -W $(TPLINK_HWREV) -F $(TPLINK_FLASHLAYOUT) -N OpenWrt -V $(REVISION) $(1) \
- -k $@ \
-@@ -203,7 +203,7 @@ TARGET_DEVICES += wndr3700 wndr3700v2 wndr3800 wndr3800ch wndrmac wndrmacv2
- define Device/tplink
- TPLINK_HWREV := 0x1
- KERNEL := kernel-bin | patch-cmdline | lzma
-- KERNEL_INITRAMFS := kernel-bin | patch-cmdline | lzma | mktplinkfw-initramfs
-+ KERNEL_INITRAMFS := kernel-bin | patch-cmdline | lzma | mktplinkfw-combined
- IMAGES := sysupgrade.bin factory.bin
- IMAGE/sysupgrade.bin := append-rootfs | mktplinkfw sysupgrade
- IMAGE/factory.bin := append-rootfs | mktplinkfw factory
-@@ -215,7 +215,7 @@ $(Device/tplink)
- COMPILE := loader-$(1).gz
- COMPILE/loader-$(1).gz := loader-okli-compile
- KERNEL := copy-file $(KDIR)/vmlinux.bin.lzma | uImage lzma -M 0x4f4b4c49 | loader-okli $(1)
-- KERNEL_INITRAMFS := copy-file $(KDIR)/vmlinux-initramfs.bin.lzma | loader-kernel | mktplinkfw-initramfs
-+ KERNEL_INITRAMFS := copy-file $(KDIR)/vmlinux-initramfs.bin.lzma | loader-kernel | mktplinkfw-combined
- endef
-
- define Device/tplink-4m
diff --git a/patches/openwrt/0090-firmware-utils-add-support-for-TL-WR1043ND-v4-to-mktplinkfw.patch b/patches/openwrt/0090-firmware-utils-add-support-for-TL-WR1043ND-v4-to-mktplinkfw.patch
deleted file mode 100644
index 752c08534803331d250b499bbc7602fcde2d12d5..0000000000000000000000000000000000000000
--- a/patches/openwrt/0090-firmware-utils-add-support-for-TL-WR1043ND-v4-to-mktplinkfw.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Sat, 10 Dec 2016 20:45:50 +0100
-Subject: firmware-utils: add support for TL-WR1043ND v4 to mktplinkfw
-
-The TL-WR1043ND v4 uses a kernel image with a mktplinkfw header inside the
-os-image partition of a tplink-safeloader image.
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-Backport of LEDE 51740990cd1d5375a566454e692b479986cba958
-
-diff --git a/tools/firmware-utils/src/mktplinkfw.c b/tools/firmware-utils/src/mktplinkfw.c
-index 34e6546a2d7db72748146ef233830c2e8de9ce97..fbf89609c22dd0fb50c4c8656141c8a8b9c29817 100644
---- a/tools/firmware-utils/src/mktplinkfw.c
-+++ b/tools/firmware-utils/src/mktplinkfw.c
-@@ -178,6 +178,20 @@ static struct flash_layout layouts[] = {
- .kernel_ep = 0xc0000000,
- .rootfs_ofs = 0x2a0000,
- }, {
-+ /*
-+ Some devices (e.g. TL-WR1043 v4) use a mktplinkfw kernel image
-+ embedded in a tplink-safeloader image as os-image partition.
-+
-+ We use a 1.5MB partition for the compressed kernel, which should
-+ be sufficient, but not too wasteful (the flash of the TL-WR1043 v4
-+ has 16MB in total).
-+ */
-+ .id = "16Msafeloader",
-+ .fw_max_len = 0x180000,
-+ .kernel_la = 0x80060000,
-+ .kernel_ep = 0x80060000,
-+ .rootfs_ofs = 0,
-+ }, {
- /* terminating entry */
- }
- };
diff --git a/patches/openwrt/0091-ar71xx-add-support-for-TP-LINK-WR1043ND-v4.patch b/patches/openwrt/0091-ar71xx-add-support-for-TP-LINK-WR1043ND-v4.patch
deleted file mode 100644
index 0b6eb6853bcef9e41fa2fd81b9a8f38bf127144f..0000000000000000000000000000000000000000
--- a/patches/openwrt/0091-ar71xx-add-support-for-TP-LINK-WR1043ND-v4.patch
+++ /dev/null
@@ -1,464 +0,0 @@
-From: Ludwig Thomeczek <ledesrc@wxorx.net>
-Date: Fri, 16 Dec 2016 12:50:34 +0100
-Subject: ar71xx: add support for TP-LINK WR1043ND v4
-
-Signed-off-by: Ludwig Thomeczek <ledesrc@wxorx.net>
-
-diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh
-index 67043d432cf7a469bf1ded14bc354274ab16e3e6..1b613dc6e8ee66f2d7ea32486c2b6ddd03bfba89 100644
---- a/target/linux/ar71xx/base-files/etc/diag.sh
-+++ b/target/linux/ar71xx/base-files/etc/diag.sh
-@@ -272,6 +272,7 @@ get_status_led() {
- tl-wr1041n-v2 | \
- tl-wr1043nd | \
- tl-wr1043nd-v2 | \
-+ tl-wr1043nd-v4 | \
- tl-wr741nd | \
- tl-wr741nd-v4 | \
- tl-wa801nd-v3 | \
-diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
-index e47cbb0b01ef4a335c059a74af66d9f8999b3b3d..fa38568fbc84aad4c85636c3894097c65e30eb9a 100644
---- a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
-+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
-@@ -553,6 +553,16 @@ tl-wr1043nd-v2)
- ucidef_set_led_wlan "wlan" "WLAN" "tp-link:green:wlan" "phy0tpt"
- ;;
-
-+tl-wr1043nd-v4)
-+ ucidef_set_led_usbdev "usb" "USB" "tp-link:green:usb" "1-1"
-+ ucidef_set_led_wlan "wlan" "WLAN" "tp-link:green:wlan" "phy0tpt"
-+ ucidef_set_led_switch "wan" "WAN" "tp-link:green:wan" "switch0" "0x20"
-+ ucidef_set_led_switch "lan1" "LAN1" "tp-link:green:lan1" "switch0" "0x10"
-+ ucidef_set_led_switch "lan2" "LAN2" "tp-link:green:lan2" "switch0" "0x08"
-+ ucidef_set_led_switch "lan3" "LAN3" "tp-link:green:lan3" "switch0" "0x04"
-+ ucidef_set_led_switch "lan4" "LAN4" "tp-link:green:lan4" "switch0" "0x02"
-+ ;;
-+
- tl-wr2543n)
- ucidef_set_led_usbdev "usb" "USB" "tp-link:green:usb" "1-1"
- ;;
-diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
-index 878623ce3fd8b7c585da73c7bd72794a144096a3..4389bc894f8dd08a9231b35bbb4fba0e9e57560b 100755
---- a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
-+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
-@@ -208,6 +208,15 @@ tl-wr1043nd)
- ucidef_add_switch_vlan "switch0" "2" "0 5t"
- ;;
-
-+tl-wr1043nd-v4)
-+ ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
-+ ucidef_add_switch "switch0" "1" "1"
-+ ucidef_add_switch_vlan "switch0" "1" "0t 1 2 3 4"
-+ ucidef_add_switch_vlan "switch0" "2" "0t 5"
-+ mac=$(mtd_get_mac_binary config 0x1017c)
-+ [ -n "$mac" ] && ucidef_set_interface_macaddr "wan" "$mac"
-+ ;;
-+
- tl-wr2543n)
- ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
- ucidef_add_switch "switch0" "1" "1"
-diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
-index 6df0d8a8d0d52c103b9ded2170af19a9a6b5f8bb..5922527da4980fa3b51fdcec2bca96f5962d0f0b 100755
---- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
-+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
-@@ -776,6 +776,9 @@ ar71xx_board_detect() {
- *"TL-WR1043ND v2")
- name="tl-wr1043nd-v2"
- ;;
-+ *"TL-WR1043ND v4")
-+ name="tl-wr1043nd-v4"
-+ ;;
- *TL-WR2543N*)
- name="tl-wr2543n"
- ;;
-diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
-index 76c252ccb14db970aac63ea1d2eaddca3d867867..e61ebf7c2221fd56bb902f14d96cb25d174718ee 100755
---- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
-+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
-@@ -377,6 +377,7 @@ platform_check_image() {
- tl-wr1041n-v2 | \
- tl-wr1043nd | \
- tl-wr1043nd-v2 | \
-+ tl-wr1043nd-v4 | \
- tl-wr2543n)
- [ "$magic" != "0100" ] && {
- echo "Invalid image type."
-diff --git a/target/linux/ar71xx/config-3.18 b/target/linux/ar71xx/config-3.18
-index 050362614a464b56d3740a7954686fe4e5b37803..ad0574f9ab67e78cd1359f8b45de5de51521718c 100644
---- a/target/linux/ar71xx/config-3.18
-+++ b/target/linux/ar71xx/config-3.18
-@@ -131,6 +131,7 @@ CONFIG_ATH79_MACH_TL_WDR4300=y
- CONFIG_ATH79_MACH_TL_WR1041N_V2=y
- CONFIG_ATH79_MACH_TL_WR1043ND=y
- CONFIG_ATH79_MACH_TL_WR1043ND_V2=y
-+CONFIG_ATH79_MACH_TL_WR1043ND_V4=y
- CONFIG_ATH79_MACH_TL_WR2543N=y
- CONFIG_ATH79_MACH_TL_WR703N=y
- CONFIG_ATH79_MACH_TL_WR720N_V3=y
-diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr1043nd-v4.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr1043nd-v4.c
-new file mode 100644
-index 0000000000000000000000000000000000000000..cb224f4611004aaaec6c3b2b737b3bb45c79d239
---- /dev/null
-+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-tl-wr1043nd-v4.c
-@@ -0,0 +1,190 @@
-+/*
-+ * TP-LINK WR1043 V4 support
-+ *
-+ * Copyright (C) 2015-2016 P. Wassi <p.wassi at gmx.at>
-+ * Copyright (C) 2016 Matthias Schiffer <mschiffer@universe-factory.net>
-+ * Copyright (C) 2016 Andreas Ziegler <github@andreas-ziegler.de>
-+ * Copyright (C) 2016 Ludwig Thomeczek <ledesrc@wxorx.net>
-+ *
-+ * Derived from: mach-dir-869-a1.c
-+ *
-+ * This program is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 as published
-+ * by the Free Software Foundation.
-+ */
-+
-+
-+#include <linux/gpio.h>
-+#include <linux/init.h>
-+#include <linux/pci.h>
-+#include <linux/platform_device.h>
-+#include <linux/ath9k_platform.h>
-+
-+#include <asm/mach-ath79/ath79.h>
-+#include <asm/mach-ath79/irq.h>
-+#include <asm/mach-ath79/ar71xx_regs.h>
-+
-+#include <linux/platform_data/phy-at803x.h>
-+#include <linux/ar8216_platform.h>
-+
-+#include "common.h"
-+#include "dev-ap9x-pci.h"
-+#include "dev-eth.h"
-+#include "dev-gpio-buttons.h"
-+#include "dev-leds-gpio.h"
-+#include "dev-m25p80.h"
-+#include "dev-wmac.h"
-+#include "dev-usb.h"
-+#include "machtypes.h"
-+#include "nvram.h"
-+
-+#define TL_WR1043_V4_GPIO_BTN_RESET 2
-+#define TL_WR1043_V4_GPIO_BTN_RFKILL 5
-+
-+#define TL_WR1043_V4_GPIO_LED_WLAN 19
-+#define TL_WR1043_V4_GPIO_LED_USB 7
-+#define TL_WR1043_V4_GPIO_LED_WPS 1
-+#define TL_WR1043_V4_GPIO_LED_SYSTEM 6
-+
-+#define TL_WR1043_V4_GPIO_USB_POWER 8
-+
-+#define TL_WR1043_V4_GPIO_LED_WAN 15
-+#define TL_WR1043_V4_GPIO_LED_LAN1 9
-+#define TL_WR1043_V4_GPIO_LED_LAN2 14
-+#define TL_WR1043_V4_GPIO_LED_LAN3 21
-+#define TL_WR1043_V4_GPIO_LED_LAN4 20
-+
-+#define TL_WR1043_V4_KEYS_POLL_INTERVAL 20 /* msecs */
-+#define TL_WR1043_V4_KEYS_DEBOUNCE_INTERVAL (3 * TL_WR1043_V4_KEYS_POLL_INTERVAL)
-+
-+#define TL_WR1043_V4_MAC_LOCATION 0x1ff80174
-+
-+#define TL_WR1043_V4_EEPROM_ADDR 0x1fff0000
-+#define TL_WR1043_V4_WMAC_CALDATA_OFFSET 0x1000
-+
-+static struct gpio_led tl_wr1043nd_v4_leds_gpio[] __initdata = {
-+ {
-+ .name = "tp-link:green:wps",
-+ .gpio = TL_WR1043_V4_GPIO_LED_WPS,
-+ .active_low = 1,
-+ },
-+ {
-+ .name = "tp-link:green:system",
-+ .gpio = TL_WR1043_V4_GPIO_LED_SYSTEM,
-+ .active_low = 1,
-+ },
-+ {
-+ .name = "tp-link:green:wlan",
-+ .gpio = TL_WR1043_V4_GPIO_LED_WLAN,
-+ .active_low = 1,
-+ },
-+ {
-+ .name = "tp-link:green:usb",
-+ .gpio = TL_WR1043_V4_GPIO_LED_USB,
-+ .active_low = 1,
-+ },
-+ {
-+ .name = "tp-link:green:wan",
-+ .gpio = TL_WR1043_V4_GPIO_LED_WAN,
-+ .active_low = 1,
-+ },
-+ {
-+ .name = "tp-link:green:lan1",
-+ .gpio = TL_WR1043_V4_GPIO_LED_LAN1,
-+ .active_low = 1,
-+ },
-+ {
-+ .name = "tp-link:green:lan2",
-+ .gpio = TL_WR1043_V4_GPIO_LED_LAN2,
-+ .active_low = 1,
-+ },
-+ {
-+ .name = "tp-link:green:lan3",
-+ .gpio = TL_WR1043_V4_GPIO_LED_LAN3,
-+ .active_low = 1,
-+ },
-+ {
-+ .name = "tp-link:green:lan4",
-+ .gpio = TL_WR1043_V4_GPIO_LED_LAN4,
-+ .active_low = 1,
-+ },
-+};
-+
-+static struct gpio_keys_button tl_wr1043nd_v4_gpio_keys[] __initdata = {
-+ {
-+ .desc = "Reset button",
-+ .type = EV_KEY,
-+ .code = KEY_RESTART,
-+ .debounce_interval = TL_WR1043_V4_KEYS_DEBOUNCE_INTERVAL,
-+ .gpio = TL_WR1043_V4_GPIO_BTN_RESET,
-+ .active_low = 1,
-+ },
-+ {
-+ .desc = "RFKILL button",
-+ .type = EV_KEY,
-+ .code = KEY_RFKILL,
-+ .debounce_interval = TL_WR1043_V4_KEYS_DEBOUNCE_INTERVAL,
-+ .gpio = TL_WR1043_V4_GPIO_BTN_RFKILL,
-+ .active_low = 1,
-+ },
-+};
-+
-+static struct ar8327_pad_cfg tl_wr1043nd_v4_ar8327_pad0_cfg = {
-+ .mode = AR8327_PAD_MAC_SGMII,
-+ .sgmii_delay_en = true,
-+};
-+
-+static struct ar8327_platform_data tl_wr1043nd_v4_ar8327_data = {
-+ .pad0_cfg = &tl_wr1043nd_v4_ar8327_pad0_cfg,
-+ .port0_cfg = {
-+ .force_link = 1,
-+ .speed = AR8327_PORT_SPEED_1000,
-+ .duplex = 1,
-+ .txpause = 1,
-+ .rxpause = 1,
-+ },
-+};
-+
-+static struct mdio_board_info tl_wr1043nd_v4_mdio0_info[] = {
-+ {
-+ .bus_id = "ag71xx-mdio.0",
-+ .phy_addr = 0,
-+ .platform_data = &tl_wr1043nd_v4_ar8327_data,
-+ },
-+};
-+
-+static void __init tl_wr1043nd_v4_setup(void)
-+{
-+ u8 *mac = (u8 *) KSEG1ADDR(TL_WR1043_V4_MAC_LOCATION);
-+ u8 *eeprom = (u8 *) KSEG1ADDR(TL_WR1043_V4_EEPROM_ADDR);
-+
-+ ath79_register_m25p80(NULL);
-+
-+ ath79_init_mac(ath79_eth0_data.mac_addr, mac, 0);
-+ ath79_eth0_data.phy_if_mode = PHY_INTERFACE_MODE_SGMII;
-+ ath79_eth0_data.mii_bus_dev = &ath79_mdio0_device.dev;
-+ ath79_eth0_data.phy_mask = BIT(0);
-+
-+ mdiobus_register_board_info(tl_wr1043nd_v4_mdio0_info,
-+ ARRAY_SIZE(tl_wr1043nd_v4_mdio0_info));
-+
-+ ath79_register_usb();
-+ ath79_register_mdio(0, 0);
-+ ath79_register_eth(0);
-+
-+ ath79_register_wmac(eeprom + TL_WR1043_V4_WMAC_CALDATA_OFFSET, mac);
-+
-+ ath79_register_leds_gpio(-1, ARRAY_SIZE(tl_wr1043nd_v4_leds_gpio),
-+ tl_wr1043nd_v4_leds_gpio);
-+
-+ ath79_register_gpio_keys_polled(-1, TL_WR1043_V4_KEYS_POLL_INTERVAL,
-+ ARRAY_SIZE(tl_wr1043nd_v4_gpio_keys),
-+ tl_wr1043nd_v4_gpio_keys);
-+
-+ gpio_request_one(TL_WR1043_V4_GPIO_USB_POWER,
-+ GPIOF_OUT_INIT_HIGH | GPIOF_EXPORT_DIR_FIXED,
-+ "USB power");
-+}
-+
-+MIPS_MACHINE(ATH79_MACH_TL_WR1043ND_V4, "TL-WR1043ND-v4",
-+ "TP-LINK TL-WR1043ND v4", tl_wr1043nd_v4_setup);
-diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
-index 638e97f088b5420cf4f2a3c706875677815240e1..61e221255f6742f9594da168b11af7716d6a720e 100644
---- a/target/linux/ar71xx/image/Makefile
-+++ b/target/linux/ar71xx/image/Makefile
-@@ -73,6 +73,18 @@ define Build/mktplinkfw-combined
- @mv $@.new $@
- endef
-
-+define Build/tplink-safeloader
-+ -$(STAGING_DIR_HOST)/bin/tplink-safeloader \
-+ -B $(TPLINK_BOARD_NAME) \
-+ -V $(REVISION) \
-+ -k $(word 1,$^) \
-+ -r $@ \
-+ -o $@.new \
-+ -j \
-+ $(wordlist 2,$(words $(1)),$(1)) \
-+ $(if $(findstring sysupgrade,$(word 1,$(1))),-S) && mv $@.new $@ || rm -f $@
-+endef
-+
- define Build/loader-common
- rm -rf $@.src
- $(MAKE) -C lzma-loader \
-@@ -103,7 +115,7 @@ define Build/copy-file
- cat "$(1)" > "$@"
- endef
-
--DEVICE_VARS += TPLINK_HWID TPLINK_HWREV TPLINK_FLASHLAYOUT
-+DEVICE_VARS += TPLINK_HWID TPLINK_HWREV TPLINK_FLASHLAYOUT TPLINK_BOARD_NAME
-
- define Device/Default
- BOARDNAME :=
-@@ -677,6 +689,22 @@ define Device/tl-wr1041n-v2
- endef
- TARGET_DEVICES += tl-wr1041n-v2
-
-+define Device/tl-wr1043nd-v4
-+ $(Device/tplink)
-+ BOARDNAME := TL-WR1043ND-v4
-+ DEVICE_PROFILE := TLWR1043
-+ TPLINK_HWID := 0x10430004
-+ TPLINK_FLASHLAYOUT := 16Msafeloader
-+ MTDPARTS := spi0.0:128k(u-boot)ro,1536k(kernel),14016k(rootfs),128k(product-info)ro,320k(config)ro,64k(partition-table)ro,128k(logs)ro,64k(ART)ro,15552k@0x20000(firmware)
-+ IMAGE_SIZE := 15552k
-+ TPLINK_BOARD_NAME := TLWR1043NDV4
-+ KERNEL := kernel-bin | patch-cmdline | lzma | mktplinkfw-combined
-+ IMAGES := sysupgrade.bin factory.bin
-+ IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade
-+ IMAGE/factory.bin := append-rootfs | tplink-safeloader factory
-+endef
-+TARGET_DEVICES += tl-wr1043nd-v4
-+
- define Device/tl-wdr4900-v2
- $(Device/tplink-8mlzma)
- BOARDNAME := TL-WDR4900-v2
-diff --git a/target/linux/ar71xx/mikrotik/config-default b/target/linux/ar71xx/mikrotik/config-default
-index 75155b22489a60748b3b1357a1d9c549092255ba..06850dfd5ad9dc004e5e06605c642d0f934aad6f 100644
---- a/target/linux/ar71xx/mikrotik/config-default
-+++ b/target/linux/ar71xx/mikrotik/config-default
-@@ -85,6 +85,7 @@ CONFIG_ATH79_MACH_RBSXTLITE=y
- # CONFIG_ATH79_MACH_TL_WR1041N_V2 is not set
- # CONFIG_ATH79_MACH_TL_WR1043ND is not set
- # CONFIG_ATH79_MACH_TL_WR1043ND_V2 is not set
-+# CONFIG_ATH79_MACH_TL_WR1043ND_V4 is not set
- # CONFIG_ATH79_MACH_TL_WR2543N is not set
- # CONFIG_ATH79_MACH_TL_WR703N is not set
- # CONFIG_ATH79_MACH_TL_WR720N_V3 is not set
-diff --git a/target/linux/ar71xx/nand/config-default b/target/linux/ar71xx/nand/config-default
-index 802d6e0502b51a4ecf2259c20e9b6667cd255680..6d69cdcd1cc7f911fbb68dc265ef3fa4c7f5bd78 100644
---- a/target/linux/ar71xx/nand/config-default
-+++ b/target/linux/ar71xx/nand/config-default
-@@ -49,6 +49,7 @@
- # CONFIG_ATH79_MACH_TL_WDR4300 is not set
- # CONFIG_ATH79_MACH_TL_WR1041N_V2 is not set
- # CONFIG_ATH79_MACH_TL_WR1043ND is not set
-+# CONFIG_ATH79_MACH_TL_WR1043ND_V4 is not set
- # CONFIG_ATH79_MACH_TL_WR2543N is not set
- # CONFIG_ATH79_MACH_TL_WR703N is not set
- # CONFIG_ATH79_MACH_TL_WR720N_V3 is not set
-diff --git a/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch b/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch
-index b7517464742679b66c3bd916b9b2a2fcc34b65e1..fb69cf3b9ee51e39c32a9e98de913c1a84bed56a 100644
---- a/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch
-+++ b/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch
-@@ -1,6 +1,6 @@
- --- a/arch/mips/ath79/machtypes.h
- +++ b/arch/mips/ath79/machtypes.h
--@@ -16,22 +16,206 @@
-+@@ -16,22 +16,207 @@
-
- enum ath79_mach_type {
- ATH79_MACH_GENERIC = 0,
-@@ -138,6 +138,7 @@
- + ATH79_MACH_TL_WR1041N_V2, /* TP-LINK TL-WR1041N v2 */
- + ATH79_MACH_TL_WR1043ND, /* TP-LINK TL-WR1043ND */
- + ATH79_MACH_TL_WR1043ND_V2, /* TP-LINK TL-WR1043ND v2 */
-++ ATH79_MACH_TL_WR1043ND_V4, /* TP-LINK TL-WR1043ND v4 */
- + ATH79_MACH_TL_WR2543N, /* TP-LINK TL-WR2543N/ND */
- + ATH79_MACH_TL_WR703N, /* TP-LINK TL-WR703N */
- + ATH79_MACH_TL_WR710N, /* TP-LINK TL-WR710N */
-@@ -355,7 +356,7 @@
- config ATH79_MACH_PB44
- bool "Atheros PB44 reference board"
- select SOC_AR71XX
--@@ -68,6 +178,976 @@ config ATH79_MACH_PB44
-+@@ -68,6 +178,988 @@ config ATH79_MACH_PB44
- Say 'Y' here if you want your kernel to support the
- Atheros PB44 reference board.
-
-@@ -1270,6 +1271,18 @@
- + select ATH79_DEV_USB
- + select ATH79_DEV_WMAC
- +
-++config ATH79_MACH_TL_WR1043ND_V4
-++ bool "TP-LINK TL-WR1043ND v4 support"
-++ select SOC_QCA956X
-++ select ATH79_DEV_AP9X_PCI if PCI
-++ select ATH79_DEV_ETH
-++ select ATH79_DEV_GPIO_BUTTONS
-++ select ATH79_DEV_LEDS_GPIO
-++ select ATH79_DEV_M25P80
-++ select ATH79_DEV_USB
-++ select ATH79_DEV_WMAC
-++
-++
- +config ATH79_MACH_TL_WR2543N
- + bool "TP-LINK TL-WR2543N/ND support"
- + select SOC_AR724X
-@@ -1332,7 +1345,7 @@
- config ATH79_MACH_UBNT_XM
- bool "Ubiquiti Networks XM/UniFi boards"
- select SOC_AR724X
--@@ -83,6 +1163,117 @@ config ATH79_MACH_UBNT_XM
-+@@ -83,6 +1175,117 @@ config ATH79_MACH_UBNT_XM
- Say 'Y' here if you want your kernel to support the
- Ubiquiti Networks XM (rev 1.0) board.
-
-@@ -1450,7 +1463,7 @@
- endmenu
-
- config SOC_AR71XX
--@@ -124,7 +1315,10 @@ config ATH79_DEV_DSA
-+@@ -124,7 +1327,10 @@ config ATH79_DEV_DSA
- config ATH79_DEV_ETH
- def_bool n
-
-@@ -1462,7 +1475,7 @@
- def_bool n
-
- config ATH79_DEV_GPIO_BUTTONS
--@@ -154,6 +1348,11 @@ config ATH79_PCI_ATH9K_FIXUP
-+@@ -154,6 +1360,11 @@ config ATH79_PCI_ATH9K_FIXUP
- def_bool n
-
- config ATH79_ROUTERBOOT
-@@ -1476,7 +1489,7 @@
- endif
- --- a/arch/mips/ath79/Makefile
- +++ b/arch/mips/ath79/Makefile
--@@ -38,9 +47,131 @@ obj-$(CONFIG_ATH79_ROUTERBOOT) += route
-+@@ -38,9 +38,132 @@ obj-$(CONFIG_ATH79_ROUTERBOOT) += route
- #
- # Machines
- #
-@@ -1575,6 +1588,7 @@
- +obj-$(CONFIG_ATH79_MACH_TL_WR1041N_V2) += mach-tl-wr1041n-v2.o
- +obj-$(CONFIG_ATH79_MACH_TL_WR1043ND) += mach-tl-wr1043nd.o
- +obj-$(CONFIG_ATH79_MACH_TL_WR1043ND_V2) += mach-tl-wr1043nd-v2.o
-++obj-$(CONFIG_ATH79_MACH_TL_WR1043ND_V4) += mach-tl-wr1043nd-v4.o
- +obj-$(CONFIG_ATH79_MACH_TL_WR2543N) += mach-tl-wr2543n.o
- +obj-$(CONFIG_ATH79_MACH_TL_WR703N) += mach-tl-wr703n.o
- +obj-$(CONFIG_ATH79_MACH_TL_WR720N_V3) += mach-tl-wr720n-v3.o
diff --git a/patches/openwrt/0092-firmware-utils-tplink-safeloader-add-support-for-TP-Link-WBS210-510-1.2.patch b/patches/openwrt/0092-firmware-utils-tplink-safeloader-add-support-for-TP-Link-WBS210-510-1.2.patch
deleted file mode 100644
index 5c4506bf7b0a44748618aeb2c547b3fbc4b5b3fb..0000000000000000000000000000000000000000
--- a/patches/openwrt/0092-firmware-utils-tplink-safeloader-add-support-for-TP-Link-WBS210-510-1.2.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Thu, 5 Jan 2017 16:01:17 +0100
-Subject: firmware-utils: tplink-safeloader: add support for TP-Link WBS210/510 1.2
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-Backport of LEDE 2ee3e8dd42272f4109830cd26a7fd6f1231ddae8
-
-diff --git a/tools/firmware-utils/src/tplink-safeloader.c b/tools/firmware-utils/src/tplink-safeloader.c
-index 016c118787f3b5332b76f65c85930065a569d6b8..240e5079d1afb2c892bfb0fc65817ffc8b208bf4 100644
---- a/tools/firmware-utils/src/tplink-safeloader.c
-+++ b/tools/firmware-utils/src/tplink-safeloader.c
-@@ -189,6 +189,68 @@ static struct device_info boards[] = {
- .last_sysupgrade_partition = "file-system",
- },
-
-+ {
-+ .id = "WBS210",
-+ .vendor = "CPE510(TP-LINK|UN|N300-5):1.0\r\n",
-+ .support_list =
-+ "SupportList:\r\n"
-+ "WBS210(TP-LINK|UN|N300-2):1.20\r\n"
-+ "WBS210(TP-LINK|US|N300-2):1.20\r\n"
-+ "WBS210(TP-LINK|EU|N300-2):1.20\r\n",
-+ .support_trail = '\xff',
-+
-+ .partitions = {
-+ {"fs-uboot", 0x00000, 0x20000},
-+ {"partition-table", 0x20000, 0x02000},
-+ {"default-mac", 0x30000, 0x00020},
-+ {"product-info", 0x31100, 0x00100},
-+ {"signature", 0x32000, 0x00400},
-+ {"os-image", 0x40000, 0x170000},
-+ {"soft-version", 0x1b0000, 0x00100},
-+ {"support-list", 0x1b1000, 0x00400},
-+ {"file-system", 0x1c0000, 0x600000},
-+ {"user-config", 0x7c0000, 0x10000},
-+ {"default-config", 0x7d0000, 0x10000},
-+ {"log", 0x7e0000, 0x10000},
-+ {"radio", 0x7f0000, 0x10000},
-+ {NULL, 0, 0}
-+ },
-+
-+ .first_sysupgrade_partition = "os-image",
-+ .last_sysupgrade_partition = "file-system",
-+ },
-+
-+ {
-+ .id = "WBS510",
-+ .vendor = "CPE510(TP-LINK|UN|N300-5):1.0\r\n",
-+ .support_list =
-+ "SupportList:\r\n"
-+ "WBS510(TP-LINK|UN|N300-5):1.20\r\n"
-+ "WBS510(TP-LINK|US|N300-5):1.20\r\n"
-+ "WBS510(TP-LINK|EU|N300-5):1.20\r\n",
-+ .support_trail = '\xff',
-+
-+ .partitions = {
-+ {"fs-uboot", 0x00000, 0x20000},
-+ {"partition-table", 0x20000, 0x02000},
-+ {"default-mac", 0x30000, 0x00020},
-+ {"product-info", 0x31100, 0x00100},
-+ {"signature", 0x32000, 0x00400},
-+ {"os-image", 0x40000, 0x170000},
-+ {"soft-version", 0x1b0000, 0x00100},
-+ {"support-list", 0x1b1000, 0x00400},
-+ {"file-system", 0x1c0000, 0x600000},
-+ {"user-config", 0x7c0000, 0x10000},
-+ {"default-config", 0x7d0000, 0x10000},
-+ {"log", 0x7e0000, 0x10000},
-+ {"radio", 0x7f0000, 0x10000},
-+ {NULL, 0, 0}
-+ },
-+
-+ .first_sysupgrade_partition = "os-image",
-+ .last_sysupgrade_partition = "file-system",
-+ },
-+
- /** Firmware layout for the C2600 */
- {
- .id = "C2600",
diff --git a/patches/openwrt/0093-ar71xx-add-support-for-TP-Link-WBS210-510.patch b/patches/openwrt/0093-ar71xx-add-support-for-TP-Link-WBS210-510.patch
deleted file mode 100644
index 77e5b3db5d2efd6434f57dec187ad12dc422790d..0000000000000000000000000000000000000000
--- a/patches/openwrt/0093-ar71xx-add-support-for-TP-Link-WBS210-510.patch
+++ /dev/null
@@ -1,235 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Thu, 5 Jan 2017 16:01:17 +0100
-Subject: ar71xx: add support for TP-Link WBS210/510
-
-The devices are mostly identical to the CPE210/510, but use external
-antennas.
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-Backport of LEDE 1fef80f29cf6bdfcb6cdbd913b9147797b8bc218
-
-diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/01_gpio-switches b/target/linux/ar71xx/base-files/etc/uci-defaults/01_gpio-switches
-index 0f7a41589384755ff596d4355ad9fbf1e1087d91..3b86067635e337a0c00a55d035d55382405ef1e7 100644
---- a/target/linux/ar71xx/base-files/etc/uci-defaults/01_gpio-switches
-+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/01_gpio-switches
-@@ -16,7 +16,9 @@ nanostation-m-xw)
- ucidef_set_gpio_switch "poe_passthrough" "PoE Passthrough" "2"
- ;;
- cpe210|\
--cpe510)
-+cpe510|\
-+wbs210|\
-+wbs510)
- ucidef_set_gpio_switch "poe_passthrough" "PoE Passthrough" "20"
- ;;
- esac
-diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
-index fa38568fbc84aad4c85636c3894097c65e30eb9a..d57d8ad5fd3edd8774d30245b3265317778cb140 100644
---- a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
-+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
-@@ -79,7 +79,9 @@ carambola2)
- ;;
-
- cpe210|\
--cpe510)
-+cpe510|\
-+wbs210|\
-+wbs510)
- ucidef_set_led_switch "lan0" "LAN0" "tp-link:green:lan0" "switch0" "0x20"
- ucidef_set_led_switch "lan1" "LAN1" "tp-link:green:lan1" "switch0" "0x10"
- ucidef_set_rssimon "wlan0" "200000" "1"
-diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
-index 4389bc894f8dd08a9231b35bbb4fba0e9e57560b..f8c43ac0d6f2882444ed277df2f0b2c23721dade 100755
---- a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
-+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
-@@ -73,7 +73,9 @@ bsb)
- ;;
-
- cpe210|\
--cpe510)
-+cpe510|\
-+wbs210|\
-+wbs510)
- ucidef_set_interfaces_lan_wan "eth0.1" "eth0.2"
- ucidef_add_switch "switch0" "1" "1"
- ucidef_add_switch_vlan "switch0" "1" "0t 5"
-diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
-index 5922527da4980fa3b51fdcec2bca96f5962d0f0b..33fdc751034d8cbdec344211f4e2b10afa0e9849 100755
---- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
-+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
-@@ -444,6 +444,14 @@ ar71xx_board_detect() {
- name="cpe510"
- tplink_pharos_board_detect
- ;;
-+ *WBS210)
-+ name="wbs210"
-+ tplink_pharos_board_detect
-+ ;;
-+ *WBS510)
-+ name="wbs510"
-+ tplink_pharos_board_detect
-+ ;;
- *"DB120 reference board")
- name="db120"
- ;;
-diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
-index e61ebf7c2221fd56bb902f14d96cb25d174718ee..a4e37e24cc57da5e90a86a1a5a99c6dfc829e65f 100755
---- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
-+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
-@@ -266,7 +266,9 @@ platform_check_image() {
- ;;
-
- cpe210|\
-- cpe510)
-+ cpe510|\
-+ wbs210|\
-+ wbs510)
- tplink_pharos_check_image "$1" && return 0
- return 1
- ;;
-diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-cpe510.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-cpe510.c
-index 74daf434e611d1f9d05f7d7516ae918d334b32b7..d2dbed1fe286c44d3188262e984253faaee7edba 100644
---- a/target/linux/ar71xx/files/arch/mips/ath79/mach-cpe510.c
-+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-cpe510.c
-@@ -30,6 +30,9 @@
- #define CPE510_GPIO_LED_L3 15
- #define CPE510_GPIO_LED_L4 16
-
-+/* All LEDs/button except for link4 are the same for CPE and WBS series */
-+#define WBS510_GPIO_LED_L4 2
-+
- #define CPE510_GPIO_EXTERNAL_LNA0 18
- #define CPE510_GPIO_EXTERNAL_LNA1 19
-
-@@ -67,6 +70,34 @@ static struct gpio_led cpe510_leds_gpio[] __initdata = {
- },
- };
-
-+static struct gpio_led wbs510_leds_gpio[] __initdata = {
-+ {
-+ .name = "tp-link:green:lan0",
-+ .gpio = CPE510_GPIO_LED_LAN0,
-+ .active_low = 1,
-+ }, {
-+ .name = "tp-link:green:lan1",
-+ .gpio = CPE510_GPIO_LED_LAN1,
-+ .active_low = 1,
-+ }, {
-+ .name = "tp-link:green:link1",
-+ .gpio = CPE510_GPIO_LED_L1,
-+ .active_low = 1,
-+ }, {
-+ .name = "tp-link:green:link2",
-+ .gpio = CPE510_GPIO_LED_L2,
-+ .active_low = 1,
-+ }, {
-+ .name = "tp-link:green:link3",
-+ .gpio = CPE510_GPIO_LED_L3,
-+ .active_low = 1,
-+ }, {
-+ .name = "tp-link:green:link4",
-+ .gpio = WBS510_GPIO_LED_L4,
-+ .active_low = 1,
-+ },
-+};
-+
- static struct gpio_keys_button cpe510_gpio_keys[] __initdata = {
- {
- .desc = "Reset button",
-@@ -85,9 +116,6 @@ static void __init cpe_setup(u8 *mac)
- ath79_gpio_function_setup(AR934X_GPIO_FUNC_JTAG_DISABLE,
- AR934X_GPIO_FUNC_CLK_OBS4_EN);
-
-- ath79_register_leds_gpio(-1, ARRAY_SIZE(cpe510_leds_gpio),
-- cpe510_leds_gpio);
--
- ath79_register_gpio_keys_polled(1, CPE510_KEYS_POLL_INTERVAL,
- ARRAY_SIZE(cpe510_gpio_keys),
- cpe510_gpio_keys);
-@@ -109,6 +137,9 @@ static void __init cpe210_setup(void)
- u8 *mac = (u8 *) KSEG1ADDR(0x1f830008);
- u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
-
-+ ath79_register_leds_gpio(-1, ARRAY_SIZE(cpe510_leds_gpio),
-+ cpe510_leds_gpio);
-+
- cpe_setup(mac);
-
- ath79_register_wmac(ee, mac);
-@@ -119,6 +150,22 @@ static void __init cpe510_setup(void)
- u8 *mac = (u8 *) KSEG1ADDR(0x1f830008);
- u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
-
-+ ath79_register_leds_gpio(-1, ARRAY_SIZE(cpe510_leds_gpio),
-+ cpe510_leds_gpio);
-+
-+ cpe_setup(mac);
-+
-+ ath79_register_wmac(ee, mac);
-+}
-+
-+static void __init wbs_setup(void)
-+{
-+ u8 *mac = (u8 *) KSEG1ADDR(0x1f830008);
-+ u8 *ee = (u8 *) KSEG1ADDR(0x1fff1000);
-+
-+ ath79_register_leds_gpio(-1, ARRAY_SIZE(wbs510_leds_gpio),
-+ wbs510_leds_gpio);
-+
- cpe_setup(mac);
-
- ath79_register_wmac(ee, mac);
-@@ -129,3 +176,9 @@ MIPS_MACHINE(ATH79_MACH_CPE210, "CPE210", "TP-LINK CPE210/220",
-
- MIPS_MACHINE(ATH79_MACH_CPE510, "CPE510", "TP-LINK CPE510/520",
- cpe510_setup);
-+
-+MIPS_MACHINE(ATH79_MACH_WBS210, "WBS210", "TP-LINK WBS210",
-+ wbs_setup);
-+
-+MIPS_MACHINE(ATH79_MACH_WBS510, "WBS510", "TP-LINK WBS510",
-+ wbs_setup);
-diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
-index 61e221255f6742f9594da168b11af7716d6a720e..459373b9cb96097d155b3d8f4e5fb76701d46d1c 100644
---- a/target/linux/ar71xx/image/Makefile
-+++ b/target/linux/ar71xx/image/Makefile
-@@ -2166,6 +2166,8 @@ $(eval $(call SingleProfile,TPLINK-LZMA,64kraw,TLWR2543,tl-wr2543-v1,TL-WR2543N,
-
- $(eval $(call SingleProfile,TPLINK-SAFELOADER,64kraw,CPE210_220,cpe210-220,CPE210,ttyS0,115200,$$(cpe510_mtdlayout),CPE210))
- $(eval $(call SingleProfile,TPLINK-SAFELOADER,64kraw,CPE510_520,cpe510-520,CPE510,ttyS0,115200,$$(cpe510_mtdlayout),CPE510))
-+$(eval $(call SingleProfile,TPLINK-SAFELOADER,64kraw,WBS210,wbs210,WBS210,ttyS0,115200,$$(cpe510_mtdlayout),WBS210))
-+$(eval $(call SingleProfile,TPLINK-SAFELOADER,64kraw,WBS510,wbs510,WBS510,ttyS0,115200,$$(cpe510_mtdlayout),WBS510))
-
- $(eval $(call SingleProfile,UAPPRO,64k,UAPPRO,ubnt-uap-pro,UAP-PRO,ttyS0,115200,BZ,BZ,ar934x))
- $(eval $(call SingleProfile,UAPPRO,64k,UBNTUNIFIOUTDOORPLUS,ubnt-unifi-outdoor-plus,UBNT-UOP,ttyS0,115200,BZ,BZ,ar7240))
-@@ -2229,7 +2231,7 @@ $(eval $(call MultiProfile,TLWR842,TLWR842V1))
- $(eval $(call MultiProfile,TLWR941,TLWR941NV2 TLWR941NV3 TLWR941NV4))
- $(eval $(call MultiProfile,TLWR1043,TLWR1043V1 TLWR1043V2 TLWR1043V3))
- $(eval $(call MultiProfile,TLWDR4300,TLWDR3500V1 TLWDR3600V1 TLWDR4300V1 TLWDR4300V1IL TLWDR4310V1 MW4530RV1))
--$(eval $(call MultiProfile,CPE510,CPE210_220 CPE510_520))
-+$(eval $(call MultiProfile,CPE510,CPE210_220 CPE510_520 WBS210 WBS510))
- $(eval $(call MultiProfile,TUBE2H,TUBE2H8M TUBE2H16M))
- $(eval $(call MultiProfile,UBNT,UBNTAIRROUTER UBNTRS UBNTRSPRO UBNTLSSR71 UBNTBULLETM UBNTROCKETM UBNTROCKETMXW UBNTNANOM UBNTNANOMXW UBNTLOCOXW UBNTUNIFI UBNTUNIFIOUTDOOR UBNTUNIFIOUTDOORPLUS UAPPRO UBNTAIRGW))
- $(eval $(call MultiProfile,WNR612V2,REALWNR612V2 N150R))
-diff --git a/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch b/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch
-index fb69cf3b9ee51e39c32a9e98de913c1a84bed56a..93ae596bfd9f439daf9295e3d58858c3067160b9 100644
---- a/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch
-+++ b/target/linux/ar71xx/patches-3.18/610-MIPS-ath79-openwrt-machines.patch
-@@ -1,6 +1,6 @@
- --- a/arch/mips/ath79/machtypes.h
- +++ b/arch/mips/ath79/machtypes.h
--@@ -16,22 +16,207 @@
-+@@ -16,22 +16,209 @@
-
- enum ath79_mach_type {
- ATH79_MACH_GENERIC = 0,
-@@ -175,6 +175,8 @@
- ATH79_MACH_UBNT_UNIFI_OUTDOOR, /* Ubiquiti UnifiAP Outdoor */
- + ATH79_MACH_UBNT_UNIFI_OUTDOOR_PLUS, /* Ubiquiti UnifiAP Outdoor+ */
- ATH79_MACH_UBNT_XM, /* Ubiquiti Networks XM board rev 1.0 */
-++ ATH79_MACH_WBS210, /* TP-LINK WBS210 */
-++ ATH79_MACH_WBS510, /* TP-LINK WBS510 */
- + ATH79_MACH_WEIO, /* WeIO board */
- + ATH79_MACH_WHR_G301N, /* Buffalo WHR-G301N */
- + ATH79_MACH_WHR_HP_G300N, /* Buffalo WHR-HP-G300N */
diff --git a/patches/openwrt/0094-mac80211-Allow-switching-of-the-ath-regulatory-domain.patch b/patches/openwrt/0094-mac80211-Allow-switching-of-the-ath-regulatory-domain.patch
deleted file mode 100644
index 0ded404923be1a58e951dcdffbf660e6d0e539c1..0000000000000000000000000000000000000000
--- a/patches/openwrt/0094-mac80211-Allow-switching-of-the-ath-regulatory-domain.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From: Sven Eckelmann <sven.eckelmann@open-mesh.com>
-Date: Fri, 6 Jan 2017 13:29:56 +0100
-Subject: mac80211: Allow switching of the ath regulatory domain
-
-ath10k has to switch the regulatory domain when switching the default
-country when ATH_USER_REGD is enabled. This is for example important when
-switching from country US (FCC) to DE (ETSI). The ath implementation will
-use ath_reg_dyn_country_user_allow to check if this is allowed.
-
-Unfortunately, this function always seems to return false to
-ath_reg_notifier_apply even when ATH_USER_REGD is enabled. But it must
-actually always accept the requests from the user (when ATH_USER_REGD is
-enabled) to correctly set the conformance test limits in the ath10k binary
-blob.
-
-Not doing it will sometimes allow too high transmit powers on edge channels
-for correctly calibrated devices outside their default regulatory domain.
-
-Signed-off-by: Sven Eckelmann <sven.eckelmann@open-mesh.com>
-
-Forwarded: https://github.com/openwrt/openwrt/pull/306
-
-diff --git a/package/kernel/mac80211/patches/402-ath_regd_optional.patch b/package/kernel/mac80211/patches/402-ath_regd_optional.patch
-index 463428371b4c96ee63b6eba1477023ff739c6129..a3572a297718f883f6126fc33aff5e14a046b9a0 100644
---- a/package/kernel/mac80211/patches/402-ath_regd_optional.patch
-+++ b/package/kernel/mac80211/patches/402-ath_regd_optional.patch
-@@ -1,6 +1,15 @@
- --- a/drivers/net/wireless/ath/regd.c
- +++ b/drivers/net/wireless/ath/regd.c
--@@ -341,6 +341,10 @@ ath_reg_apply_beaconing_flags(struct wip
-+@@ -188,6 +188,8 @@ static bool dynamic_country_user_possibl
-+
-+ static bool ath_reg_dyn_country_user_allow(struct ath_regulatory *reg)
-+ {
-++ if (config_enabled(CPTCFG_ATH_USER_REGD))
-++ return true;
-+ if (!config_enabled(CPTCFG_ATH_REG_DYNAMIC_USER_REG_HINTS))
-+ return false;
-+ if (!dynamic_country_user_possible(reg))
-+@@ -341,6 +343,10 @@ ath_reg_apply_beaconing_flags(struct wip
- struct ieee80211_channel *ch;
- unsigned int i;
-
-@@ -11,7 +20,7 @@
- for (band = 0; band < NUM_NL80211_BANDS; band++) {
- if (!wiphy->bands[band])
- continue;
--@@ -374,6 +378,10 @@ ath_reg_apply_ir_flags(struct wiphy *wip
-+@@ -374,6 +380,10 @@ ath_reg_apply_ir_flags(struct wiphy *wip
- {
- struct ieee80211_supported_band *sband;
-
-@@ -22,7 +31,7 @@
- sband = wiphy->bands[NL80211_BAND_2GHZ];
- if (!sband)
- return;
--@@ -402,6 +410,10 @@ static void ath_reg_apply_radar_flags(st
-+@@ -402,6 +412,10 @@ static void ath_reg_apply_radar_flags(st
- struct ieee80211_channel *ch;
- unsigned int i;
-
-@@ -33,7 +42,7 @@
- if (!wiphy->bands[NL80211_BAND_5GHZ])
- return;
-
--@@ -633,6 +645,11 @@ ath_regd_init_wiphy(struct ath_regulator
-+@@ -633,6 +647,11 @@ ath_regd_init_wiphy(struct ath_regulator
- const struct ieee80211_regdomain *regd;
-
- wiphy->reg_notifier = reg_notifier;
diff --git a/patches/openwrt/0095-build-pass-STAGING_DIR_HOST-to-Host-Install.patch b/patches/openwrt/0095-build-pass-STAGING_DIR_HOST-to-Host-Install.patch
deleted file mode 100644
index cec0454f14559c781e83177bffa8134d1c0a25e7..0000000000000000000000000000000000000000
--- a/patches/openwrt/0095-build-pass-STAGING_DIR_HOST-to-Host-Install.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Felix Fietkau <nbd@nbd.name>
-Date: Tue, 23 Aug 2016 10:58:00 +0200
-Subject: build: pass $(STAGING_DIR_HOST) to Host/Install
-
-makes it more consistent with package builds
-
-Signed-off-by: Felix Fietkau <nbd@nbd.name>
-
-Backport of LEDE 4170267f5a794eb3fa6bb1718a665e3395077434
-
-diff --git a/include/host-build.mk b/include/host-build.mk
-index 44401b866a4d637648bb093470a5e66b4a3e38fc..82d5361e30e897e18f5c9f9c57334c07bb74c490 100644
---- a/include/host-build.mk
-+++ b/include/host-build.mk
-@@ -110,7 +110,7 @@ define Host/Install/Default
- endef
-
- define Host/Install
-- $(call Host/Install/Default)
-+ $(call Host/Install/Default,$(STAGING_DIR_HOST))
- endef
-
-
-@@ -171,7 +171,7 @@ ifndef DUMP
- touch $$@
-
- $(HOST_STAMP_INSTALLED): $(HOST_STAMP_BUILT) $(if $(FORCE_HOST_INSTALL),FORCE)
-- $(call Host/Install)
-+ $(call Host/Install,$(STAGING_DIR_HOST))
- $(foreach hook,$(Hooks/HostInstall/Post),$(call $(hook))$(sep))
- mkdir -p $$(shell dirname $$@)
- touch $(HOST_STAMP_BUILT)
diff --git a/patches/packages/openwrt/0001-node-add-python-host-to-HOST_BUILD_DEPENDS-as-well.patch b/patches/packages/openwrt/0001-node-add-python-host-to-HOST_BUILD_DEPENDS-as-well.patch
deleted file mode 100644
index 63929b272888e86d0d65c9669cc733d54278067b..0000000000000000000000000000000000000000
--- a/patches/packages/openwrt/0001-node-add-python-host-to-HOST_BUILD_DEPENDS-as-well.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Wed, 28 Oct 2015 01:10:09 +0100
-Subject: node: add python/host to HOST_BUILD_DEPENDS as well
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/lang/node/Makefile b/lang/node/Makefile
-index 65a53900c7a907f41380469571fb5bd22028f62e..243c8a5b69ae6bd12b84493de3b26992167f2c17 100644
---- a/lang/node/Makefile
-+++ b/lang/node/Makefile
-@@ -14,6 +14,7 @@ PKG_RELEASE:=1
- PKG_SOURCE:=node-$(PKG_VERSION).tar.gz
- PKG_SOURCE_URL:=http://nodejs.org/dist/${PKG_VERSION}
-
-+HOST_BUILD_DEPENDS:=python/host
- PKG_BUILD_DEPENDS:=python/host
- PKG_INSTALL:=1
- PKG_USE_MIPS16:=0
diff --git a/patches/packages/openwrt/0002-lua-cjson-add-host-build-support.patch b/patches/packages/openwrt/0002-lua-cjson-add-host-build-support.patch
deleted file mode 100644
index b3f650cd12f02bcae2b32eab206c07d3273548ca..0000000000000000000000000000000000000000
--- a/patches/packages/openwrt/0002-lua-cjson-add-host-build-support.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Wed, 30 Dec 2015 01:00:49 +0100
-Subject: lua-cjson: add host build support
-
-diff --git a/lang/lua-cjson/Makefile b/lang/lua-cjson/Makefile
-index fbdcf17d1f0be7afeb512705137e438f47687850..1adfeb3b537f8b38d81148d4a8266485d7a05ab4 100644
---- a/lang/lua-cjson/Makefile
-+++ b/lang/lua-cjson/Makefile
-@@ -20,6 +20,7 @@ PKG_MD5SUM:=24f270663e9f6ca8ba2a02cef19f7963
-
- PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-+include $(INCLUDE_DIR)/host-build.mk
- include $(INCLUDE_DIR)/package.mk
- include $(INCLUDE_DIR)/cmake.mk
-
-@@ -39,6 +40,9 @@ endef
- CMAKE_OPTIONS += \
- -DUSE_LUA=ON
-
-+CMAKE_HOST_OPTIONS += \
-+ -DLUA_MATH_LIBRARY=m
-+
- define Package/lua-cjson/install
- $(INSTALL_DIR) $(1)/usr/lib/lua
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/cjson.so $(1)/usr/lib/lua/
-@@ -47,4 +51,5 @@ define Package/lua-cjson/install
- $(INSTALL_DATA) $(PKG_BUILD_DIR)/lua/cjson/util.lua $(1)/usr/lib/lua/cjson
- endef
-
-+$(eval $(call HostBuild))
- $(eval $(call BuildPackage,lua-cjson))
diff --git a/patches/packages/openwrt/0003-libuecc-update-to-v7.patch b/patches/packages/openwrt/0003-libuecc-update-to-v7.patch
deleted file mode 100644
index a2ee9a487355ffb65bc0da0f9098d143eb933203..0000000000000000000000000000000000000000
--- a/patches/packages/openwrt/0003-libuecc-update-to-v7.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Sun, 25 Oct 2015 17:11:30 +0100
-Subject: libuecc: update to v7
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/libs/libuecc/Makefile b/libs/libuecc/Makefile
-index 63b6ebe217fc2ff105a1a223807c610c31158eb8..c1ba53f854b5f0e29728f0a4d2e8f682ff8357a3 100644
---- a/libs/libuecc/Makefile
-+++ b/libs/libuecc/Makefile
-@@ -1,5 +1,5 @@
- #
--# Copyright (C) 2012-2015 OpenWrt.org
-+# Copyright (C) 2012-2016 OpenWrt.org
- #
- # This is free software, licensed under the GNU General Public License v2.
- # See /LICENSE for more information.
-@@ -8,13 +8,13 @@
- include $(TOPDIR)/rules.mk
-
- PKG_NAME:=libuecc
--PKG_VERSION:=5
-+PKG_VERSION:=7
- PKG_RELEASE:=1
-
- PKG_MAINTAINER:=Matthias Schiffer <mschiffer@universe-factory.net>
- PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
--PKG_SOURCE_URL:=https://projects.universe-factory.net/attachments/download/80
--PKG_MD5SUM:=cd03c947931c2f4b0eea0bf45654bd34
-+PKG_SOURCE_URL:=https://projects.universe-factory.net/attachments/download/85
-+PKG_MD5SUM:=5cd543cb8e7bce83a22c07a0579c95a1
-
- PKG_LICENSE:=BSD-2-Clause
- PKG_LICENSE_FILES:=COPYRIGHT
diff --git a/patches/packages/openwrt/0004-fastd-update-to-v18.patch b/patches/packages/openwrt/0004-fastd-update-to-v18.patch
deleted file mode 100644
index afe458e55158a7dd7ee6c421f8ca21d5a589eaaf..0000000000000000000000000000000000000000
--- a/patches/packages/openwrt/0004-fastd-update-to-v18.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Tue, 29 Mar 2016 00:24:00 +0200
-Subject: fastd: update to v18
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/net/fastd/Config.in b/net/fastd/Config.in
-index 5820b9796562cd11826f8bbefbb02806fe516c61..3350eb3099a26c870d70373c0712a8b59881ee5c 100644
---- a/net/fastd/Config.in
-+++ b/net/fastd/Config.in
-@@ -74,6 +74,12 @@ config FASTD_ENABLE_MAC_UHASH
- default y
-
-
-+config FASTD_WITH_CAPABILITIES
-+ bool "Enable POSIX capability support"
-+ depends on PACKAGE_fastd
-+ default n
-+
-+
- config FASTD_WITH_CMDLINE_USER
- bool "Include support for setting user/group related options on the command line"
- depends on PACKAGE_fastd
-diff --git a/net/fastd/Makefile b/net/fastd/Makefile
-index 027f5491d2f6b066affe08e846b1967900c391e1..5c550d8a5f4669d4f018dde23b622376bc8d0b06 100644
---- a/net/fastd/Makefile
-+++ b/net/fastd/Makefile
-@@ -8,13 +8,13 @@
- include $(TOPDIR)/rules.mk
-
- PKG_NAME:=fastd
--PKG_VERSION:=17
-+PKG_VERSION:=18
- PKG_RELEASE:=1
-
- PKG_MAINTAINER:=Matthias Schiffer <mschiffer@universe-factory.net>
- PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
--PKG_SOURCE_URL:=https://projects.universe-factory.net/attachments/download/81
--PKG_MD5SUM:=bad4f1948702f418b799578f83a0edb8
-+PKG_SOURCE_URL:=https://projects.universe-factory.net/attachments/download/86
-+PKG_MD5SUM:=e53236d3049f64f7955ad9556da099eb
-
- PKG_LICENSE:=BSD-2-Clause
- PKG_LICENSE_FILES:=COPYRIGHT
-@@ -34,6 +34,7 @@ PKG_CONFIG_DEPENDS:=\
- CONFIG_FASTD_ENABLE_CIPHER_SALSA2012 \
- CONFIG_FASTD_ENABLE_MAC_GHASH \
- CONFIG_FASTD_ENABLE_MAC_UHASH \
-+ CONFIG_FASTD_WITH_CAPABILITIES \
- CONFIG_FASTD_WITH_CMDLINE_USER \
- CONFIG_FASTD_WITH_CMDLINE_LOGGING \
- CONFIG_FASTD_WITH_CMDLINE_OPERATION \
-@@ -50,7 +51,7 @@ include $(INCLUDE_DIR)/cmake.mk
- define Package/fastd
- SECTION:=net
- CATEGORY:=Network
-- DEPENDS:=+kmod-tun +librt +libpthread +FASTD_WITH_STATUS_SOCKET:libjson-c
-+ DEPENDS:=+kmod-tun +librt +libpthread +FASTD_WITH_STATUS_SOCKET:libjson-c +FASTD_WITH_CAPABILITIES:libcap
- TITLE:=Fast and Secure Tunneling Daemon
- URL:=https://projects.universe-factory.net/projects/fastd
- SUBMENU:=VPN
-@@ -79,13 +80,13 @@ CMAKE_OPTIONS += \
- -DWITH_CIPHER_SALSA2012:BOOL=FALSE \
- -DWITH_MAC_GHASH:BOOL=FALSE \
- -DWITH_MAC_UHASH:BOOL=FALSE \
-+ -DWITH_CAPABILITIES:BOOL=FALSE \
- -DWITH_CMDLINE_USER:BOOL=FALSE \
- -DWITH_CMDLINE_LOGGING:BOOL=FALSE \
- -DWITH_CMDLINE_OPERATION:BOOL=FALSE \
- -DWITH_CMDLINE_COMMANDS:BOOL=FALSE \
- -DWITH_DYNAMIC_PEERS:BOOL=FALSE \
- -DWITH_STATUS_SOCKET:BOOL=FALSE \
-- -DWITH_CAPABILITIES:BOOL=FALSE \
- -DENABLE_SYSTEMD:BOOL=FALSE \
- -DENABLE_LIBSODIUM:BOOL=FALSE \
- -DENABLE_LTO:BOOL=TRUE
-@@ -150,6 +151,11 @@ CMAKE_OPTIONS += -DWITH_MAC_UHASH:BOOL=TRUE
- endif
-
-
-+ifeq ($(CONFIG_FASTD_WITH_CAPABILITIES),y)
-+CMAKE_OPTIONS += -DWITH_CAPABILITIES:BOOL=TRUE
-+endif
-+
-+
- ifeq ($(CONFIG_FASTD_WITH_CMDLINE_USER),y)
- CMAKE_OPTIONS += -DWITH_CMDLINE_USER:BOOL=TRUE
- endif
diff --git a/patches/packages/openwrt/0005-node-update-to-v0.12.14.patch b/patches/packages/openwrt/0005-node-update-to-v0.12.14.patch
deleted file mode 100644
index dd52f71a854e2777cfcfd1ed427a96d4ad5b2349..0000000000000000000000000000000000000000
--- a/patches/packages/openwrt/0005-node-update-to-v0.12.14.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Mon, 9 May 2016 15:57:18 +0200
-Subject: node: update to v0.12.14
-
-While we're at it, also enable parallel builds.
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/lang/node/Makefile b/lang/node/Makefile
-index 243c8a5b69ae6bd12b84493de3b26992167f2c17..ed35e1729bb01bcbb89e43f975940e675d774cde 100644
---- a/lang/node/Makefile
-+++ b/lang/node/Makefile
-@@ -8,17 +8,21 @@
- include $(TOPDIR)/rules.mk
-
- PKG_NAME:=node
--PKG_VERSION:=v0.12.7
-+PKG_VERSION:=v0.12.14
- PKG_RELEASE:=1
-
--PKG_SOURCE:=node-$(PKG_VERSION).tar.gz
-+PKG_SOURCE:=node-$(PKG_VERSION).tar.xz
- PKG_SOURCE_URL:=http://nodejs.org/dist/${PKG_VERSION}
-+PKG_MD5SUM:=27f1a2cf00af32cbfe9401ca4b1a805f
-
- HOST_BUILD_DEPENDS:=python/host
- PKG_BUILD_DEPENDS:=python/host
- PKG_INSTALL:=1
- PKG_USE_MIPS16:=0
-
-+HOST_BUILD_PARALLEL:=1
-+PKG_BUILD_PARALLEL:=1
-+
- PKG_MAINTAINER:=John Crispin <blogic@openwrt.org>
- PKG_LICENSE:=
-
-@@ -56,6 +60,12 @@ HOST_CONFIGURE_ARGS:= \
-
- HOST_CONFIGURE_CMD:=python ./configure
-
-+HOST_MAKE_FLAGS += CXXFLAGS='-std=c++11'
-+
-+define Host/Install
-+ $(MAKE) -C $(HOST_BUILD_DIR) $(HOST_MAKE_FLAGS) install
-+endef
-+
- define Build/InstallDev
- $(INSTALL_DIR) $(1)/usr/include
- $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
diff --git a/patches/packages/openwrt/0006-node-fix-undefined-behaviour-leading-to-broken-code-with-GCC-6.patch b/patches/packages/openwrt/0006-node-fix-undefined-behaviour-leading-to-broken-code-with-GCC-6.patch
deleted file mode 100644
index b183cf193db05a84e19f03c22e758cc82fdd4724..0000000000000000000000000000000000000000
--- a/patches/packages/openwrt/0006-node-fix-undefined-behaviour-leading-to-broken-code-with-GCC-6.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Mon, 9 May 2016 16:21:57 +0200
-Subject: node: fix undefined behaviour leading to broken code with GCC 6
-
-Fixes segfaults occuring in the node host build when GCC 6 is used.
-
-Backport of upstream commit 96198d5bc710a4e3ca49eeeb3b3fa7b8cb61547d.
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/lang/node/patches/004-gcc6-undefined-behaviour.patch b/lang/node/patches/004-gcc6-undefined-behaviour.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..dbbbcf0c54bb62f643521411668772531d42b89a
---- /dev/null
-+++ b/lang/node/patches/004-gcc6-undefined-behaviour.patch
-@@ -0,0 +1,64 @@
-+diff --git a/deps/v8/src/heap/incremental-marking.cc b/deps/v8/src/heap/incremental-marking.cc
-+index c922e83..2ead8be 100644
-+--- a/deps/v8/src/heap/incremental-marking.cc
-++++ b/deps/v8/src/heap/incremental-marking.cc
-+@@ -379,7 +379,7 @@ void IncrementalMarking::DeactivateIncrementalWriteBarrier() {
-+ DeactivateIncrementalWriteBarrierForSpace(heap_->new_space());
-+
-+ LargePage* lop = heap_->lo_space()->first_page();
-+- while (lop->is_valid()) {
-++ while (LargePage::IsValid(lop)) {
-+ SetOldSpacePageFlags(lop, false, false);
-+ lop = lop->next_page();
-+ }
-+@@ -414,7 +414,7 @@ void IncrementalMarking::ActivateIncrementalWriteBarrier() {
-+ ActivateIncrementalWriteBarrier(heap_->new_space());
-+
-+ LargePage* lop = heap_->lo_space()->first_page();
-+- while (lop->is_valid()) {
-++ while (LargePage::IsValid(lop)) {
-+ SetOldSpacePageFlags(lop, true, is_compacting_);
-+ lop = lop->next_page();
-+ }
-+diff --git a/deps/v8/src/heap/spaces-inl.h b/deps/v8/src/heap/spaces-inl.h
-+index 56c2bad..1a45096 100644
-+--- a/deps/v8/src/heap/spaces-inl.h
-++++ b/deps/v8/src/heap/spaces-inl.h
-+@@ -148,7 +148,7 @@ Page* Page::Initialize(Heap* heap, MemoryChunk* chunk, Executability executable,
-+
-+ bool PagedSpace::Contains(Address addr) {
-+ Page* p = Page::FromAddress(addr);
-+- if (!p->is_valid()) return false;
-++ if (!Page::IsValid(p)) return false;
-+ return p->owner() == this;
-+ }
-+
-+diff --git a/deps/v8/src/heap/spaces.cc b/deps/v8/src/heap/spaces.cc
-+index e197f5a..2fe10eb 100644
-+--- a/deps/v8/src/heap/spaces.cc
-++++ b/deps/v8/src/heap/spaces.cc
-+@@ -2918,7 +2918,7 @@ LargePage* LargeObjectSpace::FindPage(Address a) {
-+ if (e != NULL) {
-+ DCHECK(e->value != NULL);
-+ LargePage* page = reinterpret_cast<LargePage*>(e->value);
-+- DCHECK(page->is_valid());
-++ DCHECK(LargePage::IsValid(page));
-+ if (page->Contains(a)) {
-+ return page;
-+ }
-+diff --git a/deps/v8/src/heap/spaces.h b/deps/v8/src/heap/spaces.h
-+index 312d75f..1054672 100644
-+--- a/deps/v8/src/heap/spaces.h
-++++ b/deps/v8/src/heap/spaces.h
-+@@ -283,9 +283,9 @@ class MemoryChunk {
-+ // Only works for addresses in pointer spaces, not data or code spaces.
-+ static inline MemoryChunk* FromAnyPointerAddress(Heap* heap, Address addr);
-+
-+- Address address() { return reinterpret_cast<Address>(this); }
-++ static bool IsValid(MemoryChunk* chunk) { return chunk != nullptr; }
-+
-+- bool is_valid() { return address() != NULL; }
-++ Address address() { return reinterpret_cast<Address>(this); }
-+
-+ MemoryChunk* next_chunk() const {
-+ return reinterpret_cast<MemoryChunk*>(base::Acquire_Load(&next_chunk_));
diff --git a/patches/packages/openwrt/0007-libuecc-use-shared-instead-of-static-library.patch b/patches/packages/openwrt/0007-libuecc-use-shared-instead-of-static-library.patch
deleted file mode 100644
index a2354f60867a6b4858f755d26f73b4fb91deefbb..0000000000000000000000000000000000000000
--- a/patches/packages/openwrt/0007-libuecc-use-shared-instead-of-static-library.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Tue, 3 May 2016 21:33:34 +0200
-Subject: libuecc: use shared instead of static library
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/libs/libuecc/Makefile b/libs/libuecc/Makefile
-index c1ba53f854b5f0e29728f0a4d2e8f682ff8357a3..81110624212291d86631a7b56232208459b004da 100644
---- a/libs/libuecc/Makefile
-+++ b/libs/libuecc/Makefile
-@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
-
- PKG_NAME:=libuecc
- PKG_VERSION:=7
--PKG_RELEASE:=1
-+PKG_RELEASE:=2
-
- PKG_MAINTAINER:=Matthias Schiffer <mschiffer@universe-factory.net>
- PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-@@ -35,11 +35,16 @@ CMAKE_OPTIONS += \
- -DCMAKE_BUILD_TYPE:String="MINSIZEREL"
-
-
-+define Package/libuecc/install
-+ $(INSTALL_DIR) $(1)/usr/lib
-+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libuecc.so* $(1)/usr/lib/
-+endef
-+
- define Build/InstallDev
- $(INSTALL_DIR) $(1)/usr/include
- $(CP) $(PKG_INSTALL_DIR)/usr/include/libuecc-$(PKG_VERSION) $(1)/usr/include/
- $(INSTALL_DIR) $(1)/usr/lib
-- $(CP) $(PKG_INSTALL_DIR)/usr/lib/libuecc.a $(1)/usr/lib/
-+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libuecc.so* $(1)/usr/lib/
- $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
- $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libuecc.pc $(1)/usr/lib/pkgconfig/
- endef
-diff --git a/net/fastd/Makefile b/net/fastd/Makefile
-index 5c550d8a5f4669d4f018dde23b622376bc8d0b06..aeaa1dfcf682a5c2b048d636b549953035fdbf0d 100644
---- a/net/fastd/Makefile
-+++ b/net/fastd/Makefile
-@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
-
- PKG_NAME:=fastd
- PKG_VERSION:=18
--PKG_RELEASE:=1
-+PKG_RELEASE:=2
-
- PKG_MAINTAINER:=Matthias Schiffer <mschiffer@universe-factory.net>
- PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-@@ -43,7 +43,7 @@ PKG_CONFIG_DEPENDS:=\
- CONFIG_FASTD_WITH_STATUS_SOCKET
-
-
--PKG_BUILD_DEPENDS:=nacl libuecc
-+PKG_BUILD_DEPENDS:=nacl
-
- include $(INCLUDE_DIR)/package.mk
- include $(INCLUDE_DIR)/cmake.mk
-@@ -51,7 +51,7 @@ include $(INCLUDE_DIR)/cmake.mk
- define Package/fastd
- SECTION:=net
- CATEGORY:=Network
-- DEPENDS:=+kmod-tun +librt +libpthread +FASTD_WITH_STATUS_SOCKET:libjson-c +FASTD_WITH_CAPABILITIES:libcap
-+ DEPENDS:=+kmod-tun +librt +libpthread +libuecc +FASTD_WITH_STATUS_SOCKET:libjson-c +FASTD_WITH_CAPABILITIES:libcap
- TITLE:=Fast and Secure Tunneling Daemon
- URL:=https://projects.universe-factory.net/projects/fastd
- SUBMENU:=VPN
diff --git a/scripts/check_site.sh b/scripts/check_site.sh
deleted file mode 100755
index 0ca303160aab30094373785e0aeb40a10cea09b2..0000000000000000000000000000000000000000
--- a/scripts/check_site.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-SITE_CONFIG_LUA=scripts/site_config.lua
-CHECK_SITE_LIB=scripts/check_site_lib.lua
-
-"$GLUONDIR"/openwrt/staging_dir/host/bin/lua -e "site = dofile(os.getenv('GLUONDIR') .. '/${SITE_CONFIG_LUA}'); dofile(os.getenv('GLUONDIR') .. '/${CHECK_SITE_LIB}'); dofile()"
diff --git a/scripts/clean_output.sh b/scripts/clean_output.sh
new file mode 100755
index 0000000000000000000000000000000000000000..d9b6e903a9eb359848268568ea2544123509eac8
--- /dev/null
+++ b/scripts/clean_output.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+set -e
+
+[ "$LEDE_TARGET" ] || exit 1
+
+
+. scripts/common.inc.sh
+
+
+if [ "$(expr match "$LEDE_TARGET" '.*-.*')" -gt 0 ]; then
+ LEDE_BINDIR="${LEDE_TARGET//-/\/}"
+else
+ LEDE_BINDIR="${LEDE_TARGET}/generic"
+fi
+
+rm -f "lede/bin/targets/${LEDE_BINDIR}"/* 2>/dev/null || true
+
+# Full builds will output the "packages" directory, so clean up first
+[ "$has_devices" ] || rm -rf "lede/bin/targets/${LEDE_BINDIR}/packages"
diff --git a/scripts/common.inc.sh b/scripts/common.inc.sh
new file mode 100644
index 0000000000000000000000000000000000000000..59bb8ad3e21f2b4b46c0f285710c33cfde0213e1
--- /dev/null
+++ b/scripts/common.inc.sh
@@ -0,0 +1,66 @@
+config() {
+ :
+}
+
+device() {
+ :
+}
+
+factory_image() {
+ :
+}
+
+sysupgrade_image() {
+ :
+}
+
+alias() {
+ :
+}
+
+packages() {
+ :
+}
+
+factory() {
+ :
+}
+
+sysupgrade() {
+ :
+}
+
+
+if [ "$DEVICES" ]; then
+ has_devices=1
+else
+ has_devices=
+fi
+
+want_device() {
+ [ "$has_devices" ] || return 0
+
+ local new_devices=''
+ local ret=1
+
+ for device in $DEVICES; do
+ if [ "$device" = "$1" ]; then
+ ret=0
+ else
+ new_devices="${new_devices:+${new_devices} }$device"
+ fi
+ done
+
+ DEVICES=$new_devices
+
+ return $ret
+}
+
+check_devices() {
+ [ "$has_devices" ] || return 0
+
+ if [ "$DEVICES" ]; then
+ echo "Error: unknown devices given: $DEVICES" >&2
+ exit 1
+ fi
+}
diff --git a/scripts/copy_output.sh b/scripts/copy_output.sh
new file mode 100755
index 0000000000000000000000000000000000000000..9f19a80cb73e368225341b2a04e8925ffae3443d
--- /dev/null
+++ b/scripts/copy_output.sh
@@ -0,0 +1,157 @@
+#!/usr/bin/env bash
+
+set -e
+
+[ "$GLUON_IMAGEDIR" -a "$GLUON_PACKAGEDIR" -a "$LEDE_TARGET" -a "$GLUON_RELEASE" -a "$GLUON_SITEDIR" ] || exit 1
+
+
+default_factory_ext='.bin'
+default_factory_suffix='-squashfs-factory'
+default_sysupgrade_ext='.bin'
+default_sysupgrade_suffix='-squashfs-sysupgrade'
+
+output=
+profile=
+aliases=
+
+factory_ext=
+factory_suffix=
+sysupgrade_ext=
+sysupgrade_suffix=
+
+
+mkdir -p "${GLUON_IMAGEDIR}/factory" "${GLUON_IMAGEDIR}/sysupgrade"
+
+if [ "$(expr match "$LEDE_TARGET" '.*-.*')" -gt 0 ]; then
+ LEDE_BINDIR="${LEDE_TARGET//-/\/}"
+else
+ LEDE_BINDIR="${LEDE_TARGET}/generic"
+fi
+
+SITE_CODE="$(scripts/site.sh site_code)"
+PACKAGE_PREFIX="gluon-${SITE_CODE}-${GLUON_RELEASE}"
+
+copy() {
+ [ "${output}" ] || return 0
+ want_device "${output}" || return 0
+
+ if [ "$factory_ext" ]; then
+ rm -f "${GLUON_IMAGEDIR}/factory/gluon-"*"-${output}${factory_ext}"
+ cp "lede/bin/targets/${LEDE_BINDIR}/lede-${LEDE_TARGET}${profile}${factory_suffix}${factory_ext}" \
+ "${GLUON_IMAGEDIR}/factory/gluon-${SITE_CODE}-${GLUON_RELEASE}-${output}${factory_ext}"
+
+ for alias in $aliases; do
+ rm -f "${GLUON_IMAGEDIR}/factory/gluon-"*"-${alias}${factory_ext}"
+ ln -s "gluon-${SITE_CODE}-${GLUON_RELEASE}-${output}${factory_ext}" \
+ "${GLUON_IMAGEDIR}/factory/gluon-${SITE_CODE}-${GLUON_RELEASE}-${alias}${factory_ext}"
+ done
+ fi
+
+ if [ "$sysupgrade_ext" ]; then
+ rm -f "${GLUON_IMAGEDIR}/sysupgrade/gluon-"*"-${output}-sysupgrade${sysupgrade_ext}"
+ cp "lede/bin/targets/${LEDE_BINDIR}/lede-${LEDE_TARGET}${profile}${sysupgrade_suffix}${sysupgrade_ext}" \
+ "${GLUON_IMAGEDIR}/sysupgrade/gluon-${SITE_CODE}-${GLUON_RELEASE}-${output}-sysupgrade${sysupgrade_ext}"
+
+ for alias in $aliases; do
+ rm -f "${GLUON_IMAGEDIR}/sysupgrade/gluon-"*"-${alias}-sysupgrade${sysupgrade_ext}"
+ ln -s "gluon-${SITE_CODE}-${GLUON_RELEASE}-${output}-sysupgrade${sysupgrade_ext}" \
+ "${GLUON_IMAGEDIR}/sysupgrade/gluon-${SITE_CODE}-${GLUON_RELEASE}-${alias}-sysupgrade${sysupgrade_ext}"
+ done
+ fi
+}
+
+
+. scripts/common.inc.sh
+
+device() {
+ copy
+
+ output="$1"
+ profile="-$2"
+ aliases=
+
+ factory_ext="$default_factory_ext"
+ factory_suffix="$default_factory_suffix"
+ sysupgrade_ext="$default_sysupgrade_ext"
+ sysupgrade_suffix="$default_sysupgrade_suffix"
+}
+
+factory_image() {
+ copy
+
+ output="$1"
+ aliases=
+
+ if [ "$3" ]; then
+ profile="-$2"
+ factory_ext="$3"
+ else
+ profile=""
+ factory_ext="$2"
+ fi
+
+ factory_suffix=
+ sysupgrade_ext=
+ sysupgrade_suffix=
+}
+
+sysupgrade_image() {
+ copy
+
+ output="$1"
+ aliases=
+
+ if [ "$3" ]; then
+ profile="-$2"
+ sysupgrade_ext="$3"
+ else
+ profile=""
+ sysupgrade_ext="$2"
+ fi
+
+ factory_ext=
+ factory_suffix=
+ sysupgrade_suffix=
+}
+
+alias() {
+ aliases="$aliases $1"
+}
+
+factory() {
+ if [ "$2" ]; then
+ factory_suffix="$1"
+ factory_ext="$2"
+ else
+ factory_ext="$1"
+ fi
+
+ if [ -z "$profile" ]; then
+ default_factory_ext="$factory_ext"
+ default_factory_suffix="$factory_suffix"
+ fi
+}
+
+sysupgrade() {
+ if [ "$2" ]; then
+ sysupgrade_suffix="$1"
+ sysupgrade_ext="$2"
+ else
+ sysupgrade_ext="$1"
+ fi
+
+ if [ -z "$output" ]; then
+ default_sysupgrade_ext="$sysupgrade_ext"
+ default_sysupgrade_suffix="$sysupgrade_suffix"
+ fi
+}
+
+. targets/"$1"; copy
+
+# Copy opkg repo
+if [ -z "$has_devices" ]; then
+ rm -f "$GLUON_PACKAGEDIR"/*/"$LEDE_BINDIR"/*
+ rmdir -p "$GLUON_PACKAGEDIR"/*/"$LEDE_BINDIR" 2>/dev/null || true
+ mkdir -p "${GLUON_PACKAGEDIR}/${PACKAGE_PREFIX}/${LEDE_BINDIR}"
+ cp "lede/bin/targets/${LEDE_BINDIR}/packages"/* "${GLUON_PACKAGEDIR}/${PACKAGE_PREFIX}/${LEDE_BINDIR}"
+fi
diff --git a/scripts/feeds.sh b/scripts/feeds.sh
new file mode 100755
index 0000000000000000000000000000000000000000..57c23851849a6ed197baff3b104228f9244d85e6
--- /dev/null
+++ b/scripts/feeds.sh
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+set -e
+
+. scripts/modules.sh
+
+FEEDS="$GLUON_SITE_FEEDS $GLUON_FEEDS"
+
+(
+ cat lede/feeds.conf.default
+ echo 'src-link gluon ../../package'
+ for feed in $FEEDS; do
+ echo "src-link packages_$feed ../../packages/$feed"
+ done
+) > lede/feeds.conf
+
+rm -rf lede/feeds
+rm -rf lede/package/feeds
+
+mkdir -p lede/overlay
+rm -f lede/overlay/gluon
+ln -s ../../overlay lede/overlay/gluon
+
+lede/scripts/feeds update 'gluon'
+for feed in $FEEDS; do
+ lede/scripts/feeds update "packages_$feed"
+done
+
+lede/scripts/feeds install -a
diff --git a/scripts/generate_manifest.sh b/scripts/generate_manifest.sh
new file mode 100755
index 0000000000000000000000000000000000000000..43d4973baafc1945071d8a5b9fa0912ca1c8b80d
--- /dev/null
+++ b/scripts/generate_manifest.sh
@@ -0,0 +1,79 @@
+#!/usr/bin/env bash
+
+set -e
+
+[ "$GLUON_IMAGEDIR" -a "$GLUON_RELEASE" -a "$GLUON_SITEDIR" ] || exit 1
+
+
+default_sysupgrade_ext='.bin'
+
+output=
+aliases=
+
+sysupgrade_ext=
+
+
+SITE_CODE="$(scripts/site.sh site_code)"
+
+
+generate_line() {
+ local model="$1"
+ local file="$2"
+
+ [ ! -e "${GLUON_IMAGEDIR}/sysupgrade/$file" ] || echo "$model" "$GLUON_RELEASE" "$(scripts/sha512sum.sh "${GLUON_IMAGEDIR}/sysupgrade/$file")" "$file"
+}
+
+generate() {
+ [ "${output}" ] || return 0
+
+ if [ "$sysupgrade_ext" ]; then
+ generate_line "$output" "gluon-${SITE_CODE}-${GLUON_RELEASE}-${output}-sysupgrade${sysupgrade_ext}"
+
+ for alias in $aliases; do
+ generate_line "$output" "gluon-${SITE_CODE}-${GLUON_RELEASE}-${alias}-sysupgrade${sysupgrade_ext}"
+ done
+ fi
+}
+
+
+. scripts/common.inc.sh
+
+device() {
+ generate
+
+ output="$1"
+ aliases=
+
+ sysupgrade_ext="$default_sysupgrade_ext"
+}
+
+sysupgrade_image() {
+ generate
+
+ output="$1"
+ aliases=
+
+ if [ "$3" ]; then
+ sysupgrade_ext="$3"
+ else
+ sysupgrade_ext="$2"
+ fi
+}
+
+alias() {
+ aliases="$aliases $1"
+}
+
+sysupgrade() {
+ if [ "$2" ]; then
+ sysupgrade_ext="$2"
+ else
+ sysupgrade_ext="$1"
+ fi
+
+ if [ -z "$output" ]; then
+ default_sysupgrade_ext="$sysupgrade_ext"
+ fi
+}
+
+. targets/"$1"; generate
diff --git a/scripts/modules.sh b/scripts/modules.sh
index 8a875b65ba8c5dbac65be444f0999f140aed11b4..09b7b0fc931bca39bf8938895660f73303484600 100644
--- a/scripts/modules.sh
+++ b/scripts/modules.sh
@@ -1,7 +1,7 @@
-. "$GLUONDIR"/modules
+. ./modules
[ ! -f "$GLUON_SITEDIR"/modules ] || . "$GLUON_SITEDIR"/modules
-GLUON_MODULES=openwrt
+GLUON_MODULES=lede
for feed in $GLUON_SITE_FEEDS $GLUON_FEEDS; do
GLUON_MODULES="$GLUON_MODULES packages/$feed"
diff --git a/scripts/patch.sh b/scripts/patch.sh
index 7dfb3061394b44f38555bb46bdb34c3a6cdf64a9..61d5f45570d6b326c4c4753b42bca12530c44bf3 100755
--- a/scripts/patch.sh
+++ b/scripts/patch.sh
@@ -3,13 +3,14 @@
set -e
shopt -s nullglob
-. "$GLUONDIR"/scripts/modules.sh
+. scripts/modules.sh
-TMPDIR="$GLUON_BUILDDIR"/tmp
-mkdir -p "$TMPDIR"
+mkdir -p "$GLUON_TMPDIR"
-PATCHDIR="$TMPDIR"/patching
+GLUONDIR="$(pwd)"
+
+PATCHDIR="$GLUON_TMPDIR"/patching
trap 'rm -rf "$PATCHDIR"' EXIT
for module in $GLUON_MODULES; do
@@ -24,7 +25,11 @@ for module in $GLUON_MODULES; do
cd "$GLUONDIR/$module"
git fetch "$PATCHDIR" 2>/dev/null
- git checkout -B patched FETCH_HEAD
+ git checkout -B patched FETCH_HEAD >/dev/null
+
+ git config branch.patched.remote .
+ git config branch.patched.merge refs/heads/base
+
git submodule update --init --recursive
rm -rf "$PATCHDIR"
diff --git a/scripts/site.sh b/scripts/site.sh
index 5038438a8b648930919479ba678543db50a9a6e9..2c161ff146e02e1649430431c2bf664ea077dce5 100755
--- a/scripts/site.sh
+++ b/scripts/site.sh
@@ -1,5 +1,3 @@
#!/bin/sh
-SITE_CONFIG_LUA=scripts/site_config.lua
-
-"$GLUONDIR"/openwrt/staging_dir/host/bin/lua -e "print(assert(dofile(os.getenv('GLUONDIR') .. '/${SITE_CONFIG_LUA}').$1))" 2>/dev/null
+exec lede/staging_dir/hostpkg/bin/lua -e "print(assert(dofile('scripts/site_config.lua').$1))" 2>/dev/null
diff --git a/scripts/site_config.lua b/scripts/site_config.lua
index a50f115bf8663e8b5f396f3296fd7fd505a57887..d7bdc1f6ab4db5e86f0a86038388827d774f1e25 100644
--- a/scripts/site_config.lua
+++ b/scripts/site_config.lua
@@ -1,8 +1,8 @@
-local config = os.getenv('GLUON_SITE_CONFIG')
+local config = os.getenv('GLUON_SITEDIR')
local function loader()
coroutine.yield('return ')
- coroutine.yield(io.open(config):read('*a'))
+ coroutine.yield(io.open(config .. '/site.conf'):read('*a'))
end
-- setfenv doesn't work with Lua 5.2 anymore, but we're using 5.1
diff --git a/scripts/target_config.sh b/scripts/target_config.sh
new file mode 100755
index 0000000000000000000000000000000000000000..9f5f66e9205ebb8c7b02df1c2d79e522fe0c4e74
--- /dev/null
+++ b/scripts/target_config.sh
@@ -0,0 +1,77 @@
+#!/usr/bin/env bash
+
+set -e
+
+[ "$LEDE_TARGET" ] || exit 1
+
+
+output=
+profile=
+default_packages=
+profile_packages=
+
+
+LEDE_CONFIG_TARGET="${LEDE_TARGET//-/_}"
+
+
+site_packages() {
+ MAKEFLAGS= make PROFILE="$1" --no-print-directory -s -f - <<'END_MAKE'
+include $(GLUON_SITEDIR)/site.mk
+
+all:
+ echo '$(GLUON_$(PROFILE)_SITE_PACKAGES)'
+END_MAKE
+}
+
+
+emit() {
+ [ "${output}" ] || return 0
+ want_device "${output}" || return 0
+
+ for package in $profile_packages; do
+ [ "${package:0:1}" = '-' ] || echo "CONFIG_PACKAGE_${package}=m"
+ done
+
+ echo "CONFIG_TARGET_DEVICE_${LEDE_CONFIG_TARGET}_DEVICE_${profile}=y"
+ echo "CONFIG_TARGET_DEVICE_PACKAGES_${LEDE_CONFIG_TARGET}_DEVICE_${profile}=\"${profile_packages}\""
+}
+
+
+. scripts/common.inc.sh
+
+config() {
+ echo "$1"
+}
+
+device() {
+ emit
+
+ output="$1"
+ profile="$3"
+ if [ -z "$profile" ]; then
+ profile="$2"
+ fi
+
+ profile_packages="${default_packages} $(site_packages "$output")"
+}
+
+packages() {
+ if [ "${output}" ]; then
+ profile_packages="${profile_packages} $@"
+ else
+ default_packages="${default_packages} $@"
+
+ for package in "$@"; do
+ if [ "${package:0:1}" = '-' ]; then
+ echo "CONFIG_PACKAGE_${package:1}=m"
+ else
+ echo "CONFIG_PACKAGE_${package}=y"
+ fi
+ done
+ fi
+}
+
+
+# The sort will not only remove duplicate entries,
+# but also magically make =y entries override =m ones
+(. targets/"$1"; emit) | sort -u
diff --git a/scripts/target_config_check.sh b/scripts/target_config_check.sh
new file mode 100755
index 0000000000000000000000000000000000000000..030ba62e5851f7962ecebdd4d3742deb1cd49470
--- /dev/null
+++ b/scripts/target_config_check.sh
@@ -0,0 +1,91 @@
+#!/usr/bin/env bash
+
+set -e
+
+[ "$LEDE_TARGET" ] || exit 1
+
+target="$1"
+packages=$2
+
+output=
+
+LEDE_CONFIG_TARGET="${LEDE_TARGET//-/_}"
+
+
+site_packages() {
+ MAKEFLAGS= make PROFILE="$1" --no-print-directory -s -f - <<'END_MAKE'
+include $(GLUON_SITEDIR)/site.mk
+
+all:
+ echo '$(GLUON_$(PROFILE)_SITE_PACKAGES)'
+END_MAKE
+}
+
+
+check_config() {
+ grep -q "$1" lede/.config
+}
+
+check_package() {
+ local package="$1"
+ local value="$2"
+
+ if ! check_config "^CONFIG_PACKAGE_${package}=${value}"; then
+ echo "Configuration failed: unable to enable package '${package}'" >&2
+ exit 1
+ fi
+}
+
+
+. scripts/common.inc.sh
+
+config() {
+ local config="$1"
+
+ if ! check_config "^${config}\$"; then
+ echo "Configuration failed: unable to set '${config}'" >&2
+ exit 1
+ fi
+}
+
+device() {
+ output="$1"
+ want_device "${output}" || return 0
+
+ local profile="$3"
+ if [ -z "$profile" ]; then
+ profile="$2"
+ fi
+
+ if ! check_config "CONFIG_TARGET_DEVICE_${LEDE_CONFIG_TARGET}_DEVICE_${profile}=y"; then
+ echo "Configuration failed: unable to enable device '${profile}'" >&2
+ exit 1
+ fi
+
+ for package in $(site_packages "$output"); do
+ [ "${package:0:1}" = '-' ] || check_package "$package"
+ done
+}
+
+packages() {
+ if [ "${output}" ]; then
+ want_device "${output}" || return 0
+
+ for package in "$@"; do
+ [ "${package:0:1}" = '-' ] || check_package "$package"
+ done
+ else
+ for package in "$@"; do
+ [ "${package:0:1}" = '-' ] || check_package "$package" 'y'
+ done
+ fi
+}
+
+
+. targets/"$target"
+check_devices
+
+
+for package in $packages; do
+ check_package "$package" 'y'
+done
diff --git a/scripts/update-patches.sh b/scripts/update-patches.sh
index 41ee55d56f57f6962e02f2969f26a53eb19155e9..c84646462218a5b3ab261664a7e87006a599db7f 100755
--- a/scripts/update-patches.sh
+++ b/scripts/update-patches.sh
@@ -3,19 +3,22 @@
set -e
shopt -s nullglob
-. "$GLUONDIR"/scripts/modules.sh
+. scripts/modules.sh
+
+
+GLUONDIR="$(pwd)"
for module in $GLUON_MODULES; do
echo "--- Updating patches for module '$module' ---"
- rm -f "$GLUONDIR"/patches/"$module"/*.patch
- mkdir -p "$GLUONDIR"/patches/"$module"
+ rm -rf "$GLUONDIR"/patches/"$module"
cd "$GLUONDIR"/"$module"
n=0
for commit in $(git rev-list --reverse --no-merges base..patched); do
let n=n+1
+ mkdir -p "$GLUONDIR"/patches/"$module"
git -c core.abbrev=40 show --pretty=format:'From: %an <%ae>%nDate: %aD%nSubject: %B' --no-renames "$commit" > "$GLUONDIR/patches/$module/$(printf '%04u' $n)-$(git show -s --pretty=format:%f "$commit").patch"
done
done
diff --git a/scripts/update.sh b/scripts/update.sh
index ae3368cb86940cce396ce3bc25444b703f3c302f..157b189e9fe7c843aa93d692555241c463eb8a06 100755
--- a/scripts/update.sh
+++ b/scripts/update.sh
@@ -2,7 +2,10 @@
set -e
-. "$GLUONDIR"/scripts/modules.sh
+. scripts/modules.sh
+
+
+GLUONDIR="$(pwd)"
for module in $GLUON_MODULES; do
echo "--- Updating module '$module' ---"
diff --git a/targets/ar71xx-generic b/targets/ar71xx-generic
new file mode 100644
index 0000000000000000000000000000000000000000..fa544c91fb65f6b0097a256407f4ff41f39bd11b
--- /dev/null
+++ b/targets/ar71xx-generic
@@ -0,0 +1,241 @@
+ATH10K_PACKAGES=
+
+if [ "$GLUON_ATH10K_MESH" = '11s' ]; then
+ ATH10K_PACKAGES='-kmod-ath10k kmod-ath10k-ct'
+fi
+if [ "$GLUON_ATH10K_MESH" = 'ibss' ]; then
+ ATH10K_PACKAGES='-kmod-ath10k kmod-ath10k-ct -ath10k-firmware-qca988x ath10k-firmware-qca988x-ct'
+fi
+
+
+# 8devices
+
+device 8devices-carambola2-board carambola2
+factory
+
+
+# ALFA NETWORK
+
+device alfa-network-hornet-ub hornet-ub HORNETUB
+alias alfa-network-ap121
+alias alfa-network-ap121u
+
+device alfa-network-tube2h tube2h-8M TUBE2H8M
+device alfa-network-n2-n5 alfa-nx ALFANX
+
+
+# Allnet
+
+device allnet-all0315n all0315n ALL0315N
+factory
+
+
+# Buffalo
+
+device buffalo-wzr-hp-g300nh wzr-hp-g300nh WZRHPG300NH
+device buffalo-wzr-hp-g300nh2 wzr-hp-g300nh2 WZRHPG300NH2
+device buffalo-wzr-hp-g450h wzr-hp-g450h WZRHPG450H
+
+
+device buffalo-wzr-hp-ag300h wzr-hp-ag300h WZRHPAG300H
+sysupgrade
+device buffalo-wzr-600dhp wzr-600dhp WZR600DHP
+sysupgrade
+sysupgrade_image buffalo-wzr-hp-ag300h-wzr-600dhp wzr-hp-ag300h-squashfs-sysupgrade .bin
+
+
+# D-Link
+
+device d-link-dir-505-rev-a1 dir-505-a1 DIR505A1
+alias d-link-dir-505-rev-a2
+
+device d-link-dir-825-rev-b1 dir-825-b1 DIR825B1
+
+
+# GL Innovations
+
+device gl-inet-6408a-v1 gl-inet-6408A-v1
+device gl-inet-6416a-v1 gl-inet-6416A-v1
+
+device gl-ar150 gl-ar150
+factory
+
+
+# Linksys by Cisco
+
+device linksys-wrt160nl wrt160nl WRT160NL
+
+
+# Meraki
+
+# BROKEN: MAC address uniqueness issues
+if [ "$BROKEN" ]; then
+device meraki-mr12 mr12
+alias meraki-mr62
+factory
+
+device meraki-mr16 mr16
+alias meraki-mr66
+factory
+fi
+
+
+# Netgear
+
+device netgear-wndr3700 wndr3700
+factory .img
+
+device netgear-wndr3700v2 wndr3700v2
+factory .img
+
+device netgear-wndr3800 wndr3800
+factory .img
+
+device netgear-wndrmacv2 wndrmacv2
+factory .img
+
+if [ "$BROKEN" ]; then
+device netgear-wndrmac wndrmac # BROKEN: untested
+factory .img
+
+device netgear-wnr2200 wnr2200 WNR2200 # BROKEN: untested
+factory .img
+fi
+
+
+# Onion
+
+device onion-omega onion-omega
+
+
+# OpenMesh
+
+if [ "$ATH10K_PACKAGES" ]; then
+device openmesh-mr1750 mr1750 MR1750
+alias openmesh-mr1750v2
+packages $ATH10K_PACKAGES
+fi
+
+device openmesh-mr600 mr600 MR600
+alias openmesh-mr600v2
+
+device openmesh-mr900 mr900 MR900
+alias openmesh-mr900v2
+
+device openmesh-om2p om2p OM2P
+alias openmesh-om2pv2
+alias openmesh-om2p-hs
+alias openmesh-om2p-hsv2
+alias openmesh-om2p-hsv3
+alias openmesh-om2p-lc
+
+device openmesh-om5p om5p OM5P
+alias openmesh-om5p-an
+
+if [ "$ATH10K_PACKAGES" ]; then
+device openmesh-om5p-ac om5pac OM5PAC
+alias openmesh-om5p-acv2
+packages $ATH10K_PACKAGES
+fi
+
+
+# TP-Link
+
+device tp-link-cpe210-v1.0 cpe210-220
+alias tp-link-cpe210-v1.1
+alias tp-link-cpe220-v1.0
+alias tp-link-cpe220-v1.1
+
+device tp-link-cpe510-v1.0 cpe510-520
+alias tp-link-cpe510-v1.1
+alias tp-link-cpe520-v1.0
+alias tp-link-cpe520-v1.1
+
+device tp-link-wbs210-v1.20 wbs210
+device tp-link-wbs510-v1.20 wbs510
+
+device tp-link-tl-wr710n-v1 tl-wr710n-v1
+device tp-link-tl-wr710n-v2.1 tl-wr710n-v2.1
+
+device tp-link-tl-wr842n-nd-v1 tl-wr842n-v1
+device tp-link-tl-wr842n-nd-v2 tl-wr842n-v2
+device tp-link-tl-wr842n-nd-v3 tl-wr842n-v3
+
+device tp-link-tl-wr1043n-nd-v1 tl-wr1043nd-v1
+device tp-link-tl-wr1043n-nd-v2 tl-wr1043nd-v2
+device tp-link-tl-wr1043n-nd-v3 tl-wr1043nd-v3
+device tp-link-tl-wr1043n-nd-v4 tl-wr1043nd-v4
+
+device tp-link-tl-wdr3500-v1 tl-wdr3500-v1
+device tp-link-tl-wdr3600-v1 tl-wdr3600-v1
+device tp-link-tl-wdr4300-v1 tl-wdr4300-v1
+
+device tp-link-tl-wr2543n-nd-v1 tl-wr2543-v1
+
+if [ "$ATH10K_PACKAGES" ]; then
+device tp-link-archer-c5-v1 archer-c5-v1
+packages $ATH10K_PACKAGES
+
+device tp-link-archer-c7-v2 archer-c7-v2
+packages $ATH10K_PACKAGES
+factory -squashfs-factory${GLUON_REGION:+-${GLUON_REGION}} .bin
+fi
+
+
+# Ubiquiti
+
+device ubiquiti-airgateway ubnt-air-gateway
+device ubiquiti-airrouter ubnt-airrouter
+
+device ubiquiti-bullet-m ubnt-bullet-m
+alias ubiquiti-nanostation-loco-m2
+alias ubiquiti-nanostation-loco-m5
+alias ubiquiti-rocket-m2
+alias ubiquiti-rocket-m5
+alias ubiquiti-bullet-m2
+alias ubiquiti-bullet-m5
+alias ubiquiti-picostation-m2
+
+device ubiquiti-nanostation-m ubnt-nano-m
+alias ubiquiti-nanostation-m2
+alias ubiquiti-nanostation-m5
+
+device ubiquiti-loco-m-xw ubnt-loco-m-xw
+alias ubiquiti-nanostation-loco-m2-xw
+alias ubiquiti-nanostation-loco-m5-xw
+
+device ubiquiti-nanostation-m-xw ubnt-nano-m-xw
+alias ubiquiti-nanostation-m2-xw
+alias ubiquiti-nanostation-m5-xw
+
+device ubiquiti-rocket-m-xw ubnt-rocket-m-xw
+alias ubiquiti-rocket-m2-xw
+alias ubiquiti-rocket-m5-xw
+
+device ubiquiti-unifi ubnt-unifi
+alias ubiquiti-unifi-ap
+alias ubiquiti-unifi-ap-lr
+
+device ubiquiti-unifi-ap-pro ubnt-uap-pro
+device ubiquiti-unifiap-outdoor ubnt-unifi-outdoor
+device ubiquiti-unifiap-outdoor+ ubnt-unifi-outdoor-plus
+
+if [ "$BROKEN" ]; then
+device ubiquiti-ls-sr71 ubnt-ls-sr71 # BROKEN: Untested
+fi
+
+if [ "$ATH10K_PACKAGES" ]; then
+device ubiquiti-unifi-ac-lite ubnt-unifiac-lite
+packages $ATH10K_PACKAGES
+factory
+
+device ubiquiti-unifi-ac-pro ubnt-unifiac-pro
+packages $ATH10K_PACKAGES
+factory
+fi
+
+
+# Western Digital
+
+device wd-my-net-n600 mynet-n600
+device wd-my-net-n750 mynet-n750
diff --git a/targets/ar71xx-generic/config b/targets/ar71xx-generic/config
deleted file mode 100644
index acf4627a594db37d956e83eb249576c02b6e3b0e..0000000000000000000000000000000000000000
--- a/targets/ar71xx-generic/config
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PACKAGE_uboot-ar71xx-nbg460n_550n_550nh is not set
diff --git a/targets/ar71xx-generic/profiles.mk b/targets/ar71xx-generic/profiles.mk
deleted file mode 100644
index c76c8a8bb796cfd1007e54740fdb2a6257871d95..0000000000000000000000000000000000000000
--- a/targets/ar71xx-generic/profiles.mk
+++ /dev/null
@@ -1,431 +0,0 @@
-# List of hardware profiles
-
-ATH10K_FIRMWARE :=
-
-ifeq ($(GLUON_ATH10K_MESH),11s)
-ATH10K_FIRMWARE := ath10k-firmware-qca988x-11s
-endif
-ifeq ($(GLUON_ATH10K_MESH),ibss)
-ATH10K_FIRMWARE := ath10k-firmware-qca988x-ct
-endif
-
-## TP-Link
-
-# CPE210/220/510/520; WBS210/510
-$(eval $(call GluonProfile,CPE510,rssileds))
-
-$(eval $(call GluonModel,CPE510,cpe210-220,tp-link-cpe210-v1.0))
-$(eval $(call GluonModelAlias,CPE510,tp-link-cpe210-v1.0,tp-link-cpe210-v1.1))
-$(eval $(call GluonModelAlias,CPE510,tp-link-cpe210-v1.0,tp-link-cpe220-v1.0))
-$(eval $(call GluonModelAlias,CPE510,tp-link-cpe210-v1.0,tp-link-cpe220-v1.1))
-
-$(eval $(call GluonModel,CPE510,cpe510-520,tp-link-cpe510-v1.0))
-$(eval $(call GluonModelAlias,CPE510,tp-link-cpe510-v1.0,tp-link-cpe510-v1.1))
-$(eval $(call GluonModelAlias,CPE510,tp-link-cpe510-v1.0,tp-link-cpe520-v1.0))
-$(eval $(call GluonModelAlias,CPE510,tp-link-cpe510-v1.0,tp-link-cpe520-v1.1))
-
-$(eval $(call GluonModel,CPE510,wbs210,tp-link-wbs210-v1.20))
-$(eval $(call GluonModel,CPE510,wbs510,tp-link-wbs510-v1.20))
-
-# TL-WA701N/ND v1, v2
-$(eval $(call GluonProfile,TLWA701))
-$(eval $(call GluonModel,TLWA701,tl-wa701n-v1,tp-link-tl-wa701n-nd-v1))
-$(eval $(call GluonModel,TLWA701,tl-wa701nd-v2,tp-link-tl-wa701n-nd-v2))
-
-# TL-WA7510 v1
-$(eval $(call GluonProfile,TLWA7510))
-$(eval $(call GluonModel,TLWA7510,tl-wa7510n,tp-link-tl-wa7510n-v1))
-
-# TL-WR703N v1
-$(eval $(call GluonProfile,TLWR703))
-$(eval $(call GluonModel,TLWR703,tl-wr703n-v1,tp-link-tl-wr703n-v1))
-
-# TL-WR710N v1, v2, v2.1
-$(eval $(call GluonProfile,TLWR710))
-$(eval $(call GluonModel,TLWR710,tl-wr710n-v1,tp-link-tl-wr710n-v1))
-$(eval $(call GluonModel,TLWR710,tl-wr710n-v2,tp-link-tl-wr710n-v2))
-$(eval $(call GluonModel,TLWR710,tl-wr710n-v2.1,tp-link-tl-wr710n-v2.1))
-
-# TL-WR740N v1, v3, v4, v5
-$(eval $(call GluonProfile,TLWR740))
-$(eval $(call GluonModel,TLWR740,tl-wr740n-v1,tp-link-tl-wr740n-nd-v1))
-$(eval $(call GluonModel,TLWR740,tl-wr740n-v3,tp-link-tl-wr740n-nd-v3))
-$(eval $(call GluonModel,TLWR740,tl-wr740n-v4,tp-link-tl-wr740n-nd-v4))
-$(eval $(call GluonModel,TLWR740,tl-wr740n-v5,tp-link-tl-wr740n-nd-v5))
-
-# TL-WR741N/ND v1, v2, v4, v5
-$(eval $(call GluonProfile,TLWR741))
-$(eval $(call GluonModel,TLWR741,tl-wr741nd-v1,tp-link-tl-wr741n-nd-v1))
-$(eval $(call GluonModel,TLWR741,tl-wr741nd-v2,tp-link-tl-wr741n-nd-v2))
-$(eval $(call GluonModel,TLWR741,tl-wr741nd-v4,tp-link-tl-wr741n-nd-v4))
-$(eval $(call GluonModel,TLWR741,tl-wr741nd-v5,tp-link-tl-wr741n-nd-v5))
-
-# TL-WR743N/ND v1, v1.1, v2
-$(eval $(call GluonProfile,TLWR743))
-$(eval $(call GluonModel,TLWR743,tl-wr743nd-v1,tp-link-tl-wr743n-nd-v1))
-$(eval $(call GluonModel,TLWR743,tl-wr743nd-v2,tp-link-tl-wr743n-nd-v2))
-
-# TL-WR801N/ND v1, v2, v3
-$(eval $(call GluonProfile,TLWA801))
-$(eval $(call GluonModel,TLWA801,tl-wa801nd-v1,tp-link-tl-wa801n-nd-v1))
-$(eval $(call GluonModel,TLWA801,tl-wa801nd-v2,tp-link-tl-wa801n-nd-v2))
-$(eval $(call GluonModel,TLWA801,tl-wa801nd-v3,tp-link-tl-wa801n-nd-v3))
-
-# TL-WR841N/ND v3, v5, v7, v8, v9, v10
-$(eval $(call GluonProfile,TLWR841))
-$(eval $(call GluonModel,TLWR841,tl-wr841nd-v3,tp-link-tl-wr841n-nd-v3))
-$(eval $(call GluonModel,TLWR841,tl-wr841nd-v5,tp-link-tl-wr841n-nd-v5))
-$(eval $(call GluonModel,TLWR841,tl-wr841nd-v7,tp-link-tl-wr841n-nd-v7))
-$(eval $(call GluonModel,TLWR841,tl-wr841n-v8,tp-link-tl-wr841n-nd-v8))
-$(eval $(call GluonModel,TLWR841,tl-wr841n-v9,tp-link-tl-wr841n-nd-v9))
-$(eval $(call GluonModel,TLWR841,tl-wr841n-v10,tp-link-tl-wr841n-nd-v10))
-
-# TL-WR841N/ND v11
-$(eval $(call GluonProfile,TLWR841_REGION,,TLWR841))
-$(eval $(call GluonModel,TLWR841_REGION,tl-wr841n-v11,tp-link-tl-wr841n-nd-v11))
-$(eval $(call GluonProfileFactorySuffix,TLWR841_REGION,-squashfs-factory$(if $(GLUON_REGION),-$(GLUON_REGION)),.bin))
-
-# TL-WR842N/ND v1, v2
-$(eval $(call GluonProfile,TLWR842))
-$(eval $(call GluonModel,TLWR842,tl-wr842n-v1,tp-link-tl-wr842n-nd-v1))
-$(eval $(call GluonModel,TLWR842,tl-wr842n-v2,tp-link-tl-wr842n-nd-v2))
-$(eval $(call GluonModel,TLWR842,tl-wr842n-v3,tp-link-tl-wr842n-nd-v3))
-
-# TL-WR843N/ND v1
-$(eval $(call GluonProfile,TLWR843))
-$(eval $(call GluonModel,TLWR843,tl-wr843nd-v1,tp-link-tl-wr843n-nd-v1))
-
-# TL-WR941N/ND v2, v3, v4, v5, v6; TL-WR940N/ND v1, v2, v3, v4
-$(eval $(call GluonProfile,TLWR941))
-$(eval $(call GluonModel,TLWR941,tl-wr941nd-v2,tp-link-tl-wr941n-nd-v2))
-$(eval $(call GluonModel,TLWR941,tl-wr941nd-v3,tp-link-tl-wr941n-nd-v3))
-$(eval $(call GluonModel,TLWR941,tl-wr941nd-v4,tp-link-tl-wr941n-nd-v4))
-$(eval $(call GluonModel,TLWR941,tl-wr941nd-v5,tp-link-tl-wr941n-nd-v5))
-$(eval $(call GluonModel,TLWR941,tl-wr941nd-v6,tp-link-tl-wr941n-nd-v6))
-
-$(eval $(call GluonModelAlias,TLWR941,tp-link-tl-wr941n-nd-v4,tp-link-tl-wr940n-nd-v1))
-$(eval $(call GluonModelAlias,TLWR941,tp-link-tl-wr941n-nd-v5,tp-link-tl-wr940n-nd-v2))
-$(eval $(call GluonModelAlias,TLWR941,tp-link-tl-wr941n-nd-v6,tp-link-tl-wr940n-nd-v3))
-
-$(eval $(call GluonProfile,TLWR940_REGION,,TLWR941))
-$(eval $(call GluonModel,TLWR940_REGION,tl-wr940n-v4,tp-link-tl-wr940n-v4))
-$(eval $(call GluonProfileFactorySuffix,TLWR940_REGION,-squashfs-factory$(if $(GLUON_REGION),-$(GLUON_REGION)),.bin))
-
-# TL-WR1043N/ND v1, v2, v3
-$(eval $(call GluonProfile,TLWR1043))
-$(eval $(call GluonModel,TLWR1043,tl-wr1043nd-v1,tp-link-tl-wr1043n-nd-v1))
-$(eval $(call GluonModel,TLWR1043,tl-wr1043nd-v2,tp-link-tl-wr1043n-nd-v2))
-$(eval $(call GluonModel,TLWR1043,tl-wr1043nd-v3,tp-link-tl-wr1043n-nd-v3))
-$(eval $(call GluonModel,TLWR1043,tl-wr1043nd-v4,tp-link-tl-wr1043n-nd-v4))
-
-# TL-WDR3500/3600/4300 v1
-$(eval $(call GluonProfile,TLWDR4300))
-$(eval $(call GluonModel,TLWDR4300,tl-wdr3500-v1,tp-link-tl-wdr3500-v1))
-$(eval $(call GluonModel,TLWDR4300,tl-wdr3600-v1,tp-link-tl-wdr3600-v1))
-$(eval $(call GluonModel,TLWDR4300,tl-wdr4300-v1,tp-link-tl-wdr4300-v1))
-
-# TL-WA750RE v1
-$(eval $(call GluonProfile,TLWA750))
-$(eval $(call GluonModel,TLWA750,tl-wa750re-v1,tp-link-tl-wa750re-v1))
-
-# TL-WA830RE v1, v2
-$(eval $(call GluonProfile,TLWA830))
-$(eval $(call GluonModel,TLWA830,tl-wa830re-v1,tp-link-tl-wa830re-v1))
-$(eval $(call GluonModel,TLWA830,tl-wa830re-v2,tp-link-tl-wa830re-v2))
-
-# TL-WA850RE v1
-$(eval $(call GluonProfile,TLWA850))
-$(eval $(call GluonModel,TLWA850,tl-wa850re-v1,tp-link-tl-wa850re-v1))
-
-# TL-WA860RE v1
-$(eval $(call GluonProfile,TLWA860))
-$(eval $(call GluonModel,TLWA860,tl-wa860re-v1,tp-link-tl-wa860re-v1))
-
-# TL-WA901N/ND v1, v2, v3, v4
-$(eval $(call GluonProfile,TLWA901))
-$(eval $(call GluonModel,TLWA901,tl-wa901nd-v1,tp-link-tl-wa901n-nd-v1))
-$(eval $(call GluonModel,TLWA901,tl-wa901nd-v2,tp-link-tl-wa901n-nd-v2))
-$(eval $(call GluonModel,TLWA901,tl-wa901nd-v3,tp-link-tl-wa901n-nd-v3))
-$(eval $(call GluonModel,TLWA901,tl-wa901nd-v4,tp-link-tl-wa901n-nd-v4))
-
-# TL-MR13U v1
-$(eval $(call GluonProfile,TLMR13U))
-$(eval $(call GluonModel,TLMR13U,tl-mr13u-v1,tp-link-tl-mr13u-v1))
-
-# TL-MR3020 v1
-$(eval $(call GluonProfile,TLMR3020))
-$(eval $(call GluonModel,TLMR3020,tl-mr3020-v1,tp-link-tl-mr3020-v1))
-
-# TL-MR3040 v1, v2
-$(eval $(call GluonProfile,TLMR3040))
-$(eval $(call GluonModel,TLMR3040,tl-mr3040-v1,tp-link-tl-mr3040-v1))
-$(eval $(call GluonModel,TLMR3040,tl-mr3040-v2,tp-link-tl-mr3040-v2))
-
-# TL-MR3220 v1, v2
-$(eval $(call GluonProfile,TLMR3220))
-$(eval $(call GluonModel,TLMR3220,tl-mr3220-v1,tp-link-tl-mr3220-v1))
-$(eval $(call GluonModel,TLMR3220,tl-mr3220-v2,tp-link-tl-mr3220-v2))
-
-# TL-MR3420 v1, v2
-$(eval $(call GluonProfile,TLMR3420))
-$(eval $(call GluonModel,TLMR3420,tl-mr3420-v1,tp-link-tl-mr3420-v1))
-$(eval $(call GluonModel,TLMR3420,tl-mr3420-v2,tp-link-tl-mr3420-v2))
-
-# TL-WR2543N/ND v1
-$(eval $(call GluonProfile,TLWR2543))
-$(eval $(call GluonModel,TLWR2543,tl-wr2543-v1,tp-link-tl-wr2543n-nd-v1))
-
-ifneq ($(ATH10K_FIRMWARE),)
-# Archer C5 v1
-$(eval $(call GluonProfile,ARCHERC5,kmod-ath10k-ct $(ATH10K_FIRMWARE),ARCHERC7))
-$(eval $(call GluonModel,ARCHERC5,archer-c5,tp-link-archer-c5-v1))
-
-# Archer C7 v2
-$(eval $(call GluonProfile,ARCHERC7,kmod-ath10k-ct $(ATH10K_FIRMWARE)))
-$(eval $(call GluonProfileFactorySuffix,ARCHERC7,-squashfs-factory$(if $(GLUON_REGION),-$(GLUON_REGION)),.bin))
-$(eval $(call GluonModel,ARCHERC7,archer-c7-v2,tp-link-archer-c7-v2))
-endif
-
-## Ubiquiti (almost everything)
-$(eval $(call GluonProfile,UBNT))
-$(eval $(call GluonModel,UBNT,ubnt-air-gateway,ubiquiti-airgateway))
-$(eval $(call GluonModel,UBNT,ubnt-airrouter,ubiquiti-airrouter))
-
-$(eval $(call GluonModel,UBNT,ubnt-bullet-m,ubiquiti-bullet-m))
-$(eval $(call GluonModelAlias,UBNT,ubiquiti-bullet-m,ubiquiti-nanostation-loco-m2))
-$(eval $(call GluonModelAlias,UBNT,ubiquiti-bullet-m,ubiquiti-nanostation-loco-m5))
-$(eval $(call GluonModelAlias,UBNT,ubiquiti-bullet-m,ubiquiti-rocket-m2))
-$(eval $(call GluonModelAlias,UBNT,ubiquiti-bullet-m,ubiquiti-rocket-m5))
-$(eval $(call GluonModelAlias,UBNT,ubiquiti-bullet-m,ubiquiti-bullet-m2))
-$(eval $(call GluonModelAlias,UBNT,ubiquiti-bullet-m,ubiquiti-bullet-m5))
-$(eval $(call GluonModelAlias,UBNT,ubiquiti-bullet-m,ubiquiti-picostation-m2))
-
-$(eval $(call GluonModel,UBNT,ubnt-nano-m,ubiquiti-nanostation-m))
-$(eval $(call GluonModelAlias,UBNT,ubiquiti-nanostation-m,ubiquiti-nanostation-m2))
-$(eval $(call GluonModelAlias,UBNT,ubiquiti-nanostation-m,ubiquiti-nanostation-m5))
-
-$(eval $(call GluonModel,UBNT,ubnt-loco-m-xw,ubiquiti-loco-m-xw))
-$(eval $(call GluonModelAlias,UBNT,ubiquiti-loco-m-xw,ubiquiti-nanostation-loco-m2-xw))
-$(eval $(call GluonModelAlias,UBNT,ubiquiti-loco-m-xw,ubiquiti-nanostation-loco-m5-xw))
-
-$(eval $(call GluonModel,UBNT,ubnt-nano-m-xw,ubiquiti-nanostation-m-xw))
-$(eval $(call GluonModelAlias,UBNT,ubiquiti-nanostation-m-xw,ubiquiti-nanostation-m2-xw))
-$(eval $(call GluonModelAlias,UBNT,ubiquiti-nanostation-m-xw,ubiquiti-nanostation-m5-xw))
-
-$(eval $(call GluonModel,UBNT,ubnt-rocket-m-xw,ubiquiti-rocket-m-xw))
-$(eval $(call GluonModelAlias,UBNT,ubiquiti-rocket-m-xw,ubiquiti-rocket-m2-xw))
-$(eval $(call GluonModelAlias,UBNT,ubiquiti-rocket-m-xw,ubiquiti-rocket-m5-xw))
-
-$(eval $(call GluonModel,UBNT,ubnt-unifi,ubiquiti-unifi))
-$(eval $(call GluonModelAlias,UBNT,ubiquiti-unifi,ubiquiti-unifi-ap))
-$(eval $(call GluonModelAlias,UBNT,ubiquiti-unifi,ubiquiti-unifi-ap-lr))
-
-$(eval $(call GluonModel,UBNT,ubnt-uap-pro,ubiquiti-unifi-ap-pro))
-$(eval $(call GluonModel,UBNT,ubnt-unifi-outdoor,ubiquiti-unifiap-outdoor))
-$(eval $(call GluonModel,UBNT,ubnt-unifi-outdoor-plus,ubiquiti-unifiap-outdoor+))
-
-ifneq ($(BROKEN),)
-$(eval $(call GluonModel,UBNT,ubnt-ls-sr71,ubiquiti-ls-sr71)) # BROKEN: Untested
-endif
-
-# Ubiquiti (ath10k)
-ifneq ($(ATH10K_FIRMWARE),)
-$(eval $(call GluonProfile,UBNTUNIFIACLITE,kmod-ath10k-ct $(ATH10K_FIRMWARE)))
-$(eval $(call GluonProfileFactorySuffix,UBNTUNIFIACLITE))
-$(eval $(call GluonModel,UBNTUNIFIACLITE,ubnt-unifiac-lite,ubiquiti-unifi-ac-lite))
-
-$(eval $(call GluonProfile,UBNTUNIFIACPRO,kmod-ath10k-ct $(ATH10K_FIRMWARE)))
-$(eval $(call GluonProfileFactorySuffix,UBNTUNIFIACPRO))
-$(eval $(call GluonModel,UBNTUNIFIACPRO,ubnt-unifiac-pro,ubiquiti-unifi-ac-pro))
-endif
-
-## D-Link
-
-# D-Link DIR-505 rev. A1/A2
-
-$(eval $(call GluonProfile,DIR505A1))
-$(eval $(call GluonModel,DIR505A1,dir-505-a1,d-link-dir-505-rev-a1))
-$(eval $(call GluonModelAlias,DIR505A1,d-link-dir-505-rev-a1,d-link-dir-505-rev-a2))
-
-# D-Link DIR-615 rev. C1
-$(eval $(call GluonProfile,DIR615C1))
-$(eval $(call GluonModel,DIR615C1,dir-615-c1,d-link-dir-615-rev-c1))
-
-# D-Link DIR-825 rev. B1
-$(eval $(call GluonProfile,DIR825B1))
-$(eval $(call GluonModel,DIR825B1,dir-825-b1,d-link-dir-825-rev-b1))
-
-
-## Linksys by Cisco
-
-# WRT160NL
-$(eval $(call GluonProfile,WRT160NL))
-$(eval $(call GluonModel,WRT160NL,wrt160nl,linksys-wrt160nl))
-
-## Buffalo
-
-# WZR-HP-G450H
-$(eval $(call GluonProfile,WZRHPG450H))
-$(eval $(call GluonModel,WZRHPG450H,wzr-hp-g450h,buffalo-wzr-hp-g450h))
-
-# WZR-HP-G300NH
-$(eval $(call GluonProfile,WZRHPG300NH))
-$(eval $(call GluonModel,WZRHPG300NH,wzr-hp-g300nh,buffalo-wzr-hp-g300nh))
-
-# WZR-HP-G300NH2
-$(eval $(call GluonProfile,WZRHPG300NH2))
-$(eval $(call GluonModel,WZRHPG300NH2,wzr-hp-g300nh2,buffalo-wzr-hp-g300nh2))
-
-# WZR-HP-AG300H (factory)
-$(eval $(call GluonProfile,WZRHPAG300H))
-$(eval $(call GluonProfileSysupgradeSuffix,WZRHPAG300H))
-$(eval $(call GluonModel,WZRHPAG300H,wzr-hp-ag300h,buffalo-wzr-hp-ag300h))
-
-# WZR-600DHP (factory)
-$(eval $(call GluonProfile,WZR600DHP))
-$(eval $(call GluonProfileSysupgradeSuffix,WZR600DHP))
-$(eval $(call GluonModel,WZR600DHP,wzr-600dhp,buffalo-wzr-600dhp))
-
-# WZR-HP-AG300H/WZR-600DHP (sysupgrade)
-$(eval $(call GluonProfile,WZRHPAG300H_WZR600DHP,,WZRHPAG300H))
-$(eval $(call GluonProfileFactorySuffix,WZRHPAG300H_WZR600DHP))
-$(eval $(call GluonModel,WZRHPAG300H_WZR600DHP,wzr-hp-ag300h,buffalo-wzr-hp-ag300h-wzr-600dhp))
-
-# WHR-HP-G300N
-#$(eval $(call GluonProfile,WHRHPG300N))
-#$(eval $(call GluonModel,WHRHPG300N,whr-hp-g300n,buffalo-whr-hp-g300n))
-
-## Netgear
-
-# WNDR3700 (v1, v2) / WNDR3800 / WNDRMAC (v1, v2)
-$(eval $(call GluonProfile,WNDR3700))
-$(eval $(call GluonProfileFactorySuffix,WNDR3700,-squashfs-factory,.img))
-$(eval $(call GluonModel,WNDR3700,wndr3700,netgear-wndr3700))
-$(eval $(call GluonModel,WNDR3700,wndr3700v2,netgear-wndr3700v2))
-$(eval $(call GluonModel,WNDR3700,wndr3800,netgear-wndr3800))
-ifneq ($(BROKEN),)
-$(eval $(call GluonModel,WNDR3700,wndrmac,netgear-wndrmac)) # BROKEN: untested
-endif
-$(eval $(call GluonModel,WNDR3700,wndrmacv2,netgear-wndrmacv2))
-
-ifneq ($(BROKEN),)
-# WNR2200
-$(eval $(call GluonProfile,WNR2200)) # BROKEN: untested
-$(eval $(call GluonModel,WNR2200,wnr2200,netgear-wnr2200))
-$(eval $(call GluonProfileFactorySuffix,WNR2200,.img))
-endif
-
-
-## Allnet
-
-# ALL0315N
-$(eval $(call GluonProfile,ALL0315N,uboot-envtools rssileds))
-$(eval $(call GluonProfileFactorySuffix,ALL0315N))
-$(eval $(call GluonModel,ALL0315N,all0315n,allnet-all0315n))
-
-## GL-iNet
-
-# GL-iNet 1.0
-$(eval $(call GluonProfile,GLINET))
-$(eval $(call GluonModel,GLINET,gl-inet-6408A-v1,gl-inet-6408a-v1))
-$(eval $(call GluonModel,GLINET,gl-inet-6416A-v1,gl-inet-6416a-v1))
-
-$(eval $(call GluonProfile,GL-AR150))
-$(eval $(call GluonModel,GL-AR150,gl-ar150,gl-ar150))
-$(eval $(call GluonProfileFactorySuffix,GL-AR150))
-
-## Western Digital
-
-# WD MyNet N600
-$(eval $(call GluonProfile,MYNETN600))
-$(eval $(call GluonModel,MYNETN600,mynet-n600,wd-my-net-n600))
-
-# WD MyNet N750
-$(eval $(call GluonProfile,MYNETN750))
-$(eval $(call GluonModel,MYNETN750,mynet-n750,wd-my-net-n750))
-
-## Onion
-
-# Omega
-$(eval $(call GluonProfile,OMEGA))
-$(eval $(call GluonModel,OMEGA,onion-omega,onion-omega))
-
-## OpenMesh
-
-ifneq ($(ATH10K_FIRMWARE),)
-# MR1750
-$(eval $(call GluonProfile,MR1750,om-watchdog uboot-envtools kmod-ath10k-ct $(ATH10K_FIRMWARE)))
-$(eval $(call GluonModel,MR1750,mr1750,openmesh-mr1750))
-$(eval $(call GluonModelAlias,MR1750,openmesh-mr1750,openmesh-mr1750v2))
-endif
-
-# MR600
-$(eval $(call GluonProfile,MR600,om-watchdog uboot-envtools))
-$(eval $(call GluonModel,MR600,mr600,openmesh-mr600))
-$(eval $(call GluonModelAlias,MR600,openmesh-mr600,openmesh-mr600v2))
-
-# MR900
-$(eval $(call GluonProfile,MR900,om-watchdog uboot-envtools))
-$(eval $(call GluonModel,MR900,mr900,openmesh-mr900))
-$(eval $(call GluonModelAlias,MR900,openmesh-mr900,openmesh-mr900v2))
-
-# OM2P
-$(eval $(call GluonProfile,OM2P,om-watchdog uboot-envtools))
-$(eval $(call GluonModel,OM2P,om2p,openmesh-om2p))
-$(eval $(call GluonModelAlias,OM2P,openmesh-om2p,openmesh-om2pv2))
-$(eval $(call GluonModelAlias,OM2P,openmesh-om2p,openmesh-om2p-hs))
-$(eval $(call GluonModelAlias,OM2P,openmesh-om2p,openmesh-om2p-hsv2))
-$(eval $(call GluonModelAlias,OM2P,openmesh-om2p,openmesh-om2p-hsv3))
-$(eval $(call GluonModelAlias,OM2P,openmesh-om2p,openmesh-om2p-lc))
-
-# OM5P
-$(eval $(call GluonProfile,OM5P,om-watchdog uboot-envtools))
-$(eval $(call GluonModel,OM5P,om5p,openmesh-om5p))
-$(eval $(call GluonModelAlias,OM5P,openmesh-om5p,openmesh-om5p-an))
-
-ifneq ($(ATH10K_FIRMWARE),)
-# OM5P-AC
-$(eval $(call GluonProfile,OM5PAC,om-watchdog uboot-envtools kmod-ath10k-ct $(ATH10K_FIRMWARE)))
-$(eval $(call GluonModel,OM5PAC,om5pac,openmesh-om5p-ac))
-$(eval $(call GluonModelAlias,OM5PAC,openmesh-om5p-ac,openmesh-om5p-acv2))
-endif
-
-## ALFA NETWORK
-
-# Hornet-UB
-$(eval $(call GluonProfile,HORNETUB))
-$(eval $(call GluonModel,HORNETUB,hornet-ub,alfa-network-hornet-ub))
-$(eval $(call GluonModelAlias,HORNETUB,alfa-network-hornet-ub,alfa-network-ap121))
-$(eval $(call GluonModelAlias,HORNETUB,alfa-network-hornet-ub,alfa-network-ap121u))
-
-# Tube2H
-$(eval $(call GluonProfile,TUBE2H))
-$(eval $(call GluonModel,TUBE2H,tube2h-8M,alfa-network-tube2h))
-
-# N2/N5
-$(eval $(call GluonProfile,ALFANX))
-$(eval $(call GluonModel,ALFANX,alfa-nx,alfa-network-n2-n5))
-
-## Meraki
-
-# BROKEN: MAC address uniqueness issues
-ifneq ($(BROKEN),)
-# Meraki MR12/MR62
-$(eval $(call GluonProfile,MR12,rssileds))
-$(eval $(call GluonProfileFactorySuffix,MR12))
-$(eval $(call GluonModel,MR12,mr12,meraki-mr12))
-$(eval $(call GluonModelAlias,MR12,meraki-mr12,meraki-mr62))
-
-# Meraki MR16/MR66
-$(eval $(call GluonProfile,MR16,rssileds))
-$(eval $(call GluonProfileFactorySuffix,MR16))
-$(eval $(call GluonModel,MR16,mr16,meraki-mr16))
-$(eval $(call GluonModelAlias,MR16,meraki-mr16,meraki-mr66))
-endif
-
-## 8devices
-
-# Carambola 2
-$(eval $(call GluonProfile,CARAMBOLA2))
-$(eval $(call GluonModel,CARAMBOLA2,carambola2,8devices-carambola2-board))
-$(eval $(call GluonProfileFactorySuffix,CARAMBOLA2))
diff --git a/targets/ar71xx-mikrotik b/targets/ar71xx-mikrotik
new file mode 100644
index 0000000000000000000000000000000000000000..fd857ac63e07e5f7736bc9aa32137e265c0d4b4d
--- /dev/null
+++ b/targets/ar71xx-mikrotik
@@ -0,0 +1,6 @@
+# Enable ath5k in addition to ath9k
+# ath5k cards are commonly used with Mikrotik hardware
+packages 'kmod-ath5k'
+
+factory_image mikrotik defaultnowifi -rootfs.tar.gz
+factory_image mikrotik -vmlinux-lzma.elf
diff --git a/targets/ar71xx-mikrotik/profiles.mk b/targets/ar71xx-mikrotik/profiles.mk
deleted file mode 100644
index 2dcc65fd23e58452f90372495076f321d060ea03..0000000000000000000000000000000000000000
--- a/targets/ar71xx-mikrotik/profiles.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-# List of hardware profiles
-
-## Mikrotik
-
-# Will contain both ath5k and ath9k
-# ath5k cards are commonly used with Mikrotik hardware
-$(eval $(call GluonProfile,DefaultNoWifi,kmod-ath5k))
-$(eval $(call GluonProfileFactorySuffix,DefaultNoWifi,,-rootfs.tar.gz,-vmlinux-lzma.elf))
-$(eval $(call GluonProfileSysupgradeSuffix,DefaultNoWifi))
-$(eval $(call GluonModel,DefaultNoWifi,DefaultNoWifi,mikrotik))
diff --git a/targets/ar71xx-nand b/targets/ar71xx-nand
new file mode 100644
index 0000000000000000000000000000000000000000..02961b3a8953c334f18e5002f443de0f84aa2f6a
--- /dev/null
+++ b/targets/ar71xx-nand
@@ -0,0 +1,7 @@
+factory -ubi-factory .img
+sysupgrade -squashfs-sysupgrade .tar
+
+# Netgear
+
+device netgear-wndr3700v4 wndr3700v4 WNDR3700V4
+device netgear-wndr4300 wndr4300 WNDR4300V1
diff --git a/targets/ar71xx-nand/profiles.mk b/targets/ar71xx-nand/profiles.mk
deleted file mode 100644
index 1fc253b0a0fcbf73cf3a015948280fbfa10d2147..0000000000000000000000000000000000000000
--- a/targets/ar71xx-nand/profiles.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-# List of hardware profiles
-
-## NETGEAR
-
-# WNDR3700 v4, WNDR4300 v1
-$(eval $(call GluonProfile,WNDR4300))
-$(eval $(call GluonProfileFactorySuffix,WNDR4300,-ubi-factory,.img))
-$(eval $(call GluonProfileSysupgradeSuffix,WNDR4300,-squashfs-sysupgrade,.tar))
-$(eval $(call GluonModel,WNDR4300,wndr3700v4,netgear-wndr3700v4))
-$(eval $(call GluonModel,WNDR4300,wndr4300,netgear-wndr4300))
diff --git a/targets/ar71xx-tiny b/targets/ar71xx-tiny
new file mode 100644
index 0000000000000000000000000000000000000000..58bec300ca8dcf51a68db987845f5d51e54ce4e9
--- /dev/null
+++ b/targets/ar71xx-tiny
@@ -0,0 +1,88 @@
+config '# CONFIG_SIGNED_PACKAGES is not set'
+config 'CONFIG_CLEAN_IPKG=y'
+packages '-opkg' '-uboot-envtools' '-kmod-usb-core' '-kmod-usb-ohci' '-kmod-usb2' '-kmod-usb-ledtrig-usbport'
+
+
+# D-Link
+
+device d-link-dir-615-rev-c1 dir-615-c1 DIR615C1
+
+
+# TP-Link
+
+device tp-link-tl-wa701n-nd-v1 tl-wa701nd-v1
+device tp-link-tl-wa7510n-v1 tl-wa7510n
+
+device tp-link-tl-wr703n-v1 tl-wr703n-v1
+
+device tp-link-tl-wr710n-v2 tl-wr710n-v2
+
+device tp-link-tl-wr740n-nd-v1 tl-wr740n-v1
+device tp-link-tl-wr740n-nd-v3 tl-wr740n-v3
+device tp-link-tl-wr740n-nd-v4 tl-wr740n-v4
+device tp-link-tl-wr740n-nd-v5 tl-wr740n-v5
+
+device tp-link-tl-wr741n-nd-v1 tl-wr741nd-v1
+device tp-link-tl-wr741n-nd-v2 tl-wr741nd-v2
+device tp-link-tl-wr741n-nd-v4 tl-wr741nd-v4
+device tp-link-tl-wr741n-nd-v5 tl-wr741nd-v5
+
+device tp-link-tl-wr743n-nd-v1 tl-wr743nd-v1
+device tp-link-tl-wr743n-nd-v2 tl-wr743nd-v2
+
+device tp-link-tl-wa801n-nd-v1 tl-wa801nd-v1
+device tp-link-tl-wa801n-nd-v2 tl-wa801nd-v2
+device tp-link-tl-wa801n-nd-v3 tl-wa801nd-v3
+
+device tp-link-tl-wr841n-nd-v3 tl-wr841-v3
+device tp-link-tl-wr841n-nd-v5 tl-wr841-v5
+device tp-link-tl-wr841n-nd-v7 tl-wr841-v7
+device tp-link-tl-wr841n-nd-v8 tl-wr841-v8
+device tp-link-tl-wr841n-nd-v9 tl-wr841-v9
+device tp-link-tl-wr841n-nd-v10 tl-wr841-v10
+device tp-link-tl-wr841n-nd-v11 tl-wr841-v11
+factory -squashfs-factory${GLUON_REGION:+-${GLUON_REGION}} .bin
+
+device tp-link-tl-wr843n-nd-v1 tl-wr843nd-v1
+
+device tp-link-tl-wr941n-nd-v2 tl-wr941nd-v2
+device tp-link-tl-wr941n-nd-v3 tl-wr941nd-v3
+
+device tp-link-tl-wr941n-nd-v4 tl-wr941nd-v4
+alias tp-link-tl-wr940n-nd-v1
+
+device tp-link-tl-wr941n-nd-v5 tl-wr941nd-v5
+alias tp-link-tl-wr940n-nd-v2
+
+device tp-link-tl-wr941n-nd-v6 tl-wr941nd-v6
+alias tp-link-tl-wr940n-nd-v3
+
+device tp-link-tl-wr940n-nd-v4 tl-wr940n-v4
+factory -squashfs-factory${GLUON_REGION:+-${GLUON_REGION}} .bin
+
+device tp-link-tl-wa750re-v1 tl-wa750re-v1
+
+device tp-link-tl-wa830re-v1 tl-wa830re-v1
+device tp-link-tl-wa830re-v2 tl-wa830re-v2
+
+device tp-link-tl-wa850re-v1 tl-wa850re-v1
+
+device tp-link-tl-wa860re-v1 tl-wa860re-v1
+
+device tp-link-tl-wa901n-nd-v1 tl-wa901nd-v1
+device tp-link-tl-wa901n-nd-v2 tl-wa901nd-v2
+device tp-link-tl-wa901n-nd-v3 tl-wa901nd-v3
+device tp-link-tl-wa901n-nd-v4 tl-wa901nd-v4
+
+device tp-link-tl-mr13u-v1 tl-mr13u-v1
+
+device tp-link-tl-mr3020-v1 tl-mr3020-v1
+
+device tp-link-tl-mr3040-v1 tl-mr3040-v1
+device tp-link-tl-mr3040-v2 tl-mr3040-v2
+
+device tp-link-tl-mr3220-v1 tl-mr3220-v1
+device tp-link-tl-mr3220-v2 tl-mr3220-v2
+
+device tp-link-tl-mr3420-v1 tl-mr3420-v1
+device tp-link-tl-mr3420-v2 tl-mr3420-v2
diff --git a/targets/brcm2708-bcm2708 b/targets/brcm2708-bcm2708
new file mode 100644
index 0000000000000000000000000000000000000000..41d0ba2de8825276957ce54db8d76759cf46445d
--- /dev/null
+++ b/targets/brcm2708-bcm2708
@@ -0,0 +1,3 @@
+device raspberry-pi rpi
+factory -ext4-sdcard .img.gz
+sysupgrade -ext4-sdcard .img.gz
diff --git a/targets/brcm2708-bcm2708/profiles.mk b/targets/brcm2708-bcm2708/profiles.mk
deleted file mode 100644
index 4261913ab2be641e5833b0eb327025c69fcb698a..0000000000000000000000000000000000000000
--- a/targets/brcm2708-bcm2708/profiles.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-$(eval $(call GluonProfile,RaspberryPi))
-$(eval $(call GluonProfileFactorySuffix,RaspberryPi,-vfat-ext4,.img.gz))
-$(eval $(call GluonProfileSysupgradeSuffix,RaspberryPi,-vfat-ext4,.img.gz))
-$(eval $(call GluonModel,RaspberryPi,sdcard,raspberry-pi))
diff --git a/targets/brcm2708-bcm2709 b/targets/brcm2708-bcm2709
new file mode 100644
index 0000000000000000000000000000000000000000..cb4adbb17fb33866b4ce3b2c8bf056ec548ef0b9
--- /dev/null
+++ b/targets/brcm2708-bcm2709
@@ -0,0 +1,3 @@
+device raspberry-pi-2 rpi-2
+factory -ext4-sdcard .img.gz
+sysupgrade -ext4-sdcard .img.gz
diff --git a/targets/brcm2708-bcm2709/profiles.mk b/targets/brcm2708-bcm2709/profiles.mk
deleted file mode 100644
index 74b172152fa5d8a962f5335c89f7c8a62d00c7d6..0000000000000000000000000000000000000000
--- a/targets/brcm2708-bcm2709/profiles.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-$(eval $(call GluonProfile,RaspberryPi2))
-$(eval $(call GluonProfileFactorySuffix,RaspberryPi2,-vfat-ext4,.img.gz))
-$(eval $(call GluonProfileSysupgradeSuffix,RaspberryPi2,-vfat-ext4,.img.gz))
-$(eval $(call GluonModel,RaspberryPi2,sdcard,raspberry-pi-2))
diff --git a/targets/generic b/targets/generic
new file mode 100644
index 0000000000000000000000000000000000000000..5c62cd6c40912fc4344f0ac9c59b0119dbe9d65c
--- /dev/null
+++ b/targets/generic
@@ -0,0 +1,14 @@
+config '# CONFIG_TARGET_ROOTFS_INITRAMFS is not set'
+
+config 'CONFIG_ALL_NONSHARED=y'
+
+config 'CONFIG_BUSYBOX_CUSTOM=y'
+config 'CONFIG_BUSYBOX_CONFIG_SHA512SUM=y'
+config '# CONFIG_BUSYBOX_CONFIG_FEATURE_PREFER_IPV4_ADDRESS is not set'
+
+config 'CONFIG_PACKAGE_ATH_DEBUG=y'
+
+config 'CONFIG_LUCI_SRCDIET=y'
+
+config 'CONFIG_TARGET_MULTI_PROFILE=y'
+config 'CONFIG_TARGET_PER_DEVICE_ROOTFS=y'
diff --git a/targets/mpc85xx-generic b/targets/mpc85xx-generic
new file mode 100644
index 0000000000000000000000000000000000000000..f2a1db4fa9e3117a0ee7a9dee5655676248bfe49
--- /dev/null
+++ b/targets/mpc85xx-generic
@@ -0,0 +1,5 @@
+# There is no per-device rootfs support on mpc85xx-generic yet,
+# so we can't use 'device'
+config 'CONFIG_TARGET_mpc85xx_generic_TLWDR4900=y'
+factory_image tp-link-tl-wdr4900-v1 tl-wdr4900-v1-squashfs-factory .bin
+sysupgrade_image tp-link-tl-wdr4900-v1 tl-wdr4900-v1-squashfs-sysupgrade .bin
diff --git a/targets/mpc85xx-generic/profiles.mk b/targets/mpc85xx-generic/profiles.mk
deleted file mode 100644
index 913f12b15bfb1123566b17f0705779d56fab023f..0000000000000000000000000000000000000000
--- a/targets/mpc85xx-generic/profiles.mk
+++ /dev/null
@@ -1,7 +0,0 @@
-# List of hardware profiles
-
-## TP-Link
-
-# TL-WDR4900 v1
-$(eval $(call GluonProfile,TLWDR4900))
-$(eval $(call GluonModel,TLWDR4900,tl-wdr4900-v1,tp-link-tl-wdr4900-v1))
diff --git a/targets/mvebu b/targets/mvebu
new file mode 100644
index 0000000000000000000000000000000000000000..ee4bbbeee9351b0208e01eb883fc68b257b45619
--- /dev/null
+++ b/targets/mvebu
@@ -0,0 +1,2 @@
+device linksys-wrt1200ac linksys-wrt1200ac
+factory .img
diff --git a/targets/mvebu/profiles.mk b/targets/mvebu/profiles.mk
deleted file mode 100644
index 6ac04fa0528c4c0e63a23961dae6f70d41124293..0000000000000000000000000000000000000000
--- a/targets/mvebu/profiles.mk
+++ /dev/null
@@ -1,10 +0,0 @@
-# List of hardware profiles
-
-# Linksys WRT1200AC
-$(eval $(call GluonProfile,Caiman,kmod-usb2 kmod-usb3 kmod-usb-storage kmod-i2c-core \
- kmod-i2c-mv64xxx kmod-ata-core kmod-ata-mvebu-ahci kmod-rtc-armada38x \
- kmod-thermal-armada kmod-gpio-button-hotplug kmod-hwmon-tmp421 kmod-leds-pca963x \
- kmod-ledtrig-usbdev kmod-mwlwifi swconfig uboot-envtools))
-$(eval $(call GluonProfileFactorySuffix,Caiman,-squashfs-factory,.img))
-$(eval $(call GluonProfileSysupgradeSuffix,Caiman,-squashfs-sysupgrade,.tar))
-$(eval $(call GluonModel,Caiman,armada-385-linksys-caiman,linksys-wrt1200ac))
diff --git a/targets/ramips-mt7621 b/targets/ramips-mt7621
new file mode 100644
index 0000000000000000000000000000000000000000..85371685b55e03c4f465ac586c4b72d7426b21c0
--- /dev/null
+++ b/targets/ramips-mt7621
@@ -0,0 +1,3 @@
+# D-Link
+
+device d-link-dir-860l-b1 dir-860l-b1
diff --git a/targets/ramips-mt7621/profiles.mk b/targets/ramips-mt7621/profiles.mk
deleted file mode 100644
index 6a7ea1e1612cbd1e53abe51217b118586186347b..0000000000000000000000000000000000000000
--- a/targets/ramips-mt7621/profiles.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-# List of hardware profiles
-
-$(eval $(call GluonProfile,Default))
-$(eval $(call GluonModel,Default,dir-860l-b1,d-link-dir-860l-b1))
diff --git a/targets/ramips-rt305x b/targets/ramips-rt305x
new file mode 100644
index 0000000000000000000000000000000000000000..23b6529adf36525dc6a7295d07115f41d490e93c
--- /dev/null
+++ b/targets/ramips-rt305x
@@ -0,0 +1,7 @@
+# VoCore
+
+device vocore-8M vocore-8M
+factory
+
+device vocore-16M vocore-16M
+factory
diff --git a/targets/ramips-rt305x/profiles.mk b/targets/ramips-rt305x/profiles.mk
deleted file mode 100644
index 4aee5eae9f26ccfac8d0e6cb13830e4a0c485c5c..0000000000000000000000000000000000000000
--- a/targets/ramips-rt305x/profiles.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-# List of hardware profiles
-
-# VoCore
-$(eval $(call GluonProfile,VOCORE))
-$(eval $(call GluonProfileFactorySuffix,VOCORE))
-$(eval $(call GluonModel,VOCORE,vocore,vocore))
diff --git a/targets/sunxi b/targets/sunxi
new file mode 100644
index 0000000000000000000000000000000000000000..0152f0de05535addcc958ff328ea21cab1322371
--- /dev/null
+++ b/targets/sunxi
@@ -0,0 +1,9 @@
+factory -ext4-sdcard .img.gz
+sysupgrade -ext4-sdcard .img.gz
+
+
+device lemaker-banana-pi sun7i-a20-bananapi
+device lemaker-banana-pro sun7i-a20-bananapro
+
+device lamobo-r1 sun7i-a20-lamobo-r1
+packages '-wpad-mini' # clashes with hostapd-mini
diff --git a/targets/sunxi/profiles.mk b/targets/sunxi/profiles.mk
deleted file mode 100644
index c1cb451504d9ca8265c7a71375c8aa17027f0b57..0000000000000000000000000000000000000000
--- a/targets/sunxi/profiles.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-#Banana Pi/M1
-$(eval $(call GluonProfile,Bananapi,uboot-sunxi-Bananapi kmod-rtc-sunxi))
-$(eval $(call GluonProfileFactorySuffix,Bananapi,-sdcard-vfat-ext4,.img.gz))
-$(eval $(call GluonProfileSysupgradeSuffix,Bananapi))
-$(eval $(call GluonModel,Bananapi,Bananapi,lemaker-banana-pi))
-
-#BananaPi R1 / Lamobo R1
-$(eval $(call GluonProfile,Lamobo_R1,uboot-sunxi-Lamobo_R1 kmod-ata-sunxi kmod-rtl8192cu kmod-rtc-sunxi swconfig))
-$(eval $(call GluonProfileFactorySuffix,Lamobo_R1,-sdcard-vfat-ext4,.img.gz))
-$(eval $(call GluonProfileSysupgradeSuffix,Lamobo_R1))
-$(eval $(call GluonModel,Lamobo_R1,Lamobo_R1,lemaker-lamobo-r1))
-
-# Banana Pro
-$(eval $(call GluonProfile,Bananapro,uboot-sunxi-Bananapro kmod-rtc-sunxi kmod-brcmfmac))
-$(eval $(call GluonProfileFactorySuffix,Bananapro,-sdcard-vfat-ext4,.img.gz))
-$(eval $(call GluonProfileSysupgradeSuffix,Bananapro))
-$(eval $(call GluonModel,Bananapro,Bananapro,lemaker-banana-pro))
diff --git a/targets/targets.mk b/targets/targets.mk
index fe4d78de2cb5bd6e3b9be14e6c076c72688ff768..878647e72a585aad7ff1ad46fa1fbd1a96b02157 100644
--- a/targets/targets.mk
+++ b/targets/targets.mk
@@ -1,10 +1,10 @@
$(eval $(call GluonTarget,ar71xx,generic))
+$(eval $(call GluonTarget,ar71xx,tiny,generic))
$(eval $(call GluonTarget,ar71xx,nand))
$(eval $(call GluonTarget,brcm2708,bcm2708))
$(eval $(call GluonTarget,brcm2708,bcm2709))
$(eval $(call GluonTarget,mpc85xx,generic))
$(eval $(call GluonTarget,x86,generic))
-$(eval $(call GluonTarget,x86,kvm_guest))
$(eval $(call GluonTarget,x86,64))
$(eval $(call GluonTarget,x86,xen_domu))
@@ -13,5 +13,5 @@ $(eval $(call GluonTarget,ar71xx,mikrotik)) # BROKEN: no sysupgrade support
$(eval $(call GluonTarget,mvebu)) # BROKEN: No AP+IBSS or 11s support
$(eval $(call GluonTarget,ramips,mt7621)) # BROKEN: No AP+IBSS support, 11s has high packet loss
$(eval $(call GluonTarget,ramips,rt305x)) # BROKEN: No AP+IBSS support
-$(eval $(call GluonTarget,sunxi)) # BROKEN: Untested, no sysupgrade support
+$(eval $(call GluonTarget,sunxi)) # BROKEN: Untested
endif
diff --git a/targets/x86-64 b/targets/x86-64
new file mode 100644
index 0000000000000000000000000000000000000000..a7e78d788a5e965ec99f6118346d01c85438606b
--- /dev/null
+++ b/targets/x86-64
@@ -0,0 +1,9 @@
+config 'CONFIG_VDI_IMAGES=y'
+config 'CONFIG_VMDK_IMAGES=y'
+packages 'kmod-3c59x' 'kmod-8139too' 'kmod-e100' 'kmod-e1000' 'kmod-e1000e' 'kmod-forcedeth' 'kmod-igb' 'kmod-natsemi' 'kmod-ne2k-pci'
+packages 'kmod-pcnet32' 'kmod-r8169' 'kmod-sis900' 'kmod-sky2' 'kmod-tg3' 'kmod-tulip' 'kmod-via-rhine' 'kmod-via-velocity'
+
+factory_image x86-64 combined-ext4 .img.gz
+factory_image x86-64 combined-ext4 .vdi
+factory_image x86-64 combined-ext4 .vmdk
+sysupgrade_image x86-64 combined-ext4 .img.gz
diff --git a/targets/x86-64/config b/targets/x86-64/config
deleted file mode 100644
index 85016e818943710fdf96fe3a47d8ea9fd070fd2a..0000000000000000000000000000000000000000
--- a/targets/x86-64/config
+++ /dev/null
@@ -1,2 +0,0 @@
-CONFIG_VDI_IMAGES=y
-CONFIG_VMDK_IMAGES=y
diff --git a/targets/x86-64/profiles.mk b/targets/x86-64/profiles.mk
deleted file mode 100644
index 9b5d62dfebfe77610e99d6ac5daccd8fd05346e5..0000000000000000000000000000000000000000
--- a/targets/x86-64/profiles.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-X86_64_NETWORK_MODULES := kmod-3c59x kmod-8139too kmod-e100 kmod-e1000 kmod-e1000e kmod-forcedeth kmod-igb kmod-natsemi kmod-ne2k-pci kmod-pcnet32 kmod-r8169 kmod-sis900 kmod-sky2 kmod-tg3 kmod-tulip kmod-via-rhine kmod-via-velocity
-
-
-$(eval $(call GluonProfile,GENERIC,$(X86_64_NETWORK_MODULES)))
-$(eval $(call GluonProfileFactorySuffix,GENERIC,-ext4,.img.gz))
-$(eval $(call GluonProfileSysupgradeSuffix,GENERIC,-ext4,.img.gz))
-$(eval $(call GluonModel,GENERIC,combined,x86-64))
-
-$(eval $(call GluonProfile,VDI,$(X86_64_NETWORK_MODULES)))
-$(eval $(call GluonProfileFactorySuffix,VDI,-ext4,.vdi))
-$(eval $(call GluonProfileSysupgradeSuffix,VDI))
-$(eval $(call GluonModel,VDI,combined,x86-64-virtualbox))
-
-$(eval $(call GluonProfile,VMDK,$(X86_64_NETWORK_MODULES)))
-$(eval $(call GluonProfileFactorySuffix,VMDK,-ext4,.vmdk))
-$(eval $(call GluonProfileSysupgradeSuffix,VMDK))
-$(eval $(call GluonModel,VMDK,combined,x86-64-vmware))
diff --git a/targets/x86-generic b/targets/x86-generic
new file mode 100644
index 0000000000000000000000000000000000000000..fa4adae025466974fa1f43c1c7b87b275f6bf20f
--- /dev/null
+++ b/targets/x86-generic
@@ -0,0 +1,9 @@
+config 'CONFIG_VDI_IMAGES=y'
+config 'CONFIG_VMDK_IMAGES=y'
+packages 'kmod-3c59x' 'kmod-8139too' 'kmod-e100' 'kmod-e1000' 'kmod-e1000e' 'kmod-forcedeth' 'kmod-igb' 'kmod-natsemi' 'kmod-ne2k-pci'
+packages 'kmod-pcnet32' 'kmod-r8169' 'kmod-sis900' 'kmod-sky2' 'kmod-tg3' 'kmod-tulip' 'kmod-via-rhine' 'kmod-via-velocity'
+
+factory_image x86-generic combined-ext4 .img.gz
+factory_image x86-generic combined-ext4 .vdi
+factory_image x86-generic combined-ext4 .vmdk
+sysupgrade_image x86-generic combined-ext4 .img.gz
diff --git a/targets/x86-generic/config b/targets/x86-generic/config
deleted file mode 100644
index 85016e818943710fdf96fe3a47d8ea9fd070fd2a..0000000000000000000000000000000000000000
--- a/targets/x86-generic/config
+++ /dev/null
@@ -1,2 +0,0 @@
-CONFIG_VDI_IMAGES=y
-CONFIG_VMDK_IMAGES=y
diff --git a/targets/x86-generic/profiles.mk b/targets/x86-generic/profiles.mk
deleted file mode 100644
index e2d2f0412d5b425a90c5fe812327dc706fdf5485..0000000000000000000000000000000000000000
--- a/targets/x86-generic/profiles.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-X86_GENERIC_NETWORK_MODULES := kmod-3c59x kmod-8139too kmod-e100 kmod-e1000 kmod-e1000e kmod-forcedeth kmod-igb kmod-natsemi kmod-ne2k-pci kmod-pcnet32 kmod-r8169 kmod-sis900 kmod-sky2 kmod-tg3 kmod-tulip kmod-via-rhine kmod-via-velocity
-
-
-$(eval $(call GluonProfile,GENERIC,$(X86_GENERIC_NETWORK_MODULES)))
-$(eval $(call GluonProfileFactorySuffix,GENERIC,-ext4,.img.gz))
-$(eval $(call GluonProfileSysupgradeSuffix,GENERIC,-ext4,.img.gz))
-$(eval $(call GluonModel,GENERIC,combined,x86-generic))
-
-$(eval $(call GluonProfile,VDI,$(X86_GENERIC_NETWORK_MODULES)))
-$(eval $(call GluonProfileFactorySuffix,VDI,-ext4,.vdi))
-$(eval $(call GluonProfileSysupgradeSuffix,VDI))
-$(eval $(call GluonModel,VDI,combined,x86-virtualbox))
-
-$(eval $(call GluonProfile,VMDK,$(X86_GENERIC_NETWORK_MODULES)))
-$(eval $(call GluonProfileFactorySuffix,VMDK,-ext4,.vmdk))
-$(eval $(call GluonProfileSysupgradeSuffix,VMDK))
-$(eval $(call GluonModel,VMDK,combined,x86-vmware))
diff --git a/targets/x86-kvm_guest/profiles.mk b/targets/x86-kvm_guest/profiles.mk
deleted file mode 100644
index 22fb890336c39a637fb022ff3d75796163f283ff..0000000000000000000000000000000000000000
--- a/targets/x86-kvm_guest/profiles.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-$(eval $(call GluonProfile,KVM,kmod-virtio-balloon kmod-virtio-net kmod-virtio-random))
-$(eval $(call GluonProfileFactorySuffix,KVM,-ext4,.img.gz))
-$(eval $(call GluonProfileSysupgradeSuffix,KVM,-ext4,.img.gz))
-$(eval $(call GluonModel,KVM,combined,x86-kvm))
diff --git a/targets/x86-xen_domu b/targets/x86-xen_domu
new file mode 100644
index 0000000000000000000000000000000000000000..e26f4e66c90eb9350efa11179969d58988ed1ac5
--- /dev/null
+++ b/targets/x86-xen_domu
@@ -0,0 +1,2 @@
+factory_image x86-xen combined-ext4 .img.gz
+sysupgrade_image x86-xen combined-ext4 .img.gz
diff --git a/targets/x86-xen_domu/profiles.mk b/targets/x86-xen_domu/profiles.mk
deleted file mode 100644
index c104067b79626971c930df1ce28e4889893d42f0..0000000000000000000000000000000000000000
--- a/targets/x86-xen_domu/profiles.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-$(eval $(call GluonProfile,GENERIC))
-$(eval $(call GluonProfileFactorySuffix,GENERIC,-ext4,.img.gz))
-$(eval $(call GluonProfileSysupgradeSuffix,GENERIC,-ext4,.img.gz))
-$(eval $(call GluonModel,GENERIC,combined,x86-xen))