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);