From fba02be6d0e9c9d0d31de7e26865c001c3bad88b Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sat, 7 Nov 2020 13:46:34 +0100
Subject: geneve: T2653: include common "ip" and "ipv6" interface options

---
 interface-definitions/interfaces-geneve.xml.in | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/interface-definitions/interfaces-geneve.xml.in b/interface-definitions/interfaces-geneve.xml.in
index 25bf12bfe..0c776e3c3 100644
--- a/interface-definitions/interfaces-geneve.xml.in
+++ b/interface-definitions/interfaces-geneve.xml.in
@@ -19,21 +19,8 @@
           #include <include/address-ipv4-ipv6.xml.i>
           #include <include/interface-description.xml.i>
           #include <include/interface-disable.xml.i>
-          <node name="ip">
-            <properties>
-              <help>IPv4 routing parameters</help>
-            </properties>
-            <children>
-              #include <include/interface-arp-cache-timeout.xml.i>
-              #include <include/interface-enable-proxy-arp.xml.i>
-            </children>
-          </node>
-          <node name="ipv6">
-            <children>
-              #include <include/ipv6-disable-forwarding.xml.i>
-              #include <include/ipv6-dup-addr-detect-transmits.xml.i>
-            </children>
-          </node>
+          #include <include/interface-ipv4-options.xml.i>
+          #include <include/interface-ipv6-options.xml.i>
           #include <include/interface-mac.xml.i>
           #include <include/interface-mtu-1450-16000.xml.i>
           <leafNode name="remote">
-- 
cgit v1.2.3