Merge branch 'master' of https://github.com/coolsnowwolf/lede

alexliu269 · Jul 7, 2020 · 86d0c13 · 86d0c13
2 parents 7f73591 + 74b263b
commit 86d0c13
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/package/kernel/mwlwifi/patches/002-disable-AMSDU.patch b/package/kernel/mwlwifi/patches/002-disable-AMSDU.patch
@@ -0,0 +1,11 @@
+--- a/core.c
++++ b/core.c
+@@ -982,7 +982,7 @@ struct ieee80211_hw *mwl_alloc_hw(int bu
+ 	priv->use_short_preamble = false;
+ 	priv->disable_2g = false;
+ 	priv->disable_5g = false;
+-	priv->tx_amsdu = true;
++	priv->tx_amsdu = false;
+ 	priv->hif.bus = bus_type;
+ 	priv->hif.ops = ops;
+ 	priv->hif.priv = (char *)priv + ALIGN(sizeof(*priv), NETDEV_ALIGN);
diff --git a/package/lean/mt/drivers/mt7615d/config.in b/package/lean/mt/drivers/mt7615d/config.in
@@ -47,6 +47,8 @@ endchoice
 
 choice
 	prompt "Choose Second WiFi Interface"
+	default MTK_SECOND_IF_NONE if TARGET_ramips_mt7621_DEVICE_phicomm_k2p || PACKAGE_kmod-mt7603e
+	default MTK_SECOND_IF_MT7615E
 
 config MTK_SECOND_IF_NONE
 	bool "None"

diff --git a/package/lean/mt/drivers/mt_wifi/files/mt7615.2G.dat b/package/lean/mt/drivers/mt_wifi/files/mt7615.2G.dat
@@ -134,9 +134,9 @@ HT_MCS=33
 HT_MpduDensity=5
 HT_OpMode=0
 HT_PROTECT=1
-HT_RxStream=2
+HT_RxStream=4
 HT_STBC=1
-HT_TxStream=2
+HT_TxStream=4
 IcapMode=0
 idle_timeout_interval=0
 IEEE80211H=1

diff --git a/package/lean/mt/drivers/mt_wifi/files/mt7615.5G.dat b/package/lean/mt/drivers/mt_wifi/files/mt7615.5G.dat
@@ -134,9 +134,9 @@ HT_MCS=33
 HT_MpduDensity=5
 HT_OpMode=0
 HT_PROTECT=1
-HT_RxStream=2
+HT_RxStream=4
 HT_STBC=1
-HT_TxStream=2
+HT_TxStream=4
 IcapMode=0
 idle_timeout_interval=0
 IEEE80211H=1