Revert "iperf3: backport upstream patch"

This reverts commit 876f1d5c8f20071832d908c72dd8ce24fb09aa9e.

Fix now upstream.

3 files changed, 0 insertions, 25 deletions

diff --git a/meta-xilinx-standalone-sdt/conf/layer.conf b/meta-xilinx-standalone-sdt/conf/layer.conf
index 10eb6385..81e75110 100644
--- a/meta-xilinx-standalone-sdt/conf/layer.conf
+++ b/meta-xilinx-standalone-sdt/conf/layer.conf
@@ -15,8 +15,6 @@ BBFILE_PRIORITY_xilinx-standalone-sdt = "7"
 BBFILES_DYNAMIC += " \
 openamp-layer:${LAYERDIR}/dynamic-layers/openamp-layer/recipes-*/*/*.bb \
 openamp-layer:${LAYERDIR}/dynamic-layers/openamp-layer/recipes-*/*/*.bbappend \
-openembedded-layer:${LAYERDIR}/dynamic-layers/meta-oe/recipes-*/*/*.bb \
-openembedded-layer:${LAYERDIR}/dynamic-layers/meta-oe/recipes-*/*/*.bbappend \
 "
 
 # Allow other layers to find the root of this layer if necessary
diff --git a/meta-xilinx-standalone-sdt/dynamic-layers/meta-oe/recipes-benchmark/iperf3/iperf3/do-not-listen-to-old-udp-prot-listener.patch b/meta-xilinx-standalone-sdt/dynamic-layers/meta-oe/recipes-benchmark/iperf3/iperf3/do-not-listen-to-old-udp-prot-listener.patch
deleted file mode 100644
index 579ed326..00000000
--- a/meta-xilinx-standalone-sdt/dynamic-layers/meta-oe/recipes-benchmark/iperf3/iperf3/do-not-listen-to-old-udp-prot-listener.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From ac6b9f7fd335ddebc5212eed40083ef4cd3cb86d Mon Sep 17 00:00:00 2001
-From: David Bar-On <david.cdb004@gmail.com>
-Date: Sun, 2 Jun 2024 11:52:03 +0300
-Subject: [PATCH] Do not listen to old pro_listener
-
----
- src/iperf_udp.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/iperf_udp.c b/src/iperf_udp.c
-index a603236df..40f2b1ca7 100644
---- a/src/iperf_udp.c
-+++ b/src/iperf_udp.c
-@@ -446,6 +446,7 @@ iperf_udp_accept(struct iperf_test *test)
-     /*
-      * Create a new "listening" socket to replace the one we were using before.
-      */
-+    FD_CLR(test->prot_listener, &test->read_set); // No control messages from old listener
-     test->prot_listener = netannounce(test->settings->domain, Pudp, test->bind_address, test->bind_dev, test->server_port);
-     if (test->prot_listener < 0) {
-         i_errno = IESTREAMLISTEN;
diff --git a/meta-xilinx-standalone-sdt/dynamic-layers/meta-oe/recipes-benchmark/iperf3/iperf3_%.bbappend b/meta-xilinx-standalone-sdt/dynamic-layers/meta-oe/recipes-benchmark/iperf3/iperf3_%.bbappend
deleted file mode 100644
index 8422870a..00000000
--- a/meta-xilinx-standalone-sdt/dynamic-layers/meta-oe/recipes-benchmark/iperf3/iperf3_%.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-SRC_URI += "file://do-not-listen-to-old-udp-prot-listener.patch"