diff options
author | Christian Poessinger <christian@poessinger.com> | 2020-05-08 18:39:09 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-05-08 18:39:09 +0200 |
commit | a6a9602551e84906740bd7f5ae0a9b9764a8266f (patch) | |
tree | 9a8b2c3dbe7d98851257154f0c5872e9d5bc77a1 /interface-definitions | |
parent | b77c470e4470156cacf21432986bb5b31dffa6e8 (diff) | |
parent | 1e2c3f9593310ebe6b87154823bf4b06112a9ce2 (diff) | |
download | vyos-1x-a6a9602551e84906740bd7f5ae0a9b9764a8266f.tar.gz vyos-1x-a6a9602551e84906740bd7f5ae0a9b9764a8266f.zip |
Merge pull request #399 from jjakob/disable-address-fix-T2427
wireless: T2427: migrate to use common configdict and vlan functions, add common interface includes to template
Diffstat (limited to 'interface-definitions')
-rw-r--r-- | interface-definitions/interfaces-wireless.xml.in | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/interface-definitions/interfaces-wireless.xml.in b/interface-definitions/interfaces-wireless.xml.in index 3edcbb8ff..7cf4da70f 100644 --- a/interface-definitions/interfaces-wireless.xml.in +++ b/interface-definitions/interfaces-wireless.xml.in @@ -463,10 +463,13 @@ </leafNode> <node name="ip"> <children> + #include <include/interface-arp-cache-timeout.xml.i> #include <include/interface-disable-arp-filter.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"> @@ -761,6 +764,7 @@ </properties> </leafNode> #include <include/vif.xml.i> + #include <include/vif-s.xml.i> </children> </tagNode> </children> |