Update OpenWrt base

2016-11-02 17:33:54 +01:00 · 2016-11-02 17:33:54 +01:00 · 095583ba92
parent 740c60c7e4
commit 095583ba92
33 changed files with 156 additions and 502 deletions
--- a/2
+++ b/2
@ -1,7 +1,7 @@
 GLUON_FEEDS='openwrt gluon routing luci'

 OPENWRT_REPO=git://github.com/openwrt/openwrt.git
-OPENWRT_COMMIT=b21852c60f82bbd53c19098fc0eb1f4cfccfaf35
+OPENWRT_COMMIT=0f757bd2606971252f901ef3faf4dbd0086315f7
 OPENWRT_BRANCH=chaos_calmer

 PACKAGES_OPENWRT_REPO=git://github.com/openwrt/packages.git
--- a/patches/openwrt/0007-mac80211-hostapd-iw-.-update.patch
+++ b/patches/openwrt/0007-mac80211-hostapd-iw-.-update.patch
@ -20819,37 +20819,6 @@ index e49dd48..bd851e6 100644
 		$(PKG_BUILD_DIR)/firmware/mt7662_rom_patch.bin \
 		$(PKG_BUILD_DIR)/firmware/mt7662.bin \
 		$(1)/lib/firmware
-diff --git a/package/kernel/mwlwifi/Makefile b/package/kernel/mwlwifi/Makefile
-index f59943d..b36486d 100644
--- a/package/kernel/mwlwifi/Makefile
-+++ b/package/kernel/mwlwifi/Makefile
-@@ -8,7 +8,7 @@
- include $(TOPDIR)/rules.mk
- 
- PKG_NAME:=mwlwifi
-PKG_VERSION:=10.3.0.18-20160804
-+PKG_VERSION:=10.3.0.18-20160823-1
- PKG_RELEASE=1
- 
- PKG_LICENSE:=ISC
-@@ -17,7 +17,7 @@ PKG_LICENSE_FILES:=
- PKG_SOURCE_URL:=https://github.com/kaloz/mwlwifi
- PKG_SOURCE_PROTO:=git
- PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=d48847cc83954930fdcd98818bbf33e75707b8e1
-+PKG_SOURCE_VERSION:=af606563453c819fac156faf2b15b9caef844329
- PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
- 
- PKG_MAINTAINER:=Imre Kaloz <kaloz@openwrt.org>
-@@ -29,7 +29,7 @@ include $(INCLUDE_DIR)/package.mk
- define KernelPackage/mwlwifi
-   SUBMENU:=Wireless Drivers
-   TITLE:=Marvell 88W8864 wireless driver
-  DEPENDS:=+kmod-mac80211 +@DRIVER_11N_SUPPORT @PCI_SUPPORT @TARGET_mvebu
-+  DEPENDS:=+kmod-mac80211 +@DRIVER_11N_SUPPORT +@DRIVER_11W_SUPPORT @PCI_SUPPORT @TARGET_mvebu
-   FILES:=$(PKG_BUILD_DIR)/mwlwifi.ko
-   AUTOLOAD:=$(call AutoLoad,50,mac80211 mwlwifi)
- endef
 diff --git a/package/network/services/hostapd/Config.in b/package/network/services/hostapd/Config.in
 index aee2a15..645888e 100644
 --- a/package/network/services/hostapd/Config.in
