diff --git a/feeds.conf.default b/feeds.conf.default index bf53c57b535798..d25e2f6d2310cc 100644 --- a/feeds.conf.default +++ b/feeds.conf.default @@ -1,4 +1,4 @@ src-git packages https://github.com/openwrt/packages.git;openwrt-18.06 -src-git luci https://github.com/openwrt/luci.git^80cb4fef8c7db0dadc373fef122d7abb092a7191 +src-git luci https://github.com/openwrt/luci.git^fb70693b7db1d4fcaf79f1ed2a3dadd9cd0ecd45 src-git routing https://git.openwrt.org/feed/routing.git;openwrt-18.06 #src-git telephony https://git.openwrt.org/feed/telephony.git;openwrt-18.06 \ No newline at end of file diff --git a/package/lean/luci-app-flowoffload/Makefile b/package/lean/luci-app-flowoffload/Makefile index 062cce54123aab..8b9a3ac63d0ad3 100644 --- a/package/lean/luci-app-flowoffload/Makefile +++ b/package/lean/luci-app-flowoffload/Makefile @@ -9,7 +9,7 @@ LUCI_TITLE:=LuCI support for Flow Offload LUCI_DEPENDS:=@LINUX_4_14 LUCI_PKGARCH:=all PKG_VERSION:=1.0 -PKG_RELEASE:=6 +PKG_RELEASE:=7 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/package/lean/luci-app-flowoffload/luasrc/controller/flowoffload.lua b/package/lean/luci-app-flowoffload/luasrc/controller/flowoffload.lua index 54c2e379230f2a..5a20c2a10ad65c 100644 --- a/package/lean/luci-app-flowoffload/luasrc/controller/flowoffload.lua +++ b/package/lean/luci-app-flowoffload/luasrc/controller/flowoffload.lua @@ -1,7 +1,7 @@ module("luci.controller.flowoffload", package.seeall) function index() - if not nixio.fs.access("/etc/config/firewall") then + if not nixio.fs.access("/sys/module/xt_FLOWOFFLOAD/refcnt") then return end local page diff --git a/package/lean/luci-app-flowoffload/luasrc/model/cbi/flowoffload.lua b/package/lean/luci-app-flowoffload/luasrc/model/cbi/flowoffload.lua index 48a7c58cec70da..8a9dea47af3f8f 100644 --- a/package/lean/luci-app-flowoffload/luasrc/model/cbi/flowoffload.lua +++ b/package/lean/luci-app-flowoffload/luasrc/model/cbi/flowoffload.lua @@ -19,6 +19,7 @@ hw = s:option(Flag, "flow_offloading_hw", translate("HWNAT")) hw.default = 0 hw.rmempty = false hw.description = translate("Enable Hardware NAT (depends on hw capability like MTK 762x)") +hw:depends( "flow_offloading", 1)