Merge branch 'master' of https://github.com/openwrt/luci into proto=ipv6+aiccu+fixes

2 files changed, 4 insertions, 1 deletions

diff --git a/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_hnet.lua b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_hnet.lua
index b76475828..2ed34faf7 100644
--- a/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_hnet.lua
+++ b/protocols/luci-proto-ipv6/luasrc/model/cbi/admin_network/proto_hnet.lua
@@ -6,8 +6,11 @@ local map, section, net = ...
 local mode = section:taboption("general", ListValue, "mode", translate("Category"))
 mode:value("auto", translate("Automatic"))
 mode:value("external", translate("External"))
+mode:value("internal", translate("Internal"))
+mode:value("leaf", translate("Leaf"))
 mode:value("guest", translate("Guest"))
 mode:value("adhoc", translate("Ad-Hoc"))
+mode:value("hybrid", translate("Hybrid"))
 mode.default = "auto"
 
 
diff --git a/protocols/luci-proto-ipv6/luasrc/model/network/proto_hnet.lua b/protocols/luci-proto-ipv6/luasrc/model/network/proto_hnet.lua
index 4e9816bea..f525061be 100644
--- a/protocols/luci-proto-ipv6/luasrc/model/network/proto_hnet.lua
+++ b/protocols/luci-proto-ipv6/luasrc/model/network/proto_hnet.lua
@@ -12,5 +12,5 @@ function proto.is_installed(self)
 end
 
 function proto.opkg_package(self)
-	return "hnetd"
+	return "hnet-full"
 end