diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-11-07 13:45:07 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2020-11-07 13:45:07 +0100 |
| commit | 4bb9d26c6d4c475b095d944c3154ff4f0f92a205 (patch) | |
| tree | 17ad0be2622b2a3003b40ab98a3da551787bf558 /interface-definitions/interfaces-bridge.xml.in | |
| parent | c99150f516c5555e15f454aca49c59b954a2d9f1 (diff) | |
| download | vyos-1x-4bb9d26c6d4c475b095d944c3154ff4f0f92a205.tar.gz vyos-1x-4bb9d26c6d4c475b095d944c3154ff4f0f92a205.zip | |
T2653: migrate "ip" and "ipv6" interface options to generic includes
This reduces duplicated #include statements as each interface type already
contained the individual includes.
Diffstat (limited to 'interface-definitions/interfaces-bridge.xml.in')
| -rw-r--r-- | interface-definitions/interfaces-bridge.xml.in | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/interface-definitions/interfaces-bridge.xml.in b/interface-definitions/interfaces-bridge.xml.in index 0a777865b..ccd6db9e4 100644 --- a/interface-definitions/interfaces-bridge.xml.in +++ b/interface-definitions/interfaces-bridge.xml.in @@ -81,23 +81,8 @@ </leafNode> </children> </node> - <node name="ip"> - <children> - #include <include/interface-arp-cache-timeout.xml.i> - #include <include/interface-enable-arp-accept.xml.i> - #include <include/interface-disable-forwarding.xml.i> - #include <include/interface-enable-arp-announce.xml.i> - #include <include/interface-enable-arp-ignore.xml.i> - #include <include/interface-disable-arp-filter.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> <leafNode name="max-age"> <properties> |