From 4bb9d26c6d4c475b095d944c3154ff4f0f92a205 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sat, 7 Nov 2020 13:45:07 +0100
Subject: T2653: migrate "ip" and "ipv6" interface options to generic includes

This reduces duplicated #include statements as each interface type already
contained the individual includes.
---
 interface-definitions/interfaces-ethernet.xml.in | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

(limited to 'interface-definitions/interfaces-ethernet.xml.in')

diff --git a/interface-definitions/interfaces-ethernet.xml.in b/interface-definitions/interfaces-ethernet.xml.in
index 431322b75..83f3d9e46 100644
--- a/interface-definitions/interfaces-ethernet.xml.in
+++ b/interface-definitions/interfaces-ethernet.xml.in
@@ -55,25 +55,8 @@
             <defaultValue>auto</defaultValue>
           </leafNode>
           #include <include/interface-hw-id.xml.i>
-          <node name="ip">
-            <children>
-              #include <include/interface-arp-cache-timeout.xml.i>
-              #include <include/interface-disable-arp-filter.xml.i>
-              #include <include/interface-disable-forwarding.xml.i>
-              #include <include/interface-enable-arp-accept.xml.i>
-              #include <include/interface-enable-arp-announce.xml.i>
-              #include <include/interface-enable-arp-ignore.xml.i>
-              #include <include/interface-enable-proxy-arp.xml.i>
-              #include <include/interface-proxy-arp-pvlan.xml.i>
-            </children>
-          </node>
-          <node name="ipv6">
-            <children>
-              #include <include/ipv6-address.xml.i>
-              #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-68-16000.xml.i>
           <node name="offload-options">
-- 
cgit v1.2.3