fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "ramips: use upstream mt76 wireless driver by default"

Browse Source 
This reverts commit 2514225e14.
This commit is contained in:
AmadeusGhost 2020-11-03 11:20:05 +08:00
parent 140c8fdaa1
commit 31268a591d
5 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
package/lean/luci-app-mtwifi/luasrc/controller/mtkwifi.lua
View File

@ -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"))

8
package/lean/luci-app-mtwifi/luasrc/view/admin_mtk/mtk_wifi_apcli.htm
View File

@ -85,13 +85,6 @@ local debug = 0
</td>
<td></td>
</tr>
<tr>
<td>BSSID</td>
<td>
<input type="text" name="ApCliBssid" id="ApCliBssid" value="<%=cfgs.ApCliBssid%>"/>
</td>
<td><span style="color:green;">可选</span></td>
</tr>
<tr>
<td>上级无线信道</td>
<td>
@ -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"

4
package/lean/luci-app-mtwifi/root/usr/lib/lua/mtkwifi.lua
View File

@ -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]))

5
package/lean/mt-drivers/mt_wifi/files/mt7615.lua
View File

@ -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)

4
target/linux/ramips/image/mt7621.mk
View File

@ -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