From aa2f8625382769815e3253e8ab3f99a9751ba251 Mon Sep 17 00:00:00 2001 From: Open vSwitch CI Date: Dec 09 2021 21:22:04 +0000 Subject: Import openvswitch2.15-2.15.0-55 from Fast DataPath --- diff --git a/SOURCES/openvswitch-2.15.0.patch b/SOURCES/openvswitch-2.15.0.patch index 69cd21d..3504f8d 100644 --- a/SOURCES/openvswitch-2.15.0.patch +++ b/SOURCES/openvswitch-2.15.0.patch @@ -583,6 +583,26 @@ index d50a126b43..18f884f41b 100644 +diff --git a/datapath/linux/compat/include/net/netfilter/nf_conntrack_core.h b/datapath/linux/compat/include/net/netfilter/nf_conntrack_core.h +index 4cce92f66c..bc18c56b81 100644 +--- a/datapath/linux/compat/include/net/netfilter/nf_conntrack_core.h ++++ b/datapath/linux/compat/include/net/netfilter/nf_conntrack_core.h +@@ -108,7 +108,14 @@ static inline bool rpl_nf_ct_delete(struct nf_conn *ct, u32 portid, int report) + static inline unsigned int + rpl_nf_conntrack_in(struct sk_buff *skb, const struct nf_hook_state *state) + { +- return nf_conntrack_in(state->net, state->pf, state->hook, skb); ++ int err; ++ ++ /* Repeat if requested, see nf_iterate(). */ ++ do { ++ err = nf_conntrack_in(state->net, state->pf, state->hook, skb); ++ } while (err == NF_REPEAT); ++ ++ return err; + } + #define nf_conntrack_in rpl_nf_conntrack_in + #endif /* HAVE_NF_CONNTRACK_IN_TAKES_NF_HOOK_STATE */ diff --git a/debian/changelog b/debian/changelog index 1f2b7a3668..bce2f5c305 100644 --- a/debian/changelog diff --git a/SPECS/openvswitch2.15.spec b/SPECS/openvswitch2.15.spec index 908ca16..beb4dd9 100644 --- a/SPECS/openvswitch2.15.spec +++ b/SPECS/openvswitch2.15.spec @@ -57,7 +57,7 @@ Summary: Open vSwitch Group: System Environment/Daemons daemon/database/utilities URL: http://www.openvswitch.org/ Version: 2.15.0 -Release: 54%{?dist} +Release: 55%{?dist} # Nearly all of openvswitch is ASL 2.0. The bugtool is LGPLv2+, and the # lib/sflow*.[ch] files are SISSL @@ -699,6 +699,12 @@ exit 0 %endif %changelog +* Thu Dec 09 2021 Open vSwitch CI - 2.15.0-55 +- Merging upstream branch-2.15 [RH git: a1abf356d3] + Commit list: + d477f60008 compat: handle NF_REPEAT error on nf_conntrack_in. + + * Mon Dec 06 2021 Open vSwitch CI - 2.15.0-54 - Merging upstream branch-2.15 [RH git: d4f13fd840] Commit list: