From c846aa706b8fc7b9b7521f2b8b7c0da800cee957 Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Dec 09 2021 19:00:37 +0000
Subject: Import openvswitch2.13-2.13.0-141 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-2.13.0.patch b/SOURCES/openvswitch-2.13.0.patch
index 4b78693..ab4c8db 100644
--- a/SOURCES/openvswitch-2.13.0.patch
+++ b/SOURCES/openvswitch-2.13.0.patch
@@ -1949,6 +1949,26 @@ index 63972891bf..f276898b20 100644
  	skb->l4_rxhash = 0;
  #endif
  }
+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/datapath/linux/compat/nf_conntrack_reasm.c b/datapath/linux/compat/nf_conntrack_reasm.c
 index ced9fba98b..77b4b25485 100644
 --- a/datapath/linux/compat/nf_conntrack_reasm.c
diff --git a/SPECS/openvswitch2.13.spec b/SPECS/openvswitch2.13.spec
index 5de42f9..ddd80aa 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: 140%{?commit0:.%{date}git%{shortcommit0}}%{?commit1:dpdk%{shortcommit1}}%{?dist}
+Release: 141%{?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
@@ -712,6 +712,12 @@ exit 0
 %endif
 
 %changelog
+* Thu Dec 09 2021 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-141
+- Merging upstream branch-2.13 [RH git: 035911bcc8]
+    Commit list:
+    0263845fde compat: handle NF_REPEAT error on nf_conntrack_in.
+
+
 * Mon Dec 06 2021 Open vSwitch CI <ovs-ci@redhat.com> - 2.13.0-140
 - Merging upstream branch-2.13 [RH git: 6a59db52e8]
     Commit list: