X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fbash%2Ffunction%2Fdpdk.sh;h=d579cfc444d5f9d7f82081b5477eb88cdd67c099;hb=65c15b21ee45ff171b0a0d6b61ed5996228cbe71;hp=bf1e8e337e6eeda9da83d76601c6c5c447898a1d;hpb=5c4c05c8ea9f1b07862c09c8d971a3dae3b16adf;p=csit.git

diff --git a/resources/libraries/bash/function/dpdk.sh b/resources/libraries/bash/function/dpdk.sh
index bf1e8e337e..d579cfc444 100644
--- a/resources/libraries/bash/function/dpdk.sh
+++ b/resources/libraries/bash/function/dpdk.sh
@@ -96,17 +96,6 @@ function dpdk_compile () {
     # Configure generic build - the same used by VPP
     meson_options="${meson_options} -Dplatform=generic"
 
-    # Patch L3FWD.
-    sed_rxd="s/^#define RTE_TEST_RX_DESC_DEFAULT 128"
-    sed_rxd+="/#define RTE_TEST_RX_DESC_DEFAULT 1024/g"
-    sed_txd="s/^#define RTE_TEST_TX_DESC_DEFAULT 512"
-    sed_txd+="/#define RTE_TEST_TX_DESC_DEFAULT 1024/g"
-    sed_file="./main.c"
-    pushd examples/l3fwd || die "Pushd failed"
-    sed -i "${sed_rxd}" "${sed_file}" || die "Patch failed"
-    sed -i "${sed_txd}" "${sed_file}" || die "Patch failed"
-    popd || die "Popd failed"
-
     # Compile using Meson and Ninja.
     meson ${meson_options} build || {
         die "Failed to compile DPDK!"
@@ -201,7 +190,6 @@ function dpdk_l3fwd_compile () {
     #
     # Variables read:
     # - DPDK_DIR - Path to DPDK framework.
-    # - CSIT_DIR - Path to CSIT framework.
     # Functions called:
     # - die - Print to stderr and exit.
 
@@ -209,14 +197,7 @@ function dpdk_l3fwd_compile () {
 
     pushd "${DPDK_DIR}" || die "Pushd failed"
     # Patch L3FWD.
-    sed_rxd="s/^#define RTE_TEST_RX_DESC_DEFAULT 128"
-    sed_rxd+="/#define RTE_TEST_RX_DESC_DEFAULT 2048/g"
-    sed_txd="s/^#define RTE_TEST_TX_DESC_DEFAULT 512"
-    sed_txd+="/#define RTE_TEST_TX_DESC_DEFAULT 2048/g"
-    sed_file="./main.c"
     pushd examples/l3fwd || die "Pushd failed"
-    sed -i "${sed_rxd}" "${sed_file}" || die "Patch failed"
-    sed -i "${sed_txd}" "${sed_file}" || die "Patch failed"
     chmod +x ${1} && source ${1} || die "Patch failed"
     popd || die "Popd failed"
 
@@ -264,8 +245,7 @@ function dpdk_l3fwd_check () {
 
     for attempt in {1..60}; do
         echo "Checking if l3fwd state is ok, attempt nr ${attempt}"
-        if fgrep "Port 0 Link up" screenlog.0 && \
-        fgrep "Port 1 Link up" screenlog.0; then
+        if fgrep "Link up" screenlog.0; then
             cat screenlog.0
             dpdk_l3fwd_pid
             exit 0
@@ -353,8 +333,7 @@ function dpdk_testpmd_check () {
 
     for attempt in {1..60}; do
         echo "Checking if testpmd links state changed, attempt nr ${attempt}"
-        if fgrep "Port 0: link state change event" screenlog.0 && \
-        fgrep "Port 1: link state change event" screenlog.0; then
+        if fgrep "link state change event" screenlog.0; then
             cat screenlog.0
             exit 0
         fi