From bde145be541e7ba1ad9ed103f9dd82666295cacb Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Fri, 17 Aug 2012 08:18:06 +0000 Subject: protocols/core: write override mac to wifi-iface for wifi interfaces --- protocols/core/luasrc/model/cbi/admin_network/proto_dhcp.lua | 4 +--- protocols/core/luasrc/model/cbi/admin_network/proto_static.lua | 6 ++---- 2 files changed, 3 insertions(+), 7 deletions(-) (limited to 'protocols/core/luasrc/model') 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 5b22b8c85c..8d2bcc6f69 100644 --- a/protocols/core/luasrc/model/cbi/admin_network/proto_dhcp.lua +++ b/protocols/core/luasrc/model/cbi/admin_network/proto_dhcp.lua @@ -80,9 +80,7 @@ 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")) diff --git a/protocols/core/luasrc/model/cbi/admin_network/proto_static.lua b/protocols/core/luasrc/model/cbi/admin_network/proto_static.lua index 7c9d8e8f34..e6bfcbbe31 100644 --- a/protocols/core/luasrc/model/cbi/admin_network/proto_static.lua +++ b/protocols/core/luasrc/model/cbi/admin_network/proto_static.lua @@ -14,7 +14,7 @@ local map, section, net = ... local ifc = net:get_interface() local ipaddr, netmask, gateway, broadcast, dns, accept_ra, send_rs, ip6addr, ip6gw -local macaddr, mtu, metric +local mtu, metric ipaddr = section:taboption("general", Value, "ipaddr", translate("IPv4 address")) @@ -68,9 +68,7 @@ if luci.model.network:has_ipv6() then end -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")) -- cgit v1.2.3