diff --git a/SOURCES/openvswitch-3.4.0.patch b/SOURCES/openvswitch-3.4.0.patch index 139ffac..6ea0a5b 100644 --- a/SOURCES/openvswitch-3.4.0.patch +++ b/SOURCES/openvswitch-3.4.0.patch @@ -1627,6 +1627,35 @@ index 940c43c070..b7516257c5 100644 rte_openlog_stream(log_stream); } +diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c +index f0594e5f5c..d4bdadc42d 100644 +--- a/lib/dpif-netdev.c ++++ b/lib/dpif-netdev.c +@@ -6517,9 +6517,6 @@ pmd_rebalance_dry_run(struct dp_netdev *dp) + struct sched_numa_list numa_list_cur; + struct sched_numa_list numa_list_est; + bool thresh_met = false; +- uint64_t current_var, estimate_var; +- struct sched_numa *numa_cur, *numa_est; +- uint64_t improvement = 0; + + VLOG_DBG("PMD auto load balance performing dry run."); + +@@ -6535,9 +6532,14 @@ pmd_rebalance_dry_run(struct dp_netdev *dp) + /* Check if cross-numa polling, there is only one numa with PMDs. */ + if (!sched_numa_list_cross_numa_polling(&numa_list_est) || + sched_numa_list_count(&numa_list_est) == 1) { ++ struct sched_numa *numa_cur; + + /* Calculate variances. */ + HMAP_FOR_EACH (numa_cur, node, &numa_list_cur.numas) { ++ uint64_t current_var, estimate_var; ++ struct sched_numa *numa_est; ++ uint64_t improvement = 0; ++ + numa_est = sched_numa_list_lookup(&numa_list_est, + numa_cur->numa_id); + if (!numa_est) { diff --git a/lib/flow.c b/lib/flow.c index 9be4375246..68d6731239 100644 --- a/lib/flow.c @@ -3219,7 +3248,7 @@ index 9070ea051a..74ccaccdd2 100644 OVSDB_CHECK_IDL_PY([partial-set idl], diff --git a/tests/system-common-macros.at b/tests/system-common-macros.at -index e9be021f3f..a8093ec4eb 100644 +index e9be021f3f..7f029dbb07 100644 --- a/tests/system-common-macros.at +++ b/tests/system-common-macros.at @@ -2,10 +2,7 @@ @@ -3261,7 +3290,7 @@ index e9be021f3f..a8093ec4eb 100644 +# +m4_define([OVS_GET_FTP], + [curl ftp://$1 --retry 3 --max-time 1 --retry-connrefused \ -+ --disable-eps -v $2] ++ --disable-epsv -v $2] +) + +# OVS_GET_FTP_ACTIVE([url], [optional_curl_arguments]) diff --git a/SPECS/openvswitch3.4.spec b/SPECS/openvswitch3.4.spec index a47d846..f8baed2 100644 --- a/SPECS/openvswitch3.4.spec +++ b/SPECS/openvswitch3.4.spec @@ -57,7 +57,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 3.4.0 -Release: 46%{?dist} +Release: 47%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -770,6 +770,13 @@ exit 0 %endif %changelog +* Mon Feb 17 2025 Open vSwitch CI - 3.4.0-47 +- Merging upstream branch-3.4 [RH git: fc3ab7bd76] + Commit list: + 83034418bf tests: Use correct arguments to curl. + a1f23e09f9 dpif-netdev: Fix Auto Load Balance debug log. (FDP-1145) + + * Thu Feb 13 2025 Open vSwitch CI - 3.4.0-46 - Merging upstream branch-3.4 [RH git: af23459b2a] Commit list: