diff --git a/package/lean/luci-app-mtwifi/luasrc/controller/mtkwifi.lua b/package/lean/luci-app-mtwifi/luasrc/controller/mtkwifi.lua index 4499fc563b..4f66f9b914 100644 --- a/package/lean/luci-app-mtwifi/luasrc/controller/mtkwifi.lua +++ b/package/lean/luci-app-mtwifi/luasrc/controller/mtkwifi.lua @@ -791,9 +791,6 @@ function apcli_connect(dev, vif) or cfgs.ApCliAuthMode == "WPA1PSKWPA2PSK" then os.execute("iwpriv "..vifname.." set ApCliWPAPSK="..cfgs.ApCliWPAPSK) end - if cfgs.ApCliBssid ~= nil then - os.execute("iwpriv "..vifname.." set ApCliBssid="..cfgs.ApCliBssid) - end os.execute("iwpriv "..vifname.." set ApCliSsid=\""..cfgs.ApCliSsid.."\"") os.execute("iwpriv "..vifname.." set ApCliEnable=1") luci.http.redirect(luci.dispatcher.build_url("admin", "network", "wifi")) diff --git a/package/lean/luci-app-mtwifi/luasrc/view/admin_mtk/mtk_wifi_apcli.htm b/package/lean/luci-app-mtwifi/luasrc/view/admin_mtk/mtk_wifi_apcli.htm index 3828e0ddc6..eb5995b860 100644 --- a/package/lean/luci-app-mtwifi/luasrc/view/admin_mtk/mtk_wifi_apcli.htm +++ b/package/lean/luci-app-mtwifi/luasrc/view/admin_mtk/mtk_wifi_apcli.htm @@ -85,13 +85,6 @@ local debug = 0 - - BSSID - - - - 可选 - 上级无线信道 @@ -314,7 +307,6 @@ local debug = 0 function choose_rootap(index) { document.getElementById("ApCliSsid").value=decode_ssid(ap_list[index].ssid); - document.getElementById("ApCliBssid").value=ap_list[index].bssid; document.getElementById("Channel").value=ap_list[index].channel; document.getElementById("ApCliAuthMode").value=ap_list[index].authmode; if (ap_list[index].authmode == "WPA2PSK" diff --git a/package/lean/luci-app-mtwifi/root/usr/lib/lua/mtkwifi.lua b/package/lean/luci-app-mtwifi/root/usr/lib/lua/mtkwifi.lua index 397cf00603..418debf907 100644 --- a/package/lean/luci-app-mtwifi/root/usr/lib/lua/mtkwifi.lua +++ b/package/lean/luci-app-mtwifi/root/usr/lib/lua/mtkwifi.lua @@ -851,10 +851,6 @@ function mtkwifi.scan_ap(vifname) tmp.ssid = mtkwifi.__trim(string.sub(line, xx.SSID[1], xx.SSID[1]+xx.SSID[2])) tmp.bssid = string.upper(mtkwifi.__trim(string.sub(line, xx.BSSID[1], xx.BSSID[1]+xx.BSSID[2]))) tmp.security = mtkwifi.__trim(string.sub(line, xx.Security[1], xx.Security[1]+xx.Security[2])) - tmp.security = string.gsub(tmp.security, "WPA1PSKWPA2PSK", "WPAPSKWPA2PSK") - if (string.find(tmp.security, "/") == nil) then - tmp.security = "OPEN" .. "/" .. tmp.security - end tmp.authmode = mtkwifi.__trim(string.split(tmp.security, "/")[1]) tmp.encrypttype = mtkwifi.__trim(string.split(tmp.security, "/")[2] or "NONE") tmp.rssi = mtkwifi.__trim(string.sub(line, xx.Signal[1], xx.Signal[1]+xx.Signal[2])) diff --git a/package/lean/mt-drivers/mt_wifi/files/mt7615.lua b/package/lean/mt-drivers/mt_wifi/files/mt7615.lua index 9b69f0779c..69aab05ae9 100644 --- a/package/lean/mt-drivers/mt_wifi/files/mt7615.lua +++ b/package/lean/mt-drivers/mt_wifi/files/mt7615.lua @@ -25,10 +25,6 @@ end function add_vif_into_lan(vif) local mtkwifi = require("mtkwifi") - local wanif = mtkwifi.__trim(mtkwifi.read_pipe("uci get network.wan.ifname")) - if ('' ~= wanif and string.match(vif, wanif)) then - return - end local brvifs = mtkwifi.__trim( mtkwifi.read_pipe("uci get network.lan.ifname")) if not string.match(brvifs, esc(vif)) then @@ -102,7 +98,6 @@ function mt7615_up(devname) end os.execute(" rm -rf /tmp/mtk/wifi/mt7615*.need_reload") - os.execute("/etc/init.d/network restart") end function mt7615_down(devname) diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index 3814dd84a7..ac923e1a44 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -989,10 +989,8 @@ define Device/phicomm_k2p IMAGE_SIZE := 15744k DEVICE_VENDOR := Phicomm DEVICE_MODEL := K2P - DEVICE_ALT0_VENDOR := Phicomm - DEVICE_ALT0_MODEL := KE 2P SUPPORTED_DEVICES += k2p - DEVICE_PACKAGES := kmod-mt7615e kmod-mt7615-firmware + DEVICE_PACKAGES := kmod-mt7615d luci-app-mtwifi -wpad-basic-wolfssl endef TARGET_DEVICES += phicomm_k2p