From 0c9424578824b5f43f3b27306330a69a9a2e1762 Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Tue, 7 Jul 2020 17:02:20 +0800 Subject: [PATCH 1/2] mtwifi: update dual 7615 config (Thx zmzhuai and MeIsReallyBa) (#5025) --- package/lean/mt/drivers/mt7615d/config.in | 2 ++ package/lean/mt/drivers/mt_wifi/files/mt7615.2G.dat | 4 ++-- package/lean/mt/drivers/mt_wifi/files/mt7615.5G.dat | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/package/lean/mt/drivers/mt7615d/config.in b/package/lean/mt/drivers/mt7615d/config.in index 24f1bcd673ba0f..4e25a0d658302e 100644 --- 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 index 71f486e052e85d..013491f6e4106c 100644 --- 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 index 4218b7011af588..449c0c44d5aaf1 100644 --- 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 From 74b263ba938223f90aea67b7236fc32b2ed011cb Mon Sep 17 00:00:00 2001 From: NivalXer Date: Tue, 7 Jul 2020 18:19:10 +0800 Subject: [PATCH 2/2] mwlwifi:add disable-amsdu patch (#5027) --- .../kernel/mwlwifi/patches/002-disable-AMSDU.patch | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 package/kernel/mwlwifi/patches/002-disable-AMSDU.patch diff --git a/package/kernel/mwlwifi/patches/002-disable-AMSDU.patch b/package/kernel/mwlwifi/patches/002-disable-AMSDU.patch new file mode 100644 index 00000000000000..3fd48ca57e50d2 --- /dev/null +++ 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);