From f8baa878b12ee1444ee1a78a25b1c3a5ba28c1ab Mon Sep 17 00:00:00 2001
From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com>
Date: Sun, 5 Jul 2020 15:19:40 +0800
Subject: [PATCH] mtwifi: mt7615: update config and disable autoload (#4975)

---
 package/lean/mt/drivers/mt7615d/Makefile      |  2 -
 package/lean/mt/drivers/mt_wifi/Makefile      |  1 +
 .../mt/drivers/mt_wifi/files/82_load_wifi.sh  |  1 +
 .../lean/mt/drivers/mt_wifi/files/mt7615.dat  | 59 ++++---------------
 4 files changed, 13 insertions(+), 50 deletions(-)

diff --git a/package/lean/mt/drivers/mt7615d/Makefile b/package/lean/mt/drivers/mt7615d/Makefile
index dd4d13025..77af5924a 100644
--- a/package/lean/mt/drivers/mt7615d/Makefile
+++ b/package/lean/mt/drivers/mt7615d/Makefile
@@ -184,10 +184,8 @@ define KernelPackage/mt7615d
 ifneq ($(CONFIG_MTK_WHNAT_SUPPORT), )
   FILES:=$(PKG_BUILD_DIR)/mt_wifi_ap/mt_wifi.ko \
 	$(PKG_BUILD_DIR)/mt_wifi/embedded/tools/plug_in/whnat/mt_whnat.ko
-  AUTOLOAD:=$(call AutoProbe,mt_wifi mt_whnat)
 else
   FILES:=$(PKG_BUILD_DIR)/mt_wifi_ap/mt_wifi.ko
-  AUTOLOAD:=$(call AutoProbe,mt_wifi)
 endif
   SUBMENU:=Wireless Drivers
   MENU:=1
diff --git a/package/lean/mt/drivers/mt_wifi/Makefile b/package/lean/mt/drivers/mt_wifi/Makefile
index 439f0fde0..fe6051f44 100644
--- a/package/lean/mt/drivers/mt_wifi/Makefile
+++ b/package/lean/mt/drivers/mt_wifi/Makefile
@@ -52,6 +52,7 @@ else ifeq ($(CONFIG_MTK_CHIP_MT7603E_MT7615E),y)
 	$(INSTALL_BIN) ./files/mt7615.dat $(1)/etc/wireless/mt7615/mt7615.2.dat
 	$(INSTALL_BIN) ./files/82_load_wifi.sh $(1)/lib/preinit/
 else
+	$(INSTALL_BIN) ./files/82_load_wifi.sh $(1)/lib/preinit/
 endif
 	$(INSTALL_BIN) ./files/SingleSKU.dat $(1)/etc_ro/Wireless/RT2860AP/
 	$(INSTALL_BIN) ./files/SingleSKU_BF.dat $(1)/etc_ro/Wireless/RT2860AP/
diff --git a/package/lean/mt/drivers/mt_wifi/files/82_load_wifi.sh b/package/lean/mt/drivers/mt_wifi/files/82_load_wifi.sh
index 3c40e1518..ddbc7e783 100644
--- a/package/lean/mt/drivers/mt_wifi/files/82_load_wifi.sh
+++ b/package/lean/mt/drivers/mt_wifi/files/82_load_wifi.sh
@@ -4,6 +4,7 @@ load_wifi() {
 	local kernel_version=$(uname -r)
 	[ -e "/lib/modules/$kernel_version/mt7603e.ko" ] && modprobe mt7603e
 	[ -e "/lib/modules/$kernel_version/mt76x2_ap.ko" ] && modprobe mt76x2_ap
+	[ -e "/lib/modules/$kernel_version/mt_wifi.ko" ] && modprobe mt_wifi
 }
 
 boot_hook_add preinit_main load_wifi
diff --git a/package/lean/mt/drivers/mt_wifi/files/mt7615.dat b/package/lean/mt/drivers/mt_wifi/files/mt7615.dat
index 56f39e1e9..979f9a5fd 100644
--- a/package/lean/mt/drivers/mt_wifi/files/mt7615.dat
+++ b/package/lean/mt/drivers/mt_wifi/files/mt7615.dat
@@ -1,4 +1,3 @@
-#The word of "Default" must not be removed
 Default
 AccessControlList0=
 AccessControlList1=
@@ -61,7 +60,7 @@ APCwmin=4;4;3;2
 APSDCapable=1
 APTxop=0;0;94;47
 AuthMode=OPEN
-AutoChannelSelect=3
+AutoChannelSelect=0
 AutoChannelSkipList=
 AutoProvisionEn=0
 BandSteering=0
@@ -84,7 +83,7 @@ BW_Priority=
 BW_Root=0
 CalCacheApply=0
 CarrierDetect=0
-Channel=0
+Channel=36
 ChannelGrp=
 CountryCode=US
 CountryRegion=5
@@ -95,14 +94,14 @@ DBDC_MODE=0
 DebugFlags=0
 DefaultKeyID=1
 DfsCalibration=0
-DfsEnable=0
+DfsEnable=1
 DfsFalseAlarmPrevent=1
 DfsZeroWait=0
 DfsZeroWaitCacTime=255
 DisableOLBC=0
 DtimPeriod=1
-E2pAccessMode=1
-EAPifname=br-lan
+E2pAccessMode=2
+EAPifname=br0
 EDCCAEnable=1
 EncrypType=NONE
 EthConvertMode=dongle
@@ -134,7 +133,6 @@ HT_MCS=33
 HT_MpduDensity=5
 HT_OpMode=0
 HT_PROTECT=1
-HT_RDG=0
 HT_RxStream=4
 HT_STBC=1
 HT_TxStream=4
@@ -219,22 +217,14 @@ Key4Type=0
 LinkTestSupport=0
 MACRepeaterEn=
 MACRepeaterOuiMode=2
-MeshAuthMode=
-MeshAutoLink=0
-MeshDefaultkey=0
-MeshEncrypType=
-MeshId=
-MeshWEPKEY=
-MeshWPAKEY=
-MUTxRxEnable=0
+MUTxRxEnable=1
 NoForwarding=0
 NoForwardingBTNBSSID=0
-own_ip_addr=192.168.1.1
-
+own_ip_addr=10.10.10.254
 PcieAspm=0
 PERCENTAGEenable=0
 PhyRateLimit=0
-PMFMFPC=1
+PMFMFPC=0
 PMFMFPR=0
 PMFSHA256=0
 PMKCachePeriod=10
@@ -247,7 +237,7 @@ PowerUpVHT40=0:0:0:0:0:0:0
 PowerUpVHT80=0:0:0:0:0:0:0
 PreAntSwitch=
 PreAuth=0
-PreAuthifname=br-lan
+PreAuthifname=br0
 RadioLinkSelection=0
 RadioOn=1
 RADIUS_Acct_Key=
@@ -281,7 +271,7 @@ session_timeout_interval=0
 ShortSlot=1
 SKUenable=0
 SSID=
-SSID1=MTK_AP3
+SSID1=OpenWrt_5G
 SSID10=
 SSID11=
 SSID12=
@@ -351,28 +341,6 @@ VOW_WATF_Q_LV2=
 VOW_WATF_Q_LV3=
 VOW_WMM_Search_Rule_Band0=
 VOW_WMM_Search_Rule_Band1=
-WapiAsCertPath=
-WapiAsIpAddr=
-WapiAsPort=
-Wapiifname=
-WapiPsk1=
-WapiPsk10=
-WapiPsk11=
-WapiPsk12=
-WapiPsk13=
-WapiPsk14=
-WapiPsk15=
-WapiPsk16=
-WapiPsk2=
-WapiPsk3=
-WapiPsk4=
-WapiPsk5=
-WapiPsk6=
-WapiPsk7=
-WapiPsk8=
-WapiPsk9=
-WapiPskType=
-WapiUserCertPath=
 WCNTest=0
 Wds0Key=
 Wds1Key=
@@ -382,7 +350,7 @@ WdsEnable=0
 WdsEncrypType=NONE
 WdsList=
 WdsPhyMode=0
-WHNAT=1
+WHNAT=0
 WiFiTest=0
 WirelessMode=14
 WmmCapable=1
@@ -405,8 +373,3 @@ WPAPSK8=
 WPAPSK9=
 WscConfMode=0
 WscConfStatus=2
-WEP1Type1=0
-WEP2Type1=0
-WEP3Type1=0
-WEP4Type1=0
-WPSRadio=0