From 91b4f75974c8c2137310d61c623d284b953494df Mon Sep 17 00:00:00 2001
From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com>
Date: Tue, 17 Nov 2020 19:18:01 +0800
Subject: [PATCH] mtwifi: adjust some files calling location (#5805)

---
 .../mt/drivers/mt_wifi/files/7603_7612-l1profile.dat  | 11 -----------
 .../mt/drivers/mt_wifi/files/7603_7615-l1profile.dat  |  4 ++--
 .../lean/mt/drivers/mt_wifi/files/7615.l1profile.dat  |  8 ++++----
 .../lean/mt/drivers/mt_wifi/files/dbdc.l1profile.dat  |  4 ++--
 package/lean/mt/drivers/mt_wifi/files/firmware.sh     |  4 ++--
 package/lean/mt/drivers/mt_wifi/files/mt7612.dat      |  5 ++---
 6 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/package/lean/mt/drivers/mt_wifi/files/7603_7612-l1profile.dat b/package/lean/mt/drivers/mt_wifi/files/7603_7612-l1profile.dat
index 393d31c07..01f255bbf 100644
--- a/package/lean/mt/drivers/mt_wifi/files/7603_7612-l1profile.dat
+++ b/package/lean/mt/drivers/mt_wifi/files/7603_7612-l1profile.dat
@@ -8,14 +8,3 @@ INDEX0_main_ifname=ra0
 INDEX0_ext_ifname=ra
 INDEX0_wds_ifname=wds
 INDEX0_apcli_ifname=apcli
-INDEX1=MT7612
-INDEX1_profile_path=/etc/wireless/mt7615/mt7615.2.dat
-INDEX1_EEPROM_offset=0x8000
-INDEX1_EEPROM_size=0x4000
-INDEX1_EEPROM_name=e2p
-INDEX1_main_ifname=rai0
-INDEX1_ext_ifname=rai
-INDEX1_wds_ifname=wdsi
-INDEX1_apcli_ifname=apclii
-INDEX1_single_sku_path=/etc_ro/Wireless/SingleSKU_mt7615e-sku.dat
-INDEX1_bf_sku_path=/etc_ro/Wireless/SingleSKU_mt7615e-sku-bf.dat
diff --git a/package/lean/mt/drivers/mt_wifi/files/7603_7615-l1profile.dat b/package/lean/mt/drivers/mt_wifi/files/7603_7615-l1profile.dat
index 04d0cb8f4..ca37a4ed6 100644
--- a/package/lean/mt/drivers/mt_wifi/files/7603_7615-l1profile.dat
+++ b/package/lean/mt/drivers/mt_wifi/files/7603_7615-l1profile.dat
@@ -17,5 +17,5 @@ INDEX1_main_ifname=rai0
 INDEX1_ext_ifname=rai
 INDEX1_wds_ifname=wdsi
 INDEX1_apcli_ifname=apclii
-INDEX1_single_sku_path=/etc_ro/Wireless/SingleSKU_mt7615e-sku.dat
-INDEX1_bf_sku_path=/etc_ro/Wireless/SingleSKU_mt7615e-sku-bf.dat
+INDEX1_single_sku_path=/etc_ro/Wireless/RT2860AP/SingleSKU.dat
+INDEX1_bf_sku_path=/etc_ro/Wireless/RT2860AP/SingleSKU_BF.dat
diff --git a/package/lean/mt/drivers/mt_wifi/files/7615.l1profile.dat b/package/lean/mt/drivers/mt_wifi/files/7615.l1profile.dat
index 7b75d07c4..e91b58e06 100644
--- a/package/lean/mt/drivers/mt_wifi/files/7615.l1profile.dat
+++ b/package/lean/mt/drivers/mt_wifi/files/7615.l1profile.dat
@@ -8,8 +8,8 @@ INDEX0_main_ifname=ra0
 INDEX0_ext_ifname=ra
 INDEX0_wds_ifname=wds
 INDEX0_apcli_ifname=apcli
-INDEX0_single_sku_path=/etc_ro/Wireless/SingleSKU_mt7615e-sku.dat
-INDEX0_bf_sku_path=/etc_ro/Wireless/SingleSKU_mt7615e-sku-bf.dat
+INDEX0_single_sku_path=/etc_ro/Wireless/RT2860AP/SingleSKU.dat
+INDEX0_bf_sku_path=/etc_ro/Wireless/RT2860AP/SingleSKU_BF.dat
 INDEX1=MT7615
 INDEX1_profile_path=/etc/wireless/mt7615/mt7615.2.dat
 INDEX1_EEPROM_offset=0x8000
@@ -19,5 +19,5 @@ INDEX1_main_ifname=rai0
 INDEX1_ext_ifname=rai
 INDEX1_wds_ifname=wdsi
 INDEX1_apcli_ifname=apclii
-INDEX1_single_sku_path=/etc_ro/Wireless/SingleSKU_mt7615e-sku.dat
-INDEX1_bf_sku_path=/etc_ro/Wireless/SingleSKU_mt7615e-sku-bf.dat
+INDEX1_single_sku_path=/etc_ro/Wireless/RT2860AP/SingleSKU.dat
+INDEX1_bf_sku_path=/etc_ro/Wireless/RT2860AP/SingleSKU_BF.dat
diff --git a/package/lean/mt/drivers/mt_wifi/files/dbdc.l1profile.dat b/package/lean/mt/drivers/mt_wifi/files/dbdc.l1profile.dat
index c9dbe8b01..79a619e86 100644
--- a/package/lean/mt/drivers/mt_wifi/files/dbdc.l1profile.dat
+++ b/package/lean/mt/drivers/mt_wifi/files/dbdc.l1profile.dat
@@ -8,5 +8,5 @@ INDEX0_main_ifname=ra0;rax0
 INDEX0_ext_ifname=ra;rax
 INDEX0_wds_ifname=wds;wdsx
 INDEX0_apcli_ifname=apcli;apclix
-INDEX0_single_sku_path=/etc_ro/Wireless/SingleSKU_mt7615e-sku.dat
-INDEX0_bf_sku_path=/etc_ro/Wireless/SingleSKU_mt7615e-sku-bf.dat
+INDEX0_single_sku_path=/etc_ro/Wireless/RT2860AP/SingleSKU.dat
+INDEX0_bf_sku_path=/etc_ro/Wireless/RT2860AP/SingleSKU_BF.dat
diff --git a/package/lean/mt/drivers/mt_wifi/files/firmware.sh b/package/lean/mt/drivers/mt_wifi/files/firmware.sh
index bcc8240ea..7e41c84d9 100644
--- a/package/lean/mt/drivers/mt_wifi/files/firmware.sh
+++ b/package/lean/mt/drivers/mt_wifi/files/firmware.sh
@@ -1,5 +1,7 @@
 #!/bin/sh /etc/rc.common
+
 chmod 0755 /sbin/mtkwifi
+
 START=15
 STOP=15
 
@@ -12,5 +14,3 @@ start_service() {
 stop_service() {
     echo 'do nothing' > /dev/null
 }
-
-
diff --git a/package/lean/mt/drivers/mt_wifi/files/mt7612.dat b/package/lean/mt/drivers/mt_wifi/files/mt7612.dat
index e61a3fc60..38a76f20a 100644
--- a/package/lean/mt/drivers/mt_wifi/files/mt7612.dat
+++ b/package/lean/mt/drivers/mt_wifi/files/mt7612.dat
@@ -91,8 +91,8 @@ AvgRssiReq=0
 DFS_R66=0
 BlockCh=
 GreenAP=0
-AuthMode=WPA2PSK;OPEN
-EncrypType=AES;NONE
+AuthMode=OPEN
+EncrypType=NONE
 WapiPsk1=
 WapiPsk2=
 WapiPsk3=
@@ -247,4 +247,3 @@ RadioOn=1
 IgmpSnEnable=1
 McastPhyMode=2
 McastMcs=0
-