From 8690e152deee6c330ca61fc5ef520dacd8ef3135 Mon Sep 17 00:00:00 2001
From: Xiaok <me@luxiaok.com>
Date: Fri, 13 Mar 2020 22:51:56 +0800
Subject: [PATCH 1/2] frp: bump to 0.32.0 (#3791)

---
 package/lean/frp/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package/lean/frp/Makefile b/package/lean/frp/Makefile
index 4a1cc2c1c..2f063590d 100644
--- a/package/lean/frp/Makefile
+++ b/package/lean/frp/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=frp
-PKG_VERSION:=0.31.2
-PKG_RELEASE:=2
+PKG_VERSION:=0.32.0
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/fatedier/frp/tar.gz/v$(PKG_VERSION)?
-PKG_HASH:=790a18f5651cc645a3d73fc147c719f5b212fc21db0c51c620011ee836b7a28f
+PKG_HASH:=39162780b28c0019207d83919530b573fac0bef8df30f1b6a5860886b0616c67
 
 PKG_LICENSE:=Apache-2.0
 PKG_LICENSE_FILES:=LICENSE
@@ -65,4 +65,4 @@ $(foreach component,$(FRP_COMPONENTS), \
   $(eval $(call frp/templates,$(component))) \
   $(eval $(call GoBinPackage,$(component))) \
   $(eval $(call BuildPackage,$(component))) \
-)
\ No newline at end of file
+)

From 978c3f7a608006a784e207ecbd1c9c3f637fe932 Mon Sep 17 00:00:00 2001
From: haxc <haxc@qq.com>
Date: Fri, 13 Mar 2020 22:52:20 +0800
Subject: [PATCH 2/2] Fix mw4530r forgot to add network settings (#3788)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* ath79: add support for TP-Link TL-WR882N/WR885N/WR886N

This adds support for the various clones of the TL-WR885N recently
supported  ("ath79: add support for TP-Link TL-WR885N v1"):

- tplink,tl-wr882n-v1
- tplink,tl-wr882n-v2
- tplink,tl-wr882n-v3
- tplink,tl-wr885n-v1
- tplink,tl-wr885n-v2
- tplink,tl-wr886n-v2
- tplink,tl-wr886n-v3
- tplink,tl-wr886n-v4
- tplink,tl-wr886n-v5
- tplink,tl-wr886n-v6
- tplink,tl-wr886n-v7

These devices are cloned in ar71xx. All models added in this patch are the same hardware CPU

WR885n V2 was tested.

Specifications:
- SOC: Qualcomm Atheros TP9343-AL3A
- CPU: 750MHz
- Flash: 2 MiB (AH1446 25Q16BS1G E5N102)
- RAM: 16 MiB (Zentel A3S28D40JTP-50)
- WLAN: Qualcomm Atheros TP9343 450Mbps
- Ethernet: Atheros AR8228/AR8229  4 port (100M)

添加TP9343芯片的路由器型号支持，TL-WR882N/WR885N/WR886N系列

* ath79: add support for MerCury MW4530R v1

重新添加水星MW4530R路由器支持

* Repair generate mw4530r firmware default is 8M

* Fix mw4530r forgot to add network settings
---
 target/linux/ar71xx/base-files/etc/board.d/02_network | 1 +
 1 file changed, 1 insertion(+)

diff --git a/target/linux/ar71xx/base-files/etc/board.d/02_network b/target/linux/ar71xx/base-files/etc/board.d/02_network
index 483075d06..ad4c5b8c4 100755
--- a/target/linux/ar71xx/base-files/etc/board.d/02_network
+++ b/target/linux/ar71xx/base-files/etc/board.d/02_network
@@ -522,6 +522,7 @@ ar71xx_setup_interfaces()
 		;;
 	archer-c7-v4|\
 	archer-c7-v5|\
+	mc-mw4530r|\
 	tl-wdr4300|\
 	tl-wr880n-v1|\
 	tl-wr881n-v1|\