diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-12-23 14:24:55 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2020-12-23 14:24:55 +0100 |
| commit | 440ce3011e8718c917933026e68047fcfb008031 (patch) | |
| tree | 67d71ba2555c9e4b9d1895ebb04406d5af92e7a9 /interface-definitions | |
| parent | 131b6ac0dfa0700820b2fe56adea2cad189b10ad (diff) | |
| parent | 6f5eeaa22c32ab6e2c629a613fc5107d7b357b9d (diff) | |
| download | vyos-1x-440ce3011e8718c917933026e68047fcfb008031.tar.gz vyos-1x-440ce3011e8718c917933026e68047fcfb008031.zip | |
Merge branch 'xdp' of github.com:c-po/vyos-1x into current
* 'xdp' of github.com:c-po/vyos-1x:
bond: T2666: enable XDP support
xml: include: accel: convert dos/unix line endings
xdp: T2666: move CLI node to "interfaces ethernet <eth> xdp"
xdp: T2666: require at least 2 TX queues
Diffstat (limited to 'interface-definitions')
5 files changed, 37 insertions, 33 deletions
diff --git a/interface-definitions/include/accel-client-ip-pool-start-stop.xml.i b/interface-definitions/include/accel-client-ip-pool-start-stop.xml.i index a92c315f1..b578f2b2c 100644 --- a/interface-definitions/include/accel-client-ip-pool-start-stop.xml.i +++ b/interface-definitions/include/accel-client-ip-pool-start-stop.xml.i @@ -1,18 +1,18 @@ -<!-- included start from accel-client-ip-pool-start-stop.xml.i -->
-<leafNode name="start">
- <properties>
- <help>First IP address in the pool</help>
- <constraint>
- <validator name="ipv4-address"/>
- </constraint>
- </properties>
-</leafNode>
-<leafNode name="stop">
- <properties>
- <help>Last IP address in the pool</help>
- <constraint>
- <validator name="ipv4-address"/>
- </constraint>
- </properties>
-</leafNode>
-<!-- included end -->
+<!-- included start from accel-client-ip-pool-start-stop.xml.i --> +<leafNode name="start"> + <properties> + <help>First IP address in the pool</help> + <constraint> + <validator name="ipv4-address"/> + </constraint> + </properties> +</leafNode> +<leafNode name="stop"> + <properties> + <help>Last IP address in the pool</help> + <constraint> + <validator name="ipv4-address"/> + </constraint> + </properties> +</leafNode> +<!-- included end --> diff --git a/interface-definitions/include/accel-mtu-128-16384.xml.i b/interface-definitions/include/accel-mtu-128-16384.xml.i index 72ab550f9..7ee483056 100644 --- a/interface-definitions/include/accel-mtu-128-16384.xml.i +++ b/interface-definitions/include/accel-mtu-128-16384.xml.i @@ -1,9 +1,9 @@ - <leafNode name="mtu">
- <properties>
- <help>Maximum Transmission Unit (MTU) - default 1492</help>
- <constraint>
- <validator name="numeric" argument="--range 128-16384"/>
- </constraint>
- </properties>
- <defaultValue>1492</defaultValue>
- </leafNode>
+ <leafNode name="mtu"> + <properties> + <help>Maximum Transmission Unit (MTU) - default 1492</help> + <constraint> + <validator name="numeric" argument="--range 128-16384"/> + </constraint> + </properties> + <defaultValue>1492</defaultValue> + </leafNode> diff --git a/interface-definitions/include/interface-xdp.xml.i b/interface-definitions/include/interface-xdp.xml.i new file mode 100644 index 000000000..d224c177f --- /dev/null +++ b/interface-definitions/include/interface-xdp.xml.i @@ -0,0 +1,8 @@ +<!-- included start from interface-vrf.xml.i --> +<leafNode name="xdp"> + <properties> + <help>Enable eXpress Data Path</help> + <valueless/> + </properties> +</leafNode> +<!-- included end --> diff --git a/interface-definitions/interfaces-bonding.xml.in b/interface-definitions/interfaces-bonding.xml.in index 423d94f76..720daba4d 100644 --- a/interface-definitions/interfaces-bonding.xml.in +++ b/interface-definitions/interfaces-bonding.xml.in @@ -165,6 +165,7 @@ </leafNode> #include <include/vif-s.xml.i> #include <include/vif.xml.i> + #include <include/interface-xdp.xml.i> </children> </tagNode> </children> diff --git a/interface-definitions/interfaces-ethernet.xml.in b/interface-definitions/interfaces-ethernet.xml.in index d3d94cf8d..5dd685c37 100644 --- a/interface-definitions/interfaces-ethernet.xml.in +++ b/interface-definitions/interfaces-ethernet.xml.in @@ -95,12 +95,6 @@ <valueless/> </properties> </leafNode> - <leafNode name="xdp"> - <properties> - <help>Enable eXpress Data Path</help> - <valueless/> - </properties> - </leafNode> </children> </node> <leafNode name="speed"> @@ -193,6 +187,7 @@ </node> #include <include/vif-s.xml.i> #include <include/vif.xml.i> + #include <include/interface-xdp.xml.i> </children> </tagNode> </children> |