From 0b47954ed9b0885f15163daac06e3cc13d6e19c4 Mon Sep 17 00:00:00 2001
From: Ycarus <ycarus@zugaina.org>
Date: Thu, 13 Sep 2018 13:51:29 +0200
Subject: [PATCH] Fix BPI-R2 wifi

---
 root/package/utils/wmt/Makefile           |  3 ++-
 root/package/utils/wmt/files/wmt.defaults | 33 ++++++-----------------
 root/package/utils/wmt/files/wmt.init     | 13 +++++++--
 3 files changed, 21 insertions(+), 28 deletions(-)

diff --git a/root/package/utils/wmt/Makefile b/root/package/utils/wmt/Makefile
index 94c48777..8844cc44 100644
--- a/root/package/utils/wmt/Makefile
+++ b/root/package/utils/wmt/Makefile
@@ -39,12 +39,13 @@ define Package/$(PKG_NAME)/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/wmt_loopback $(1)/usr/bin/
 	$(INSTALL_DIR) $(1)/system/etc/firmware
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/config/WMT_SOC.cfg $(1)/system/etc/firmware
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/config/WMT.cfg $(1)/system/etc/firmware
 	$(INSTALL_DIR) $(1)/etc/firmware
 	$(CP) -r $(PKG_BUILD_DIR)/firmware/* $(1)/etc/firmware/
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) ./files/wmt.init $(1)/etc/init.d/wmt
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
-	$(INSTALL_BIN) ./files/wmt.defaults $(1)/etc/uci-defaults/03wmt
+	$(INSTALL_BIN) ./files/wmt.defaults $(1)/etc/uci-defaults/8803-wmt
 endef
 
 $(eval $(call BuildPackage,$(PKG_NAME)))
diff --git a/root/package/utils/wmt/files/wmt.defaults b/root/package/utils/wmt/files/wmt.defaults
index c794cbc7..ff619a29 100644
--- a/root/package/utils/wmt/files/wmt.defaults
+++ b/root/package/utils/wmt/files/wmt.defaults
@@ -1,28 +1,11 @@
 #!/bin/sh
 
-uci batch <<-EOF
-	set wireless.mtk_ap=wifi-device
-	set wireless.mtk_ap.type=mac80211
-	set wireless.mtk_ap.channel=11
-	set wireless.mtk_ap.hwmode=11g
-	set wireless.mtk_ap.phy=mtkp2p0
-	set wireless.mtk_ap.htmode=HT20
-	set wireless.mtk_ap.disabled=1
-
-	set wireless.mtk_managed=wifi-device
-	set wireless.mtk_managed.type=mac80211
-	set wireless.mtk_managed.phy=mtkphy0
-	set wireless.mtk_managed.disabled=1
-
-	set wireless.default_mtk_ap=wifi-iface
-	set wireless.default_mtk_ap.device=mtk_ap
-	set wireless.default_mtk_ap.ifname=mtkap0
-	set wireless.default_mtk_ap.bss_load_update_period=0
-	set wireless.default_mtk_ap.network=lan
-	set wireless.default_mtk_ap.mode=ap
-	set wireless.default_mtk_ap.ssid=OpenWrt
-	set wireless.default_mtk_ap.encryption=none
-
-	commit wireless
-EOF
+if [ -z "$(uci -q get ucitrack.@wmt[0])" ]; then
+	uci -q batch <<-EOF
+		set ucitrack.@wmt[-1]=wmt
+		set ucitrack.@wmt[-1].init=wmt
+		add_list ucitrack.@wireless[0].affects=wmt
+		commit ucitrack
+	EOF
+fi
 exit 0
diff --git a/root/package/utils/wmt/files/wmt.init b/root/package/utils/wmt/files/wmt.init
index 6e353898..3b821c1f 100644
--- a/root/package/utils/wmt/files/wmt.init
+++ b/root/package/utils/wmt/files/wmt.init
@@ -1,10 +1,19 @@
 #!/bin/sh /etc/rc.common
 
-START=19
+START=69
 
 check_mtk_device() {
 	config_get phy "$1" phy
-	[ "$phy" = "mtkp2p0" ] && radiop2p="$1"
+	[ "$phy" = "mtkp2p0" ] && {
+		radiop2p="$1"
+		[ -z "$(uci -q get wireless.default_$1.ifname)" ] && {
+			uci -q batch <<-EOF
+				set wireless.default_$1.ifname=mtkap0
+				set wireless.default_$1.bss_load_update_period=0
+				commit wireless
+			EOF
+		}
+	}
 }
 
 find_radio() {