From 6667e63585bf1b2ba042d4069926c78ae8bfc6e5 Mon Sep 17 00:00:00 2001
From: coolsnowwolf <coolsnowwolf@gmail.com>
Date: Sun, 25 Jul 2021 14:52:52 +0800
Subject: [PATCH] quantenna: use /etc/config/wireless to config

---
 package/firmware/quantenna/Makefile             |  7 +++----
 .../quantenna/files/lib/wifi/quantenna.sh       |  2 +-
 .../quantenna/files/qtn-firmware.defaults       | 16 ----------------
 package/firmware/quantenna/files/qtn.wireless   | 17 +++++++++++++++++
 4 files changed, 21 insertions(+), 21 deletions(-)
 delete mode 100644 package/firmware/quantenna/files/qtn-firmware.defaults
 create mode 100644 package/firmware/quantenna/files/qtn.wireless

diff --git a/package/firmware/quantenna/Makefile b/package/firmware/quantenna/Makefile
index 19fd1257c..d8d62762d 100644
--- a/package/firmware/quantenna/Makefile
+++ b/package/firmware/quantenna/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=quantenna
 PKG_VERSION:=37.3.2.44
-PKG_RELEASE:=8
+PKG_RELEASE:=9
 
 PKG_MAINTAINER:=lean
 
@@ -50,17 +50,18 @@ define Package/qtn-utils/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_DIR) $(1)/etc/config
 	$(CP) $(PKG_BUILD_DIR)/libqcsapi_client.so* $(1)/usr/lib/
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/qcsapi_sockrpc $(1)/usr/sbin/
 	ln -s /tmp/qcsapi_target_ip.conf $(1)/etc
 	$(INSTALL_BIN) ./files/qtn-utils.init $(1)/etc/init.d/qtn-utils
+	$(INSTALL_DATA) ./files/qtn.wireless $(1)/etc/config/wireless
 endef
 
 define Package/qtn-firmware
   SECTION:=firmware
   CATEGORY:=Firmware
   TITLE:=Quantenna QV840 (QTS1000) firmware
-  DEPENDS:=+dnsmasq
 endef
 
 define Package/qtn-firmware/description
@@ -69,7 +70,6 @@ endef
 
 define Package/qtn-firmware/install
 	$(INSTALL_DIR) $(1)/lib/firmware/qtn
-	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_DATA) \
 		$(PKG_BUILD_DIR)/u-boot.bin \
 		$(PKG_BUILD_DIR)/topaz-linux.lzma.img \
@@ -77,7 +77,6 @@ define Package/qtn-firmware/install
 	ln -s u-boot.bin $(1)/lib/firmware/qtn/uboot_qsr1000.img
 	ln -s topaz-linux.lzma.img $(1)/lib/firmware/qtn/fmac_qsr1000.img
 	cd $(1)/lib/firmware && ln -s qtn/u-boot.bin . && ln -s qtn/topaz-linux.lzma.img .
-	$(INSTALL_BIN) ./files/qtn-firmware.defaults $(1)/etc/uci-defaults
 endef
 
 define Package/qtn-proto
diff --git a/package/firmware/quantenna/files/lib/wifi/quantenna.sh b/package/firmware/quantenna/files/lib/wifi/quantenna.sh
index 0adb65640..ae688939a 100644
--- a/package/firmware/quantenna/files/lib/wifi/quantenna.sh
+++ b/package/firmware/quantenna/files/lib/wifi/quantenna.sh
@@ -23,7 +23,7 @@ detect_quantenna() {
 	uci -q batch <<-EOF
 		set wireless.radio${devidx}=wifi-device
 		set wireless.radio${devidx}.type=quantenna
-		set wireless.radio${devidx}.channel=${channel:-36}
+		set wireless.radio${devidx}.channel=149
 		set wireless.radio${devidx}.hwmode=11ac
 		set wireless.radio${devidx}.band=5g
 		set wireless.radio${devidx}.htmode=VHT80
diff --git a/package/firmware/quantenna/files/qtn-firmware.defaults b/package/firmware/quantenna/files/qtn-firmware.defaults
deleted file mode 100644
index fac5dca11..000000000
--- a/package/firmware/quantenna/files/qtn-firmware.defaults
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-# no need for tftp service if the Quantenna module is PCIe connected
-[ "$(basename "$(readlink /sys/class/net/host0/device/driver)")" = "qdpc_host" ]  && exit 0
-
-uci -q get dhcp.qtn_rgmii >/dev/null && exit 0
-touch /etc/config/dhcp
-
-uci batch <<EOF
-set dhcp.qtn_rgmii=dnsmasq
-set dhcp.qtn_rgmii.enable_tftp=1
-set dhcp.qtn_rgmii.tftp_root=/lib/firmware/qtn
-set dhcp.qtn_rgmii.interface='qtn'
-set dhcp.qtn_rgmii.port=0
-commit dhcp
-EOF
diff --git a/package/firmware/quantenna/files/qtn.wireless b/package/firmware/quantenna/files/qtn.wireless
new file mode 100644
index 000000000..e41bf4484
--- /dev/null
+++ b/package/firmware/quantenna/files/qtn.wireless
@@ -0,0 +1,17 @@
+
+config wifi-device 'radio1'
+	option type 'quantenna'
+	option channel '149'
+	option hwmode '11ac'
+	option band '5g'
+	option htmode 'VHT80'
+	option phy 'host0'
+	option disabled '0'
+
+config wifi-iface 'default_radio1'
+	option device 'radio1'
+	option network 'lan'
+	option mode 'ap'
+	option ssid 'OpenWrt-5G'
+	option encryption 'psk2+ccmp'
+	option key '12345678'