From 5dfdb8b1008f7198073a6b2c10e506fa1cf5a816 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sun, 20 Dec 2020 17:05:05 +0100
Subject: Revert "dhcpv6: T3134: add missing duid support"

This reverts commit 9541355433e202fade4692851bffa33ba9d48f44.
---
 interface-definitions/include/dhcpv6-options.xml.i | 12 ------------
 interface-definitions/include/interface-mac.xml.i  |  2 +-
 2 files changed, 1 insertion(+), 13 deletions(-)

(limited to 'interface-definitions/include')

diff --git a/interface-definitions/include/dhcpv6-options.xml.i b/interface-definitions/include/dhcpv6-options.xml.i
index 997d4f2a4..9a1016956 100644
--- a/interface-definitions/include/dhcpv6-options.xml.i
+++ b/interface-definitions/include/dhcpv6-options.xml.i
@@ -4,18 +4,6 @@
     <help>DHCPv6 client settings/options</help>
   </properties>
   <children>
-    <leafNode name="duid">
-      <properties>
-        <help>DHCP unique identifier (DUID) to be sent by dhcpv6 client</help>
-        <valueHelp>
-          <format>&lt;h:h:h:h:h:h:h:h:h:h:h:h:h:h:h:h&gt;</format>
-          <description>DHCP unique identifier (DUID)</description>
-        </valueHelp>
-        <constraint>
-          <validator name="ipv6-duid"/>
-        </constraint>
-      </properties>
-    </leafNode>
     <leafNode name="parameters-only">
       <properties>
         <help>Acquire only config parameters, no address</help>
diff --git a/interface-definitions/include/interface-mac.xml.i b/interface-definitions/include/interface-mac.xml.i
index 87dc5fb60..e277de85c 100644
--- a/interface-definitions/include/interface-mac.xml.i
+++ b/interface-definitions/include/interface-mac.xml.i
@@ -3,7 +3,7 @@
   <properties>
     <help>Media Access Control (MAC) address</help>
     <valueHelp>
-      <format>macaddr</format>
+      <format>h:h:h:h:h:h</format>
       <description>Hardware (MAC) address</description>
     </valueHelp>
     <constraint>
-- 
cgit v1.2.3