diff --git a/SOURCES/openvswitch-2.13.0.patch b/SOURCES/openvswitch-2.13.0.patch index 534f79f..52914f6 100644 --- a/SOURCES/openvswitch-2.13.0.patch +++ b/SOURCES/openvswitch-2.13.0.patch @@ -87508,7 +87508,7 @@ index 4407f9c97a..4ad5c510e9 100644 &ctx.xbridge->ofproto->up); } diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c -index d3cb392077..b214914d41 100644 +index d3cb392077..b86076cfe3 100644 --- a/ofproto/ofproto-dpif.c +++ b/ofproto/ofproto-dpif.c @@ -1381,6 +1381,24 @@ check_ct_timeout_policy(struct dpif_backer *backer) @@ -87544,7 +87544,20 @@ index d3cb392077..b214914d41 100644 /* Flow fields. */ backer->rt_support.odp.ct_state = check_ct_state(backer); -@@ -5375,6 +5394,8 @@ ct_add_timeout_policy_to_dpif(struct dpif *dpif, +@@ -2298,6 +2317,12 @@ set_ipfix( + dpif_ipfix_unref(di); + ofproto->ipfix = NULL; + } ++ ++ /* TODO: need to consider ipfix option changes more than ++ * enable/disable */ ++ if (new_di || !ofproto->ipfix) { ++ ofproto->backer->need_revalidate = REV_RECONFIGURE; ++ } + } + + return 0; +@@ -5375,6 +5400,8 @@ ct_add_timeout_policy_to_dpif(struct dpif *dpif, struct ct_dpif_timeout_policy cdtp; struct simap_node *node; @@ -87553,7 +87566,7 @@ index d3cb392077..b214914d41 100644 cdtp.id = ct_tp->tp_id; SIMAP_FOR_EACH (node, &ct_tp->tp) { ct_dpif_set_timeout_policy_attr_by_name(&cdtp, node->name, node->data); -@@ -5563,6 +5584,7 @@ get_datapath_cap(const char *datapath_type, struct smap *cap) +@@ -5563,6 +5590,7 @@ get_datapath_cap(const char *datapath_type, struct smap *cap) smap_add(cap, "ct_timeout", s.ct_timeout ? "true" : "false"); smap_add(cap, "explicit_drop_action", s.explicit_drop_action ? "true" :"false"); @@ -87561,7 +87574,7 @@ index d3cb392077..b214914d41 100644 } /* Gets timeout policy name in 'backer' based on 'zone', 'dl_type' and -@@ -6335,6 +6357,7 @@ ofproto_unixctl_dpif_show_dp_features(struct unixctl_conn *conn, +@@ -6335,6 +6363,7 @@ ofproto_unixctl_dpif_show_dp_features(struct unixctl_conn *conn, dpif_show_support(&ofproto->backer->bt_support, &ds); unixctl_command_reply(conn, ds_cstr(&ds)); diff --git a/SPECS/openvswitch2.13.spec b/SPECS/openvswitch2.13.spec index dbb6482..0c57c58 100644 --- a/SPECS/openvswitch2.13.spec +++ b/SPECS/openvswitch2.13.spec @@ -59,7 +59,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 2.13.0 -Release: 163%{?commit0:.%{date}git%{shortcommit0}}%{?commit1:dpdk%{shortcommit1}}%{?dist} +Release: 164%{?commit0:.%{date}git%{shortcommit0}}%{?commit1:dpdk%{shortcommit1}}%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -715,6 +715,12 @@ exit 0 %endif %changelog +* Sat Mar 05 2022 Open vSwitch CI - 2.13.0-164 +- Merging upstream branch-2.13 [RH git: e6b652172d] + Commit list: + f501126850 ofproto-dpif: Trigger revalidation when ipfix config set. + + * Fri Mar 04 2022 Open vSwitch CI - 2.13.0-163 - Merging upstream branch-2.13 [RH git: 352f0456cb] Commit list: