Merge Mainline

This commit is contained in:
CN_SZTL 2020-07-20 17:58:33 +08:00
commit 774a16483a
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
3 changed files with 5 additions and 5 deletions

View File

@ -19,10 +19,10 @@ sw_flow.description = translate("Software based offloading for routing/NAT")
sw_flow:depends("sfe_flow", 0)
end
if luci.sys.call("cat /proc/cpuinfo | grep -q MT7621") == 0 then
if luci.sys.call("cat /proc/cpuinfo | grep -q MT762") == 0 then
hw_flow = s:option(Flag, "hw_flow", translate("Hardware flow offloading"))
hw_flow.default = 0
hw_flow.description = translate("Requires hardware NAT support. Implemented at least for mt7621")
hw_flow.description = translate("Requires hardware NAT support. Implemented at least for mt762x")
hw_flow:depends("sw_flow", 1)
end

View File

@ -19,8 +19,8 @@ msgstr "基于软件的 Routing/NAT 分载"
msgid "Hardware flow offloading"
msgstr "硬件流量分载"
msgid "Requires hardware NAT support. Implemented at least for mt7621"
msgstr "需要硬件 NAT 支持。目前 mt7621 已实现"
msgid "Requires hardware NAT support. Implemented at least for mt762x"
msgstr "需要硬件 NAT 支持。目前 mt762x 已实现"
msgid "Shortcut-FE flow offloading"
msgstr "Shortcut-FE 流量分载"

View File

@ -1021,7 +1021,7 @@ define Device/xiaomi-ac2100
IMAGE/kernel1.bin := append-kernel
IMAGE/rootfs0.bin := append-ubi | check-size $$$$(IMAGE_SIZE)
IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata
IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | check-size
IMAGE/factory.bin := append-kernel | pad-to $$(KERNEL_SIZE) | append-ubi | check-size $$$$(IMAGE_SIZE)
DEVICE_VENDOR := Xiaomi
DEVICE_PACKAGES := kmod-mt7603e kmod-mt7615d luci-app-mtwifi uboot-envtools
endef