diff --git a/package/lean/mt/luci-app-mtwifi/luasrc/controller/mtkwifi.lua b/package/lean/mt/luci-app-mtwifi/luasrc/controller/mtkwifi.lua index e39dcc2c2..4f66f9b91 100644 --- a/package/lean/mt/luci-app-mtwifi/luasrc/controller/mtkwifi.lua +++ b/package/lean/mt/luci-app-mtwifi/luasrc/controller/mtkwifi.lua @@ -769,14 +769,14 @@ function apcli_connect(dev, vif) mtkwifi.save_profile(cfgs, profiles[devname]) os.execute("ifconfig "..vifname.." up") - local brvifs = mtkwifi.__trim(mtkwifi.read_pipe("uci get network.lan.ifname")) - if not string.match(brvifs, vifname) then - brvifs = brvifs.." "..vifname - nixio.syslog("debug", "add "..vifname.." into lan") - os.execute("uci set network.lan.ifname=\""..brvifs.."\"") - os.execute("uci commit") - os.execute("ubus call network.interface.lan add_device \"{\\\"name\\\":\\\""..vifname.."\\\"}\"") - end +-- local brvifs = mtkwifi.__trim(mtkwifi.read_pipe("uci get network.lan.ifname")) +-- if not string.match(brvifs, vifname) then +-- brvifs = brvifs.." "..vifname +-- nixio.syslog("debug", "add "..vifname.." into lan") +-- os.execute("uci set network.lan.ifname=\""..brvifs.."\"") +-- os.execute("uci commit") +-- os.execute("ubus call network.interface.lan add_device \"{\\\"name\\\":\\\""..vifname.."\\\"}\"") +-- end os.execute("iwpriv "..vifname.." set MACRepeaterEn="..cfgs.MACRepeaterEn) os.execute("iwpriv "..vifname.." set ApCliEnable=0") @@ -815,14 +815,14 @@ function apcli_disconnect(dev, vif) os.execute("iwpriv "..vifname.." set ApCliEnable=0") - local brvifs = mtkwifi.__trim(mtkwifi.read_pipe("uci get network.lan.ifname")) - if string.match(brvifs, vifname) then - brvifs = mtkwifi.__trim(string.gsub(brvifs, vifname, "")) - nixio.syslog("debug", "add "..vifname.." into lan") - os.execute("uci set network.lan.ifname=\""..brvifs.."\"") - os.execute("uci commit") - os.execute("ubus call network.interface.lan remove_device \"{\\\"name\\\":\\\""..vifname.."\\\"}\"") - end +-- local brvifs = mtkwifi.__trim(mtkwifi.read_pipe("uci get network.lan.ifname")) +-- if string.match(brvifs, vifname) then +-- brvifs = mtkwifi.__trim(string.gsub(brvifs, vifname, "")) +-- nixio.syslog("debug", "add "..vifname.." into lan") +-- os.execute("uci set network.lan.ifname=\""..brvifs.."\"") +-- os.execute("uci commit") +-- os.execute("ubus call network.interface.lan remove_device \"{\\\"name\\\":\\\""..vifname.."\\\"}\"") +-- end os.execute("ifconfig "..vifname.." down") luci.http.redirect(luci.dispatcher.build_url("admin", "network", "wifi")) diff --git a/package/lean/mt/luci-app-mtwifi/luasrc/view/admin_mtk/mtk_wifi_overview.htm b/package/lean/mt/luci-app-mtwifi/luasrc/view/admin_mtk/mtk_wifi_overview.htm index f9b21125a..11e29ff7c 100644 --- a/package/lean/mt/luci-app-mtwifi/luasrc/view/admin_mtk/mtk_wifi_overview.htm +++ b/package/lean/mt/luci-app-mtwifi/luasrc/view/admin_mtk/mtk_wifi_overview.htm @@ -81,8 +81,10 @@ local devs = mtkwifi.get_all_devs() '" /> <% end %> '" /> - <% if dev.apcli.state == "down" then %> - '" /> + <% if dev.apcli then %> + <% if dev.apcli.state == "down" then %> + '" /> + <% end %> <% end %> '" /> diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index 5ee6afc48..9435f652e 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -986,8 +986,8 @@ define Device/xiaomi_mir3g DEVICE_MODEL := Mi Router 3G SUPPORTED_DEVICES += R3G SUPPORTED_DEVICES += mir3g - DEVICE_PACKAGES := kmod-mt7603 kmod-mt76x2 kmod-usb3 \ - kmod-usb-ledtrig-usbport wpad-openssl uboot-envtools + DEVICE_PACKAGES := kmod-mt7603e kmod-mt76x2e kmod-usb3 \ + kmod-usb-ledtrig-usbport luci-app-mtwifi uboot-envtools endef TARGET_DEVICES += xiaomi_mir3g diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network index 2d65c7c48..6f149146e 100755 --- a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network +++ b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network @@ -15,7 +15,6 @@ ramips_setup_interfaces() asiarf,ap7621-nv1|\ lenovo,newifi-d1|\ mikrotik,routerboard-m33g|\ - xiaomi,mir3g|\ xiaomi,mir3g-v2|\ xiaomi,mir4) ucidef_set_interfaces_lan_wan "lan1 lan2" "wan" @@ -23,7 +22,7 @@ ramips_setup_interfaces() d-team,newifi-d2) ucidef_add_switch "switch0" \ "0:lan:4" "1:lan:3" "2:lan:2" "3:lan:1" "4:wan:5" "6@eth0" - ucidef_set_interface_lan "eth0.1 ra0 rai0 apcli0 apclii0" + ucidef_set_interface_lan "eth0.1 ra0 rai0" ;; hiwifi,hc5962|\ xiaomi,mir3p) @@ -32,7 +31,7 @@ ramips_setup_interfaces() gehua,ghl-r-001) ucidef_add_switch "switch0" \ "0:lan" "1:lan" "2:lan" "4:wan" "6@eth0" - ucidef_set_interface_lan "eth0.1 ra0 rai0 apcli0 apclii0" + ucidef_set_interface_lan "eth0.1 ra0 rai0" ;; gnubee,gb-pc1|\ gnubee,gb-pc2) @@ -63,7 +62,7 @@ ramips_setup_interfaces() phicomm,k2p) ucidef_add_switch "switch0" \ "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "6@eth0" - ucidef_set_interface_lan "eth0.1 ra0 rax0 apcli0 apclix0" + ucidef_set_interface_lan "eth0.1 ra0 rax0" ;; ubnt,edgerouter-x) ucidef_set_interface_lan_wan "eth1 eth2 eth3 eth4" "eth0" @@ -74,12 +73,13 @@ ramips_setup_interfaces() xiaomi,mir3g) ucidef_add_switch "switch0" \ "2:lan:2" "3:lan:1" "1:wan" "6t@eth0" + ucidef_set_interface_lan "eth0.1 ra0 rai0" ;; xiaomi,mi-router-ac2100|\ xiaomi,redmi-router-ac2100) ucidef_add_switch "switch0" \ "0:wan" "2:lan:1" "3:lan:2" "4:lan:3" "6@eth0" - ucidef_set_interface_lan "eth0.2 ra0 rai0 apcli0 apclii0" + ucidef_set_interface_lan "eth0.2 ra0 rai0" ;; *) ucidef_set_interfaces_lan_wan "lan1 lan2 lan3 lan4" "wan"