From 5a20c17fceffcbb977f713579a22fdb22f16cc74 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Wed, 23 Dec 2020 14:19:40 +0100
Subject: xdp: T2666: move CLI node to "interfaces ethernet <eth> xdp"

---
 interface-definitions/include/interface-xdp.xml.i | 8 ++++++++
 interface-definitions/interfaces-ethernet.xml.in  | 7 +------
 2 files changed, 9 insertions(+), 6 deletions(-)
 create mode 100644 interface-definitions/include/interface-xdp.xml.i

(limited to 'interface-definitions')

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-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>
-- 
cgit v1.2.3


From cb1a6857b590fcebd10fe905837e94dbdd631931 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Wed, 23 Dec 2020 14:21:02 +0100
Subject: xml: include: accel: convert dos/unix line endings

---
 .../include/accel-client-ip-pool-start-stop.xml.i  | 36 +++++++++++-----------
 .../include/accel-mtu-128-16384.xml.i              | 18 +++++------
 2 files changed, 27 insertions(+), 27 deletions(-)

(limited to 'interface-definitions')

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>
-- 
cgit v1.2.3


From 6f5eeaa22c32ab6e2c629a613fc5107d7b357b9d Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Wed, 23 Dec 2020 14:24:02 +0100
Subject: bond: T2666: enable XDP support

---
 interface-definitions/interfaces-bonding.xml.in | 1 +
 1 file changed, 1 insertion(+)

(limited to 'interface-definitions')

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>
-- 
cgit v1.2.3