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.
---
 .../include/interface-ipv4-options.xml.i                | 17 +++++++++++++++++
 interface-definitions/include/interface-ipv4.xml.i      | 14 --------------
 .../include/interface-ipv6-options.xml.i                | 12 ++++++++++++
 interface-definitions/include/interface-ipv6.xml.i      | 12 ------------
 4 files changed, 29 insertions(+), 26 deletions(-)
 create mode 100644 interface-definitions/include/interface-ipv4-options.xml.i
 delete mode 100644 interface-definitions/include/interface-ipv4.xml.i
 create mode 100644 interface-definitions/include/interface-ipv6-options.xml.i
 delete mode 100644 interface-definitions/include/interface-ipv6.xml.i

(limited to 'interface-definitions/include')

diff --git a/interface-definitions/include/interface-ipv4-options.xml.i b/interface-definitions/include/interface-ipv4-options.xml.i
new file mode 100644
index 000000000..416e1adf5
--- /dev/null
+++ b/interface-definitions/include/interface-ipv4-options.xml.i
@@ -0,0 +1,17 @@
+<!-- included start from interface-ipv4-options.xml.i -->
+<node name="ip">
+  <properties>
+    <help>IPv4 routing parameters</help>
+  </properties>
+  <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>
+<!-- included end -->
diff --git a/interface-definitions/include/interface-ipv4.xml.i b/interface-definitions/include/interface-ipv4.xml.i
deleted file mode 100644
index 66842ab9b..000000000
--- a/interface-definitions/include/interface-ipv4.xml.i
+++ /dev/null
@@ -1,14 +0,0 @@
-<!-- included start from interface-ipv4.xml.i -->
-<node name="ip">
-  <properties>
-    <help>IPv4 routing parameters</help>
-  </properties>
-  <children>
-    #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>
-  </children>
-</node>
-<!-- included end -->
diff --git a/interface-definitions/include/interface-ipv6-options.xml.i b/interface-definitions/include/interface-ipv6-options.xml.i
new file mode 100644
index 000000000..a94c6572b
--- /dev/null
+++ b/interface-definitions/include/interface-ipv6-options.xml.i
@@ -0,0 +1,12 @@
+<!-- included start from interface-ipv6-options.xml.i -->
+<node name="ipv6">
+  <properties>
+    <help>IPv6 routing parameters</help>
+  </properties>
+  <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>
+<!-- included end -->
diff --git a/interface-definitions/include/interface-ipv6.xml.i b/interface-definitions/include/interface-ipv6.xml.i
deleted file mode 100644
index c9299890b..000000000
--- a/interface-definitions/include/interface-ipv6.xml.i
+++ /dev/null
@@ -1,12 +0,0 @@
-<!-- included start from interface-ipv6.xml.i -->
-<node name="ipv6">
-  <properties>
-    <help>IPv6 routing parameters</help>
-  </properties>
-  <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>
-<!-- included end -->
-- 
cgit v1.2.3