mtwifi: mt7615: fix multi-profile merge

* mtwifi: mt7615: fix multi-profile merge

Currently some settings like AutoChannelSelect, CountryRegion(ABand),
HT_BW/VHT_BW are not respected. This is due to wrong multi-profile
merging when l1profile.dat is not consistent with compiling flag
DEFAULT_5G_PROFILE.

5g profile should be put before 2g profile when DEFAULT_5G_PROFILE is
set.

References:
- 099439f051/package/lean/mt/drivers/mt7615d/Makefile (L52)
- 099439f051/package/lean/mt/drivers/mt7615d/src/mt_wifi/os/linux/rt_profile.c (L211)

* mtwifi: mt7615: fix reload
This commit is contained in:
Texot 2020-10-13 01:06:34 +08:00 committed by CN_SZTL
parent d19ba6f55d
commit 776b817ca6
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
2 changed files with 7 additions and 7 deletions

View File

@ -1,12 +1,12 @@
Default
INDEX0=MT7615
INDEX0_profile_path=/etc/wireless/mt7615/mt7615.1.2G.dat;/etc/wireless/mt7615/mt7615.1.5G.dat
INDEX0_profile_path=/etc/wireless/mt7615/mt7615.1.5G.dat;/etc/wireless/mt7615/mt7615.1.2G.dat
INDEX0_EEPROM_offset=0x0
INDEX0_EEPROM_size=0x4000
INDEX0_EEPROM_name=e2p
INDEX0_main_ifname=rax0;ra0
INDEX0_ext_ifname=rax;ra
INDEX0_wds_ifname=wdsx;wds
INDEX0_apcli_ifname=apclix;apcli
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

View File

@ -176,8 +176,8 @@ function mt7615_restart(devname)
local nixio = require("nixio")
nixio.syslog("debug", "mt7615_restart called!")
mt7615_down(devname)
os.execute("rmmod mt7615")
os.execute("modprobe mt7615")
os.execute("rmmod mt_wifi")
os.execute("modprobe mt_wifi")
mt7615_up(devname)
end