Re: [dts] [PATCH V2] Modify the clv offset code

["Ma, LihongX" <lihongx.ma@intel.com>]

Hi, zhihong
This patch will apply failed, because you base dts is not right.

-----Original Message-----
From: dts [mailto:dts-bounces@dpdk.org] On Behalf Of Peng Zhihong
Sent: Monday, October 21, 2019 6:25 PM
To: dts@dpdk.org
Cc: Peng, ZhihongX <zhihongx.peng@intel.com>
Subject: [dts] [PATCH V2] Modify the clv offset code

Signed-off-by: Peng Zhihong <zhihongx.peng@intel.com>
---
 tests/TestSuite_userspace_ethtool.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/tests/TestSuite_userspace_ethtool.py b/tests/TestSuite_userspace_ethtool.py
index bdbbea3..5898511 100644
--- a/tests/TestSuite_userspace_ethtool.py
+++ b/tests/TestSuite_userspace_ethtool.py
@@ -546,10 +546,16 @@ class TestUserspaceEthtool(TestCase, IxiaPacketGenerator):
         mtus = [1519, 2048]
         mtu_threshold = 2022
         offset = 0
-        ice_eth_overhead = 8
+        
         if self.nic in ['powerville', 'springville']:
             mtu_threshold = 2026
             offset = 4
+        elif self.nic in ['columbiaville_25g', 'columbiaville_100g']:
+            #jira DPDK-16219
+            offset = 8
+        else:
+            pass
+
         for index in range(len(self.ports)):
             port = self.ports[index]
             # change mtu
@@ -573,10 +579,7 @@ class TestUserspaceEthtool(TestCase, IxiaPacketGenerator):
                 pkt.send_pkt(self.tester, tx_port=intf, count=4)
                 rx_pkts, _ = self.strip_portstats(index)
                 self.verify(rx_pkts == ori_rx_pkts + 4, "Packet match mtu not forwarded as expected")
-                if self.nic in ['columbiaville_25g', 'columbiaville_100g']:
-                    pkt = Packet(pkt_type='UDP', pkt_len=mtu + ice_eth_overhead + 1 + HEADER_SIZE['eth'] + offset)
-                else:
-                    pkt = Packet(pkt_type='UDP', pkt_len=mtu + 1 + HEADER_SIZE['eth'] + offset)
+                pkt = Packet(pkt_type='UDP', pkt_len=mtu + 1 + HEADER_SIZE['eth'] + offset)
                 pkt.send_pkt(self.tester, tx_port=intf, count=4)
                 rx_pkts_over, _ = self.strip_portstats(index)
                 self.verify(rx_pkts == rx_pkts_over, "Packet over mtu should not be forwarded")
-- 
2.17.1