--- a/patches/openwrt/0013-fix-UBNT-XM-model-detection.patch
+++ b/patches/openwrt/0013-fix-UBNT-XM-model-detection.patch
@ -5,7 +5,7 @@ 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 2f4b112..b220aad 100755
+index a9dca58..1985c88 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() {
@ -49,7 +49,7 @@ index 2f4b112..b220aad 100755
 cybertan_get_hw_magic() {
 	local part
 
-@@ -475,12 +509,14 @@ ar71xx_board_detect() {
+@@ -478,12 +512,14 @@ ar71xx_board_detect() {
 		;;
 	*"Bullet M")
 		name="bullet-m"
@ -64,7 +64,7 @@ index 2f4b112..b220aad 100755
 		;;
 	*"Nanostation M XW")
 		name="nanostation-m-xw"
-@@ -682,6 +718,7 @@ ar71xx_board_detect() {
+@@ -685,6 +721,7 @@ ar71xx_board_detect() {
 		;;
 	*"Rocket M")
 		name="rocket-m"
--- 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
@ -10,7 +10,7 @@ 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 bf53169..ccccc17 100755
+index 762cd76..024e493 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() {
@ -24,7 +24,7 @@ index bf53169..ccccc17 100755
 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"'
 }
-@@ -371,13 +375,17 @@ platform_check_image() {
+@@ -373,13 +377,17 @@ platform_check_image() {
 		}
 
 		local hwid
--- 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
@ -11,7 +11,7 @@ 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 b220aad..395a012 100755
+index 1985c88..99c808c 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() {
--- 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
@ -12,7 +12,7 @@ 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 395a012..131364c 100755
+index 99c808c..4780e2f 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() {
--- 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
@ -11,7 +11,7 @@ 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 8551399..7184966 100644
+index a8073f2..0783381 100644
 --- a/target/linux/ar71xx/image/Makefile
 +++ b/target/linux/ar71xx/image/Makefile
@@ -476,6 +476,15 @@ define Device/tl-wr710n-v2
--- 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
@ -10,7 +10,7 @@ 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 b5c88e9..d3a14b2 100644
+index 0da8142..2bb4286 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 @@
--- a/patches/openwrt/0034-ar71xx-update-QCA956x-support.patch
+++ b/patches/openwrt/0034-ar71xx-update-QCA956x-support.patch
@ -12,7 +12,7 @@ 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 d3a14b2..61b8976 100644
+index 2bb4286..61b8976 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 @@
@ -327,7 +327,7 @@ index d3a14b2..61b8976 100644
  /*
   * SPI block
   */
-@@ -766,6 +868,19 @@
+-@@ -774,6 +876,19 @@
 +@@ -766,6 +875,19 @@
  #define QCA953X_GPIO_OUT_MUX_LED_LINK4		44
  #define QCA953X_GPIO_OUT_MUX_LED_LINK5		45
@ -336,7 +336,7 @@ index d3a14b2..61b8976 100644
  #define AR71XX_GPIO_COUNT		16
  #define AR7240_GPIO_COUNT		18
  #define AR7241_GPIO_COUNT		20
-@@ -774,6 +889,7 @@
+-@@ -782,6 +897,7 @@
 +@@ -774,6 +896,7 @@
  #define AR934X_GPIO_COUNT		23
  #define QCA953X_GPIO_COUNT		18
--- 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
@ -8,10 +8,10 @@ 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 c5e39d0..e36c581 100644
+index 486879f..3adc449 100644
 --- a/target/linux/ar71xx/base-files/etc/diag.sh
 +++ b/target/linux/ar71xx/base-files/etc/diag.sh
-@@ -305,7 +305,8 @@ get_status_led() {
+@@ -309,7 +309,8 @@ get_status_led() {
 	unifi)
 		status_led="ubnt:green:dome"
 		;;
@ -22,10 +22,10 @@ index c5e39d0..e36c581 100644
 		;;
 	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 b2b182e..850eac9 100755
+index 032c671..a79376a 100755
 --- a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
 +++ b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
-@@ -368,6 +368,7 @@ tl-wa901nd-v3 |\
+@@ -369,6 +369,7 @@ tl-wa901nd-v3 |\
 tl-wa901nd-v4 |\
 tl-wr703n |\
 tube2h |\
@ -34,10 +34,10 @@ index b2b182e..850eac9 100755
 mynet-rext |\
 wp543)
 diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
-index 131364c..ac77934 100755
+index 4780e2f..0fd139c 100755
 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
 +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
-@@ -896,6 +896,9 @@ ar71xx_board_detect() {
+@@ -902,6 +902,9 @@ ar71xx_board_detect() {
 	*UniFi)
 		name="unifi"
 		;;
@ -48,10 +48,10 @@ index 131364c..ac77934 100755
 		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 ccccc17..4793fa9 100755
+index 024e493..fff1c3c 100755
 --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
 +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
-@@ -251,6 +251,7 @@ platform_check_image() {
+@@ -252,6 +252,7 @@ platform_check_image() {
 	wlae-ag300n | \
 	nbg460n_550n_550nh | \
 	unifi | \
@ -60,10 +60,10 @@ index ccccc17..4793fa9 100755
 	carambola2 | \
 	weio )
 diff --git a/target/linux/ar71xx/config-3.18 b/target/linux/ar71xx/config-3.18
-index e4bed08..514f7d5 100644
+index e0d52d9..a068cc5 100644
 --- a/target/linux/ar71xx/config-3.18
 +++ b/target/linux/ar71xx/config-3.18
-@@ -140,6 +140,7 @@ CONFIG_ATH79_MACH_TL_WR941ND=y
+@@ -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
@ -71,7 +71,7 @@ index e4bed08..514f7d5 100644
 CONFIG_ATH79_MACH_UBNT_XM=y
 CONFIG_ATH79_MACH_WEIO=y
 CONFIG_ATH79_MACH_WHR_HP_G300N=y
-@@ -323,7 +324,7 @@ CONFIG_SOC_AR933X=y
+@@ -324,7 +325,7 @@ CONFIG_SOC_AR933X=y
 CONFIG_SOC_AR934X=y
 CONFIG_SOC_QCA953X=y
 CONFIG_SOC_QCA955X=y
@ -218,7 +218,7 @@ index d8e24d0..94eff18 100644
 	NAME:=Ubiquiti UniFiAP Outdoor
 	PACKAGES:=
 diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
-index 7184966..209eba4 100644
+index 0783381..aaaf89a 100644
 --- a/target/linux/ar71xx/image/Makefile
 +++ b/target/linux/ar71xx/image/Makefile
@@ -740,6 +740,16 @@ define Device/oolite
@ -263,18 +263,18 @@ index 626d676..f62cf1a 100644
 # 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 d6e786d..5a7a72c 100644
+index 76aeb94..27dc73f 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,199 @@
-+@@ -16,22 +16,200 @@
+-@@ -16,22 +16,200 @@
+@@ -16,22 +16,201 @@
  
  enum ath79_mach_type {
  	ATH79_MACH_GENERIC = 0,
-@@ -164,6 +164,7 @@
+@@ -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 */
@ -282,7 +282,7 @@ index d6e786d..5a7a72c 100644
  	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 */
-@@ -1097,10 +1098,7 @@
+@@ -1098,10 +1099,7 @@
 +	select ATH79_DEV_M25P80
 +	select ATH79_DEV_USB
 +	select ATH79_DEV_WMAC
@ -294,7 +294,7 @@ index d6e786d..5a7a72c 100644
 +config ATH79_MACH_TL_WA7210N_V2
 +       bool "TP-LINK TL-WA7210N v2 support"
 +       select SOC_AR724X
-@@ -1115,19 +1113,12 @@
+@@ -1116,19 +1114,12 @@
 +	bool "TP-LINK TL-WA830RE v2 support"
 +	select SOC_AR934X
 +	select ATH79_DEV_ETH
@ -319,7 +319,7 @@ index d6e786d..5a7a72c 100644
 +config ATH79_MACH_TL_WA901ND
 +	bool "TP-LINK TL-WA901ND/TL-WA7510N support"
 +	select SOC_AR724X
-@@ -1139,11 +1130,11 @@
+@@ -1140,11 +1131,11 @@
 +
 +config ATH79_MACH_TL_WA901ND_V2
 +	bool "TP-LINK TL-WA901ND v2 support"
@ -336,7 +336,7 @@ index d6e786d..5a7a72c 100644
 +	select ATH79_DEV_WMAC
 +
 +config ATH79_MACH_TL_WDR3500
-@@ -1154,34 +1145,13 @@
+@@ -1155,34 +1146,13 @@
 +	select ATH79_DEV_GPIO_BUTTONS
 +	select ATH79_DEV_LEDS_GPIO
 +	select ATH79_DEV_M25P80
@ -376,7 +376,7 @@ index d6e786d..5a7a72c 100644
 +	select ATH79_DEV_ETH
 +	select ATH79_DEV_GPIO_BUTTONS
 +	select ATH79_DEV_LEDS_GPIO
-@@ -1189,8 +1159,8 @@
+@@ -1190,8 +1160,8 @@
 +	select ATH79_DEV_USB
 +	select ATH79_DEV_WMAC
 +
@ -387,7 +387,7 @@ index d6e786d..5a7a72c 100644
 +	select SOC_AR933X
 +	select ATH79_DEV_ETH
 +	select ATH79_DEV_GPIO_BUTTONS
-@@ -1198,7 +1168,28 @@
+@@ -1199,7 +1169,28 @@
 +	select ATH79_DEV_M25P80
 +	select ATH79_DEV_USB
 +	select ATH79_DEV_WMAC
@ -417,7 +417,7 @@ index d6e786d..5a7a72c 100644
 +config ATH79_MACH_TL_WR741ND
 +	bool "TP-LINK TL-WR741ND support"
 +	select SOC_AR724X
-@@ -1211,21 +1202,25 @@
+@@ -1212,21 +1203,25 @@
 +config ATH79_MACH_TL_WR741ND_V4
 +	bool "TP-LINK TL-WR741ND v4/TL-MR3220 v2 support"
 +	select SOC_AR933X
@ -455,7 +455,7 @@ index d6e786d..5a7a72c 100644
 +	select ATH79_DEV_M25P80
 +
 +config ATH79_MACH_TL_WR841N_V8
-@@ -1268,15 +1263,21 @@
+@@ -1269,15 +1264,21 @@
 +
 +config ATH79_MACH_TL_WR1041N_V2
 +	bool "TP-LINK TL-WR1041N v2 support"
@ -486,7 +486,7 @@ index d6e786d..5a7a72c 100644
 +config ATH79_MACH_TL_WR1043ND
 +	bool "TP-LINK TL-WR1043ND support"
 +	select SOC_AR913X
-@@ -1319,11 +1320,12 @@
+@@ -1320,11 +1321,12 @@
 +
 +config ATH79_MACH_TEW_673GRU
 +	bool "TRENDnet TEW-673GRU support"
@ -503,7 +503,7 @@ index d6e786d..5a7a72c 100644
 +	select ATH79_DEV_M25P80
 +	select ATH79_DEV_USB
 +	select ATH79_NVRAM
-@@ -1361,10 +1363,20 @@
+@@ -1362,10 +1364,20 @@
  
  config ATH79_MACH_UBNT_XM
  	bool "Ubiquiti Networks XM/UniFi boards"
@ -525,7 +525,7 @@ index d6e786d..5a7a72c 100644
 +config ATH79_MACH_WEIO
 +	bool "WeIO board"
 +	select SOC_AR933X
-@@ -1468,7 +1480,7 @@
+@@ -1469,7 +1481,7 @@
  endmenu
  
  config SOC_AR71XX
@ -534,7 +534,7 @@ index d6e786d..5a7a72c 100644
  config ATH79_DEV_ETH
  	def_bool n
  
-@@ -1480,7 +1492,7 @@
+@@ -1481,7 +1493,7 @@
  	def_bool n
  
  config ATH79_DEV_GPIO_BUTTONS
@ -543,7 +543,7 @@ index d6e786d..5a7a72c 100644
  	def_bool n
  
  config ATH79_ROUTERBOOT
-@@ -1494,7 +1506,7 @@
+@@ -1495,7 +1507,7 @@
  endif
 --- a/arch/mips/ath79/Makefile
 +++ b/arch/mips/ath79/Makefile
@ -552,7 +552,7 @@ index d6e786d..5a7a72c 100644
  #
  # Machines
  #
-@@ -1596,6 +1608,7 @@
+@@ -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
--- a/patches/openwrt/0040-ar71xx-Rename-unifiac-to-unifiac-lite.patch
+++ b/patches/openwrt/0040-ar71xx-Rename-unifiac-to-unifiac-lite.patch
@ -10,10 +10,10 @@ 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 e36c581..23fd122 100644
+index 3adc449..924c116 100644
 --- a/target/linux/ar71xx/base-files/etc/diag.sh
 +++ b/target/linux/ar71xx/base-files/etc/diag.sh
-@@ -306,7 +306,7 @@ get_status_led() {
+@@ -310,7 +310,7 @@ get_status_led() {
 		status_led="ubnt:green:dome"
 		;;
 	uap-pro | \
@ -23,10 +23,10 @@ index e36c581..23fd122 100644
 		;;
 	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 f01c6d3..6c6b27a 100644
+index ab7d93c..7777734 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
-@@ -77,7 +77,7 @@ case "$FIRMWARE" in
+@@ -81,7 +81,7 @@ case "$FIRMWARE" in
 		ath10kcal_extract "ART" 20480 2116
 		ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) +16)
 		;;
@ -36,10 +36,10 @@ index f01c6d3..6c6b27a 100644
 		;;
 	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 850eac9..cb31c69 100755
+index a79376a..2007042 100755
 --- a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
 +++ b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
-@@ -368,7 +368,7 @@ tl-wa901nd-v3 |\
+@@ -369,7 +369,7 @@ tl-wa901nd-v3 |\
 tl-wa901nd-v4 |\
 tl-wr703n |\
 tube2h |\
@ -49,10 +49,10 @@ index 850eac9..cb31c69 100755
 mynet-rext |\
 wp543)
 diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
-index ac77934..f8dd719 100755
+index 0fd139c..a8d8896 100755
 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
 +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
-@@ -896,8 +896,8 @@ ar71xx_board_detect() {
+@@ -902,8 +902,8 @@ ar71xx_board_detect() {
 	*UniFi)
 		name="unifi"
 		;;
@ -64,10 +64,10 @@ index ac77934..f8dd719 100755
 	*"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 4793fa9..5aa59fd 100755
+index fff1c3c..90f961f 100755
 --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
 +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
-@@ -251,7 +251,7 @@ platform_check_image() {
+@@ -252,7 +252,7 @@ platform_check_image() {
 	wlae-ag300n | \
 	nbg460n_550n_550nh | \
 	unifi | \
@ -143,7 +143,7 @@ index 94eff18..eac0240 100644
 define Profile/UBNTUNIFIOUTDOOR
 	NAME:=Ubiquiti UniFiAP Outdoor
 diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
-index 209eba4..c9d6ed1 100644
+index aaaf89a..42ffc69 100644
 --- a/target/linux/ar71xx/image/Makefile
 +++ b/target/linux/ar71xx/image/Makefile
@@ -741,14 +741,19 @@ endef
@ -170,10 +170,10 @@ index 209eba4..c9d6ed1 100644
 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 5a7a72c..0ade403 100644
+index 27dc73f..9a28f58 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
-@@ -164,7 +164,7 @@
+@@ -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 */
@ -182,7 +182,7 @@ index 5a7a72c..0ade403 100644
  	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 */
-@@ -1368,7 +1368,7 @@
+@@ -1369,7 +1369,7 @@
  	  Ubiquiti Networks XM (rev 1.0) board.
  
 +config ATH79_MACH_UBNT_UNIFIAC
--- 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
@ -8,10 +8,10 @@ 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 23fd122..f182d60 100644
+index 924c116..cb92349 100644
 --- a/target/linux/ar71xx/base-files/etc/diag.sh
 +++ b/target/linux/ar71xx/base-files/etc/diag.sh
-@@ -306,7 +306,8 @@ get_status_led() {
+@@ -310,7 +310,8 @@ get_status_led() {
 		status_led="ubnt:green:dome"
 		;;
 	uap-pro | \
@ -22,10 +22,10 @@ index 23fd122..f182d60 100644
 		;;
 	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 6c6b27a..0e93feb 100644
+index 7777734..5eb20bb 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
-@@ -77,7 +77,8 @@ case "$FIRMWARE" in
+@@ -81,7 +81,8 @@ case "$FIRMWARE" in
 		ath10kcal_extract "ART" 20480 2116
 		ath10kcal_patch_mac $(macaddr_add $(cat /sys/class/net/eth0/address) +16)
 		;;
@ -36,10 +36,10 @@ index 6c6b27a..0e93feb 100644
 		;;
 	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 cb31c69..e5c64bb 100755
+index 2007042..b59844e 100755
 --- a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
 +++ b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
-@@ -400,6 +400,13 @@ wpj344)
+@@ -401,6 +401,13 @@ wpj344)
 	ucidef_add_switch_vlan "switch0" "2" "0t 2"
 	;;
 
@ -54,10 +54,10 @@ index cb31c69..e5c64bb 100755
 	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 f8dd719..348e0f6 100755
+index a8d8896..28f07b8 100755
 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
 +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
-@@ -899,6 +899,9 @@ ar71xx_board_detect() {
+@@ -905,6 +905,9 @@ ar71xx_board_detect() {
 	*"UniFi-AC-LITE")
 		name="unifiac-lite"
 		;;
@ -68,10 +68,10 @@ index f8dd719..348e0f6 100755
 		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 5aa59fd..0f166eb 100755
+index 90f961f..0228f14 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() {
+@@ -253,6 +253,7 @@ platform_check_image() {
 	nbg460n_550n_550nh | \
 	unifi | \
 	unifiac-lite | \
@ -193,7 +193,7 @@ index eac0240..69b8398 100644
 	NAME:=Ubiquiti UniFiAP Outdoor
 	PACKAGES:=
 diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
-index c9d6ed1..0cf1df1 100644
+index 42ffc69..7c648f2 100644
 --- a/target/linux/ar71xx/image/Makefile
 +++ b/target/linux/ar71xx/image/Makefile
@@ -753,7 +753,13 @@ define Device/ubnt-unifiac-lite
@ -212,18 +212,18 @@ index c9d6ed1..0cf1df1 100644
 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 0ade403..dbd3fca 100644
+index 9a28f58..debde6e 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 @@
+-@@ -16,22 +16,201 @@
+@@ -16,22 +16,202 @@
  
  enum ath79_mach_type {
  	ATH79_MACH_GENERIC = 0,
-@@ -165,6 +165,7 @@
+@@ -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 */
@ -231,7 +231,7 @@ index 0ade403..dbd3fca 100644
  	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 */
-@@ -1363,12 +1364,12 @@
+@@ -1364,12 +1365,12 @@
  
  config ATH79_MACH_UBNT_XM
  	bool "Ubiquiti Networks XM/UniFi boards"
@ -246,7 +246,7 @@ index 0ade403..dbd3fca 100644
 +	select SOC_QCA956X
 +	select ATH79_DEV_AP9X_PCI if PCI
 +	select ATH79_DEV_ETH
-@@ -1376,6 +1377,7 @@
+@@ -1377,6 +1378,7 @@
 +	select ATH79_DEV_LEDS_GPIO
 +	select ATH79_DEV_M25P80
 +	select ATH79_DEV_WMAC
@ -254,7 +254,7 @@ index 0ade403..dbd3fca 100644
 +
 +config ATH79_MACH_WEIO
 +	bool "WeIO board"
-@@ -1480,7 +1482,7 @@
+@@ -1481,7 +1483,7 @@
  endmenu
  
  config SOC_AR71XX
@ -263,7 +263,7 @@ index 0ade403..dbd3fca 100644
  config ATH79_DEV_ETH
  	def_bool n
  
-@@ -1492,7 +1494,7 @@
+@@ -1493,7 +1495,7 @@
  	def_bool n
  
  config ATH79_DEV_GPIO_BUTTONS
--- 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
@ -10,10 +10,10 @@ 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 d7dc9a1..337000c 100644
+index f4d5234..b867796 100644
 --- a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
 +++ b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
-@@ -592,6 +592,21 @@ wnr2000-v4)
+@@ -600,6 +600,21 @@ wnr2000-v4)
 	ucidef_set_led_usbdev "usb" "USB" "netgear:amber:status" "1-1"
 	;;
 
--- a/patches/openwrt/0047-ar71xx-add-GL-AR150-support.patch
+++ b/patches/openwrt/0047-ar71xx-add-GL-AR150-support.patch
@ -9,10 +9,10 @@ https://raw.githubusercontent.com/domino-team/OpenWrt-patches/master/AR150%2C%20
 (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 337000c..032acc9 100644
+index b867796..d81358d 100644
 --- a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
 +++ b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
-@@ -181,6 +181,10 @@ dlan-pro-1200-ac)
+@@ -188,6 +188,10 @@ dlan-pro-1200-ac)
 	ucidef_set_led_trigger_gpio "plcr" "dLAN" "devolo:error:dlan" "16" "0"
 	;;
 
@ -24,10 +24,10 @@ index 337000c..032acc9 100644
 	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 e5c64bb..b8ae576 100755
+index b59844e..ac3deb8 100755
 --- a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
 +++ b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
-@@ -382,6 +382,7 @@ dir-505-a1)
+@@ -383,6 +383,7 @@ dir-505-a1)
 alfa-ap96 |\
 alfa-nx |\
 ap83 |\
@ -36,10 +36,10 @@ index e5c64bb..b8ae576 100755
 jwap003 |\
 pb42 |\
 diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
-index 348e0f6..5119b36 100755
+index 28f07b8..3bd6aed 100755
 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
 +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
-@@ -500,6 +500,9 @@ ar71xx_board_detect() {
+@@ -503,6 +503,9 @@ ar71xx_board_detect() {
 		name="gl-inet"
 		gl_inet_board_detect
 		;;
@ -50,10 +50,10 @@ index 348e0f6..5119b36 100755
 		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 0f166eb..f33419f 100755
+index 0228f14..d816f21 100755
 --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
 +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
-@@ -215,6 +215,7 @@ platform_check_image() {
+@@ -216,6 +216,7 @@ platform_check_image() {
 	dlan-pro-500-wp | \
 	dlan-pro-1200-ac | \
 	dragino2 | \
@ -62,10 +62,10 @@ index 0f166eb..f33419f 100755
 	esr1750 | \
 	esr900 | \
 diff --git a/target/linux/ar71xx/config-3.18 b/target/linux/ar71xx/config-3.18
-index 514f7d5..0903ee9 100644
+index a068cc5..d4d9273 100644
 --- a/target/linux/ar71xx/config-3.18
 +++ b/target/linux/ar71xx/config-3.18
-@@ -69,6 +69,7 @@ CONFIG_ATH79_MACH_ESR1750=y
+@@ -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
@ -261,7 +261,7 @@ index 0000000..a6ad661
 +
 +$(eval $(call Profile,GL-AR150))
 diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
-index 0cf1df1..b790610 100644
+index 7c648f2..05eea0b 100644
 --- a/target/linux/ar71xx/image/Makefile
 +++ b/target/linux/ar71xx/image/Makefile
@@ -144,6 +144,14 @@ define Device/weio
--- 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
@ -14,11 +14,11 @@ 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 f182d60..c3aeffc 100644
+index cb92349..2c5d6af 100644
 --- a/target/linux/ar71xx/base-files/etc/diag.sh
 +++ b/target/linux/ar71xx/base-files/etc/diag.sh
-@@ -276,6 +276,7 @@ get_status_led() {
- 	tl-wr841n-v8 | \
+@@ -280,6 +280,7 @@ get_status_led() {
+ 	tl-wr841n-v11 | \
 	tl-wa830re-v2 | \
 	tl-wr842n-v2 | \
 +	tl-wr842n-v3 | \
@ -26,10 +26,10 @@ index f182d60..c3aeffc 100644
 	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 032acc9..e118e0a 100644
+index d81358d..14aa7bc 100644
 --- a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
 +++ b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
-@@ -515,6 +515,16 @@ tl-wr842n-v2)
+@@ -523,6 +523,16 @@ tl-wr842n-v2)
 	ucidef_set_led_usbdev "usb" "USB" "tp-link:green:3g" "1-1"
 	;;
 
@ -47,22 +47,22 @@ index 032acc9..e118e0a 100644
 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 b8ae576..3c428ba 100755
+index ac3deb8..ca9c577 100755
 --- a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
 +++ b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
-@@ -447,6 +447,7 @@ tl-wr741nd |\
- tl-wr741nd-v4 |\
+@@ -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 5119b36..e4a617e 100755
+index 3bd6aed..43ce7da 100755
 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
 +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
-@@ -863,6 +863,9 @@ ar71xx_board_detect() {
+@@ -869,6 +869,9 @@ ar71xx_board_detect() {
 	*"TL-WR842N/ND v2")
 		name="tl-wr842n-v2"
 		;;
@ -73,42 +73,41 @@ index 5119b36..e4a617e 100755
 		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 f33419f..2a1abf3 100755
+index d816f21..53284df 100755
 --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
 +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
-@@ -365,6 +365,7 @@ platform_check_image() {
- 	tl-wr841n-v8 | \
+@@ -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 3e5c2a2..0209603 100644
+index 004f719..ebaed15 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,7 +1,8 @@
+@@ -1,9 +1,16 @@
 /*
- *  TP-LINK TL-WR841N/ND v9
-+ *  TP-LINK TL-WR841N/ND v9/TL-WR842N/ND v3
+<<<<<<< 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
-@@ -19,6 +20,7 @@
- #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"
- 
-@@ -33,6 +35,20 @@
- #define TL_WR841NV9_GPIO_BTN_RESET	12
- #define TL_WR841NV9_GPIO_BTN_WIFI	17
+@@ -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
@ -127,8 +126,8 @@ index 3e5c2a2..0209603 100644
 #define TL_WR841NV9_KEYS_POLL_INTERVAL	20	/* msecs */
 #define TL_WR841NV9_KEYS_DEBOUNCE_INTERVAL (3 * TL_WR841NV9_KEYS_POLL_INTERVAL)
 
-@@ -95,6 +111,68 @@ static struct gpio_keys_button tl_wr841n_v9_gpio_keys[] __initdata = {
- 	}
+@@ -151,6 +172,68 @@ static struct gpio_led tl_wr841n_v11_leds_gpio[] __initdata = {
+ 	},
 };
 
 +static struct gpio_led tl_wr842n_v3_leds_gpio[] __initdata = {
@ -193,13 +192,13 @@ index 3e5c2a2..0209603 100644
 +	}
 +};
 +
- 
 static void __init tl_ap143_setup(void)
 {
-@@ -142,3 +220,20 @@ static void __init tl_wr841n_v9_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_V9, "TL-WR841N-v9", "TP-LINK TL-WR841N/ND v9",
- 	     tl_wr841n_v9_setup);
+ 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)
 +{
@ -218,7 +217,7 @@ index 3e5c2a2..0209603 100644
 +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 b790610..e074f8a 100644
+index 05eea0b..d66bd25 100644
 --- a/target/linux/ar71xx/image/Makefile
 +++ b/target/linux/ar71xx/image/Makefile
@@ -607,6 +607,13 @@ define Device/tl-wr842n-v2
@ -245,26 +244,26 @@ index b790610..e074f8a 100644
 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 dbd3fca..4a53355 100644
+index debde6e..d4b417b 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 @@
+-@@ -16,22 +16,202 @@
+@@ -16,22 +16,203 @@
  
  enum ath79_mach_type {
  	ATH79_MACH_GENERIC = 0,
-@@ -147,6 +147,7 @@
- +	ATH79_MACH_TL_WR841N_V8,	/* TP-LINK TL-WR841N/ND v8 */
+@@ -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 */
-@@ -284,7 +285,7 @@
+@@ -285,7 +286,7 @@
  config ATH79_MACH_AP121
  	bool "Atheros AP121 reference board"
  	select SOC_AR933X
@ -273,7 +272,7 @@ index dbd3fca..4a53355 100644
  	select ATH79_DEV_M25P80
  	select ATH79_DEV_USB
  	select ATH79_DEV_WMAC
-@@ -1235,13 +1236,14 @@
+@@ -1236,13 +1237,14 @@
 +	select ATH79_DEV_WMAC
 +
 +config ATH79_MACH_TL_WR841N_V9
@ -295,7 +294,7 @@ index dbd3fca..4a53355 100644
 +
 +config ATH79_MACH_TL_WR941ND
 +	bool "TP-LINK TL-WR941ND support"
-@@ -1364,7 +1366,7 @@
+@@ -1365,7 +1367,7 @@
  
  config ATH79_MACH_UBNT_XM
  	bool "Ubiquiti Networks XM/UniFi boards"
@ -304,7 +303,7 @@ index dbd3fca..4a53355 100644
  	  Say 'Y' here if you want your kernel to support the
  	  Ubiquiti Networks XM (rev 1.0) board.
  
-@@ -1482,7 +1484,7 @@
+@@ -1483,7 +1485,7 @@
  endmenu
  
  config SOC_AR71XX
@ -313,7 +312,7 @@ index dbd3fca..4a53355 100644
  config ATH79_DEV_ETH
  	def_bool n
  
-@@ -1494,7 +1496,7 @@
+@@ -1495,7 +1497,7 @@
  	def_bool n
  
  config ATH79_DEV_GPIO_BUTTONS
--- a/patches/openwrt/0059-ar71xx-Fix-TL-WR841N-v11-LEDs-use-separate-machine.patch
+++ b/patches/openwrt/0059-ar71xx-Fix-TL-WR841N-v11-LEDs-use-separate-machine.patch
@ -1,209 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Sun, 3 Jul 2016 22:21:13 +0200
-Subject: ar71xx: Fix TL-WR841N v11 LEDs, use separate machine
-
-Signed-off-by: Stijn Segers <francesco.borromini@inventati.org>
-
-Backport of LEDE d2a91f9853a9bfb47cb5d6e3078372f3f85557c5
-
-diff --git a/target/linux/ar71xx/base-files/etc/diag.sh b/target/linux/ar71xx/base-files/etc/diag.sh
-index c3aeffc..ef59d11 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-wr841n-v1 | \
- 	tl-wr841n-v7 | \
- 	tl-wr841n-v8 | \
-+	tl-wr841n-v11 | \
- 	tl-wa830re-v2 | \
- 	tl-wr842n-v2 | \
- 	tl-wr842n-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 e118e0a..9a0d7eb 100644
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
-+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
-@@ -496,7 +496,8 @@ 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"
- 	ucidef_set_led_switch "lan2" "LAN2" "tp-link:green:lan2" "switch0" "0x08"
-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 3c428ba..d5603d7 100755
--- a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
-+++ b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
-@@ -447,6 +447,7 @@ tl-wr741nd |\
- tl-wr741nd-v4 |\
- tl-wr841n-v7 |\
- tl-wr841n-v9 |\
-+tl-wr841n-v11 |\
- tl-wr842n-v3 |\
- whr-g301n |\
- whr-hp-g300n |\
-diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh
-index e4a617e..beca73a 100755
--- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
-+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
-@@ -860,6 +860,9 @@ ar71xx_board_detect() {
- 	*"TL-WR841N/ND v9")
- 		name="tl-wr841n-v9"
- 		;;
-+	*"TL-WR841N/ND v11")
-+		name="tl-wr841n-v11"
-+		;;
- 	*"TL-WR842N/ND v2")
- 		name="tl-wr842n-v2"
- 		;;
-diff --git a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
-index 2a1abf3..f50cd53 100755
--- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
-+++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
-@@ -364,6 +364,7 @@ platform_check_image() {
- 	tl-wr841n-v7 | \
- 	tl-wr841n-v8 | \
- 	tl-wr841n-v9 | \
-+	tl-wr841n-v11 | \
- 	tl-wr842n-v2 | \
- 	tl-wr842n-v3 | \
- 	tl-wr941nd | \
-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 0209603..f806568 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,8 +1,9 @@
- /*
- *  TP-LINK TL-WR841N/ND v9/TL-WR842N/ND v3
-+ *  TP-LINK TL-WR841N/ND v9/v11 / TL-WR842N/ND v3
-  *
-  *  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>
-  *
-  *  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
-@@ -35,6 +36,19 @@
- #define TL_WR841NV9_GPIO_BTN_RESET	12
- #define TL_WR841NV9_GPIO_BTN_WIFI	17
- 
-+#define TL_WR841NV11_GPIO_LED_SYSTEM	1
-+#define TL_WR841NV11_GPIO_LED_QSS	3
-+#define TL_WR841NV11_GPIO_LED_WAN	4
-+#define TL_WR841NV11_GPIO_LED_WAN_STATUS	2
-+#define TL_WR841NV11_GPIO_LED_WLAN	13
-+#define TL_WR841NV11_GPIO_LED_LAN1	16
-+#define TL_WR841NV11_GPIO_LED_LAN2	15
-+#define TL_WR841NV11_GPIO_LED_LAN3	14
-+#define TL_WR841NV11_GPIO_LED_LAN4	11
-+
-+#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
-@@ -111,6 +125,46 @@ static struct gpio_keys_button tl_wr841n_v9_gpio_keys[] __initdata = {
- 	}
- };
- 
-+static struct gpio_led tl_wr841n_v11_leds_gpio[] __initdata = {
-+	{
-+		.name		= "tp-link:green:lan1",
-+		.gpio		= TL_WR841NV9_GPIO_LED_LAN1,
-+		.active_low	= 1,
-+	}, {
-+		.name		= "tp-link:green:lan2",
-+		.gpio		= TL_WR841NV9_GPIO_LED_LAN2,
-+		.active_low	= 1,
-+	}, {
-+		.name		= "tp-link:green:lan3",
-+		.gpio		= TL_WR841NV9_GPIO_LED_LAN3,
-+		.active_low	= 1,
-+	}, {
-+		.name		= "tp-link:green:lan4",
-+		.gpio		= TL_WR841NV9_GPIO_LED_LAN4,
-+		.active_low	= 1,
-+	}, {
-+		.name		= "tp-link:green:qss",
-+		.gpio		= TL_WR841NV9_GPIO_LED_QSS,
-+		.active_low	= 1,
-+	}, {
-+		.name		= "tp-link:green:system",
-+		.gpio		= TL_WR841NV11_GPIO_LED_SYSTEM,
-+		.active_low	= 1,
-+	}, {
-+		.name		= "tp-link:green:wan",
-+		.gpio		= TL_WR841NV9_GPIO_LED_WAN,
-+		.active_low	= 1,
-+	}, {
-+		.name		= "tp-link:green:wan_status",
-+		.gpio		= TL_WR841NV11_GPIO_LED_WAN_STATUS,
-+		.active_low	= 1,
-+	}, {
-+		.name		= "tp-link:green:wlan",
-+		.gpio		= TL_WR841NV9_GPIO_LED_WLAN,
-+		.active_low	= 1,
-+	},
-+};
-+
- static struct gpio_led tl_wr842n_v3_leds_gpio[] __initdata = {
- 	{
- 		.name		= "tp-link:green:lan1",
-@@ -221,6 +275,21 @@ static void __init tl_wr841n_v9_setup(void)
- MIPS_MACHINE(ATH79_MACH_TL_WR841N_V9, "TL-WR841N-v9", "TP-LINK TL-WR841N/ND v9",
- 	     tl_wr841n_v9_setup);
- 
-+static void __init tl_wr841n_v11_setup(void)
-+{
-+	tl_ap143_setup();
-+
-+	ath79_register_leds_gpio(-1, ARRAY_SIZE(tl_wr841n_v11_leds_gpio),
-+				 tl_wr841n_v11_leds_gpio);
-+
-+	ath79_register_gpio_keys_polled(1, TL_WR841NV9_KEYS_POLL_INTERVAL,
-+					ARRAY_SIZE(tl_wr841n_v9_gpio_keys),
-+					tl_wr841n_v9_gpio_keys);
-+}
-+
-+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();
-diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
-index e074f8a..f99ea2b 100644
--- a/target/linux/ar71xx/image/Makefile
-+++ b/target/linux/ar71xx/image/Makefile
-@@ -595,7 +595,7 @@ endef
- 
- define Device/tl-wr841n-v11
-     $(Device/tplink-4mlzma)
-    BOARDNAME := TL-WR841N-v9
-+    BOARDNAME := TL-WR841N-v11
-     DEVICE_PROFILE := TLWR841
-     TPLINK_HWID := 0x08410011
- endef
-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 4a53355..d4b417b 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,
-@@ -146,6 +146,7 @@
- +	ATH79_MACH_TL_WR841N_V7,	/* TP-LINK TL-WR841N/ND v7 */
- +	ATH79_MACH_TL_WR841N_V8,	/* TP-LINK TL-WR841N/ND v8 */
- +	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 */
--- a/patches/openwrt/0059-x86-generic-enable-CONFIG_SATA_VIA.patch
+++ b/patches/openwrt/0059-x86-generic-enable-CONFIG_SATA_VIA.patch
--- 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
--- 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
@ -9,7 +9,7 @@ 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 beca73a..480cf93 100755
+index 43ce7da..4bf484b 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() {
--- 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
@ -12,10 +12,10 @@ 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 9a0d7eb..7c18346 100644
+index 14aa7bc..3d240fb 100644
 --- a/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
 +++ b/target/linux/ar71xx/base-files/etc/uci-defaults/01_leds
-@@ -132,10 +132,6 @@ dhp-1565-a1)
+@@ -139,10 +139,6 @@ dhp-1565-a1)
 	ucidef_set_led_switch "wan" "WAN" "d-link:green:planet" "switch0" "0x20"
 	;;
 
--- 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
--- 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
@ -22,7 +22,7 @@ index b41f275..0f7a415 100644
 	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 7c18346..0056520 100644
+index 3d240fb..f1266d8 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)
@ -34,10 +34,10 @@ index 7c18346..0056520 100644
 	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 d5603d7..dd6ca98 100755
+index ca9c577..6c3ecf5 100755
 --- a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
 +++ b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
-@@ -71,6 +71,7 @@ bsb)
+@@ -72,6 +72,7 @@ bsb)
 	ucidef_set_interface_wlan
 	;;
 
@ -46,7 +46,7 @@ index d5603d7..dd6ca98 100755
 	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 480cf93..47ddd56 100755
+index 4bf484b..51102d6 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() {
@ -63,10 +63,10 @@ index 480cf93..47ddd56 100755
 		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 f50cd53..8594de6 100755
+index 53284df..4003b21 100755
 --- a/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
 +++ b/target/linux/ar71xx/base-files/lib/upgrade/platform.sh
-@@ -264,6 +264,7 @@ platform_check_image() {
+@@ -265,6 +265,7 @@ platform_check_image() {
 		return 0
 		;;
 
@ -126,10 +126,10 @@ index 5cb052a..74daf43 100644
 +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 f99ea2b..33a2da5 100644
+index d66bd25..75083f9 100644
 --- a/target/linux/ar71xx/image/Makefile
 +++ b/target/linux/ar71xx/image/Makefile
-@@ -2109,7 +2109,8 @@ $(eval $(call SingleProfile,TPLINK-LZMA,64kraw,TLWR1043V2,tl-wr1043nd-v2,TL-WR10
+@@ -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))
 
@ -139,7 +139,7 @@ index f99ea2b..33a2da5 100644
 
 $(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))
-@@ -2173,6 +2174,7 @@ $(eval $(call MultiProfile,TLWR842,TLWR842V1))
+@@ -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))
--- a/patches/openwrt/0065-fw-utils-tplink-safeloader.c-Add-support-for-Archer-C2600.patch
+++ b/patches/openwrt/0065-fw-utils-tplink-safeloader.c-Add-support-for-Archer-C2600.patch
--- a/patches/openwrt/0066-tools-tplink-safeloader-split-CPE210-from-CPE510-profile.patch
+++ b/patches/openwrt/0066-tools-tplink-safeloader-split-CPE210-from-CPE510-profile.patch
@ -12,10 +12,10 @@ 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 33a2da5..b288a1d 100644
+index 75083f9..bb2bb94 100644
 --- a/target/linux/ar71xx/image/Makefile
 +++ b/target/linux/ar71xx/image/Makefile
-@@ -2109,7 +2109,7 @@ $(eval $(call SingleProfile,TPLINK-LZMA,64kraw,TLWR1043V2,tl-wr1043nd-v2,TL-WR10
+@@ -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))
 
--- a/patches/openwrt/0067-dropbear-update-to-LEDE-277f85c21ae0ede4e15e66cbd801b9fb502531df.patch
+++ b/patches/openwrt/0067-dropbear-update-to-LEDE-277f85c21ae0ede4e15e66cbd801b9fb502531df.patch
--- a/patches/openwrt/0068-ar71xx-Added-support-for-TL-WA801NDv3.patch
+++ b/patches/openwrt/0068-ar71xx-Added-support-for-TL-WA801NDv3.patch
@ -7,10 +7,10 @@ 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 dd6ca98..e6b129a 100755
+index 6c3ecf5..027a671 100755
 --- a/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
 +++ b/target/linux/ar71xx/base-files/etc/uci-defaults/02_network
-@@ -376,6 +376,7 @@ wp543)
+@@ -377,6 +377,7 @@ wp543)
 	ucidef_set_interface_lan "eth0"
 	;;
 
@ -19,10 +19,10 @@ index dd6ca98..e6b129a 100755
 	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 47ddd56..7641e63 100755
+index 51102d6..83be329 100755
 --- a/target/linux/ar71xx/base-files/lib/ar71xx.sh
 +++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh
-@@ -835,6 +835,9 @@ ar71xx_board_detect() {
+@@ -838,6 +838,9 @@ ar71xx_board_detect() {
 	*"TL-WA801ND v2")
 		name="tl-wa801nd-v2"
 		;;
@ -33,10 +33,10 @@ index 47ddd56..7641e63 100755
 		name="tl-wa901nd"
 		;;
 diff --git a/target/linux/ar71xx/config-3.18 b/target/linux/ar71xx/config-3.18
-index 0903ee9..c75833d 100644
+index d4d9273..d7cbe2e 100644
 --- a/target/linux/ar71xx/config-3.18
 +++ b/target/linux/ar71xx/config-3.18
-@@ -119,6 +119,7 @@ CONFIG_ATH79_MACH_TL_MR3020=y
+@@ -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
@ -187,7 +187,7 @@ index 0000000..39cdb10
 +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 b288a1d..dfc0d71 100644
+index bb2bb94..868a502 100644
 --- a/target/linux/ar71xx/image/Makefile
 +++ b/target/linux/ar71xx/image/Makefile
@@ -691,6 +691,13 @@ define Device/tl-wa801nd-v2
--- a/patches/openwrt/0069-firmware-utils-mktplinkfw-backport-from-LEDE-a4fc62bc0ea4010ddbfbd738453c9db70988a57c.patch
+++ b/patches/openwrt/0069-firmware-utils-mktplinkfw-backport-from-LEDE-a4fc62bc0ea4010ddbfbd738453c9db70988a57c.patch
--- 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
@ -6,7 +6,7 @@ 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 dfc0d71..cbd8a49 100644
+index 868a502..95f6d46 100644
 --- a/target/linux/ar71xx/image/Makefile
 +++ b/target/linux/ar71xx/image/Makefile
@@ -58,13 +58,14 @@ define Build/mktplinkfw
--- a/patches/openwrt/0071-ath10k-firmware-add-ath10k-firmware-qca988x-11s.patch
+++ b/patches/openwrt/0071-ath10k-firmware-add-ath10k-firmware-qca988x-11s.patch
--- 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
--- 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
--- a/patches/openwrt/0073-kernel-add-fix-for-CVE-2016-7117.patch
+++ b/patches/openwrt/0073-kernel-add-fix-for-CVE-2016-7117.patch
@ -1,105 +0,0 @@
-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Tue, 11 Oct 2016 00:46:56 +0200
-Subject: kernel: add fix for CVE-2016-7117
-
-diff --git a/target/linux/generic/patches-3.18/010-net-Fix-use-after-free-in-the-recvmmsg-exit-path.patch b/target/linux/generic/patches-3.18/010-net-Fix-use-after-free-in-the-recvmmsg-exit-path.patch
-new file mode 100644
-index 0000000..98da375
--- /dev/null
-+++ b/target/linux/generic/patches-3.18/010-net-Fix-use-after-free-in-the-recvmmsg-exit-path.patch
-@@ -0,0 +1,95 @@
-+From cdd1fd36f4b67d9fdbeb1a4d16025192d44a3e8b Mon Sep 17 00:00:00 2001
-+Message-Id: <cdd1fd36f4b67d9fdbeb1a4d16025192d44a3e8b.1476139573.git.mschiffer@universe-factory.net>
-+From: Arnaldo Carvalho de Melo <acme@redhat.com>
-+Date: Mon, 14 Mar 2016 09:56:35 -0300
-+Subject: [PATCH] net: Fix use after free in the recvmmsg exit path
-+
-+[ Upstream commit 34b88a68f26a75e4fded796f1a49c40f82234b7d ]
-+
-+The syzkaller fuzzer hit the following use-after-free:
-+
-+  Call Trace:
-+   [<ffffffff8175ea0e>] __asan_report_load8_noabort+0x3e/0x40 mm/kasan/report.c:295
-+   [<ffffffff851cc31a>] __sys_recvmmsg+0x6fa/0x7f0 net/socket.c:2261
-+   [<     inline     >] SYSC_recvmmsg net/socket.c:2281
-+   [<ffffffff851cc57f>] SyS_recvmmsg+0x16f/0x180 net/socket.c:2270
-+   [<ffffffff86332bb6>] entry_SYSCALL_64_fastpath+0x16/0x7a
-+  arch/x86/entry/entry_64.S:185
-+
-+And, as Dmitry rightly assessed, that is because we can drop the
-+reference and then touch it when the underlying recvmsg calls return
-+some packets and then hit an error, which will make recvmmsg to set
-+sock->sk->sk_err, oops, fix it.
-+
-+Reported-and-Tested-by: Dmitry Vyukov <dvyukov@google.com>
-+Cc: Alexander Potapenko <glider@google.com>
-+Cc: Eric Dumazet <edumazet@google.com>
-+Cc: Kostya Serebryany <kcc@google.com>
-+Cc: Sasha Levin <sasha.levin@oracle.com>
-+Fixes: a2e2725541fa ("net: Introduce recvmmsg socket syscall")
-+http://lkml.kernel.org/r/20160122211644.GC2470@redhat.com
-+Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-+Signed-off-by: David S. Miller <davem@davemloft.net>
-+Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
-+---
-+ net/socket.c | 38 +++++++++++++++++++-------------------
-+ 1 file changed, 19 insertions(+), 19 deletions(-)
-+
-+diff --git a/net/socket.c b/net/socket.c
-+index 02fc7c8..7f61789 100644
-+--- a/net/socket.c
-++++ b/net/socket.c
-+@@ -2410,31 +2410,31 @@ int __sys_recvmmsg(int fd, struct mmsghdr __user *mmsg, unsigned int vlen,
-+ 			break;
-+ 	}
-+ 
-+-out_put:
-+-	fput_light(sock->file, fput_needed);
-+-
-+ 	if (err == 0)
-+-		return datagrams;
-++		goto out_put;
-+ 
-+-	if (datagrams != 0) {
-++	if (datagrams == 0) {
-++		datagrams = err;
-++		goto out_put;
-++	}
-++
-++	/*
-++	 * We may return less entries than requested (vlen) if the
-++	 * sock is non block and there aren't enough datagrams...
-++	 */
-++	if (err != -EAGAIN) {
-+ 		/*
-+-		 * We may return less entries than requested (vlen) if the
-+-		 * sock is non block and there aren't enough datagrams...
-++		 * ... or  if recvmsg returns an error after we
-++		 * received some datagrams, where we record the
-++		 * error to return on the next call or if the
-++		 * app asks about it using getsockopt(SO_ERROR).
-+ 		 */
-+-		if (err != -EAGAIN) {
-+-			/*
-+-			 * ... or  if recvmsg returns an error after we
-+-			 * received some datagrams, where we record the
-+-			 * error to return on the next call or if the
-+-			 * app asks about it using getsockopt(SO_ERROR).
-+-			 */
-+-			sock->sk->sk_err = -err;
-+-		}
-+-
-+-		return datagrams;
-++		sock->sk->sk_err = -err;
-+ 	}
-++out_put:
-++	fput_light(sock->file, fput_needed);
-+ 
-+-	return err;
-++	return datagrams;
-+ }
-+ 
-+ SYSCALL_DEFINE5(recvmmsg, int, fd, struct mmsghdr __user *, mmsg,
-+-- 
-+2.10.0
-+
--- 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
@ -16,7 +16,7 @@ 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 cbd8a49..ac21e71 100644
+index 95f6d46..9ac1d60 100644
 --- a/target/linux/ar71xx/image/Makefile
 +++ b/target/linux/ar71xx/image/Makefile
@@ -736,6 +736,7 @@ define Device/tl-wa901nd-v4