From 0deb517c304f6be3b8c701f091ffdd7ac1e9ebbf Mon Sep 17 00:00:00 2001 From: Dumitru Ceara Date: Mon, 8 Jan 2024 16:40:16 +0100 Subject: [PATCH] ovs: Bump submodule to branch-3.2. Specifically the following commit: 4102674b3e ovsdb-idl: Preserve change_seqno when deleting rows. Without it, in specific cases, the IDL might incorrectly report deletion of yet to be seen records. This commit differs from original by bumping OVS submodule to branch-3.2 related commit ec1d73016 ("ovsdb-idl: Preserve change_seqno when deleting rows.") Signed-off-by: Dumitru Ceara Acked-by: Ilya Maximets (cherry picked from commit 66ef6709678486f7abf88db10eed15fb72edcc4a) Reported-at: https://mail.openvswitch.org/pipermail/ovs-dev/2024-October/417627.html Signed-off-by: Vladislav Odintsov --- controller/ofctrl.c | 2 +- ovs | 2 +- tests/test-ovn.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/controller/ofctrl.c b/controller/ofctrl.c index 497890eed5..718baac18b 100644 --- a/controller/ofctrl.c +++ b/controller/ofctrl.c @@ -3059,7 +3059,7 @@ ofctrl_inject_pkt(const struct ovsrec_bridge *br_int, const char *flow_s, uint64_t packet_stub[128 / 8]; struct dp_packet packet; dp_packet_use_stub(&packet, packet_stub, sizeof packet_stub); - flow_compose(&packet, &uflow, NULL, 64); + flow_compose(&packet, &uflow, NULL, 64, false); uint64_t ofpacts_stub[1024 / 8]; struct ofpbuf ofpacts = OFPBUF_STUB_INITIALIZER(ofpacts_stub); diff --git a/ovs b/ovs index c88a35fc29..c2f2870130 160000 --- a/ovs +++ b/ovs @@ -1 +1 @@ -Subproject commit c88a35fc29f0c0eb6189853bfc738c2100d4860f +Subproject commit c2f287013025ad5b0c40e0c7fc3a9042d4899ce1 diff --git a/tests/test-ovn.c b/tests/test-ovn.c index 16d2d779db..6f38b1493a 100644 --- a/tests/test-ovn.c +++ b/tests/test-ovn.c @@ -1238,7 +1238,7 @@ test_expr_to_packets(struct ovs_cmdl_context *ctx OVS_UNUSED) uint64_t packet_stub[128 / 8]; struct dp_packet packet; dp_packet_use_stub(&packet, packet_stub, sizeof packet_stub); - flow_compose(&packet, &uflow, NULL, 64); + flow_compose(&packet, &uflow, NULL, 64, false); struct ds output = DS_EMPTY_INITIALIZER; const uint8_t *buf = dp_packet_data(&packet);