Remove remaining references to boa and lucid

[project/luci.git] / protocols / core / luasrc / model / cbi / admin_network / proto_dhcp.lua

diff --git a/protocols/core/luasrc/model/cbi/admin_network/proto_dhcp.lua b/protocols/core/luasrc/model/cbi/admin_network/proto_dhcp.lua
index 391eb1e0137318d60b4f5ad4b32f1cd8bcd1c5e8..fe3fec6fa12b998b4e14055d03ce8002f59d3e1e 100644 (file)
--- a/protocols/core/luasrc/model/cbi/admin_network/proto_dhcp.lua
+++ b/protocols/core/luasrc/model/cbi/admin_network/proto_dhcp.lua
@@ -24,18 +24,6 @@ hostname.placeholder = luci.sys.hostname()
 hostname.datatype    = "hostname"
 
 
-if luci.model.network:has_ipv6() then
-
-       accept_ra = s:taboption("general", Flag, "accept_ra", translate("Accept router advertisements"))
-       accept_ra.default = accept_ra.enabled
-
-
-       send_rs = s:taboption("general", Flag, "send_rs", translate("Send router solicitations"))
-       send_rs.default = send_rs.disabled
-       send_rs:depends("accept_ra", "")
-
-end
-
 bcast = section:taboption("advanced", Flag, "broadcast",
        translate("Use broadcast flag"),
        translate("Required for certain ISPs, e.g. Charter with DOCSIS 3"))
@@ -43,7 +31,7 @@ bcast = section:taboption("advanced", Flag, "broadcast",
 bcast.default = bcast.disabled
 
 
-defaultroute = section:taboption("advanced", Flag, "gateway",
+defaultroute = section:taboption("advanced", Flag, "defaultroute",
        translate("Use default gateway"),
        translate("If unchecked, no default route is configured"))
 
@@ -70,7 +58,6 @@ metric = section:taboption("advanced", Value, "metric",
 
 metric.placeholder = "0"
 metric.datatype    = "uinteger"
-metric:depends("gateway", "1")
 
 
 clientid = section:taboption("advanced", Value, "clientid",
@@ -81,11 +68,9 @@ vendorclass = section:taboption("advanced", Value, "vendorid",
        translate("Vendor Class to send when requesting DHCP"))
 
 
-macaddr = section:taboption("advanced", Value, "macaddr", translate("Override MAC address"))
-macaddr.placeholder = ifc and ifc:mac() or "00:00:00:00:00:00"
-macaddr.datatype    = "macaddr"
+luci.tools.proto.opt_macaddr(section, ifc, translate("Override MAC address"))
 
 
 mtu = section:taboption("advanced", Value, "mtu", translate("Override MTU"))
 mtu.placeholder = "1500"
-mtu.datatype    = "max(1500)"
+mtu.datatype    = "max(9200)"