From 975f24e39df2b509033b80898c460f6ed266602f Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Apr 06 2022 16:46:32 +0000
Subject: Import openvswitch2.16-2.16.0-67 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-2.16.0.patch b/SOURCES/openvswitch-2.16.0.patch
index 8743d43..f43fbf4 100644
--- a/SOURCES/openvswitch-2.16.0.patch
+++ b/SOURCES/openvswitch-2.16.0.patch
@@ -2657,7 +2657,7 @@ index 60dd138914..97bd21be4a 100644
      }
  
 diff --git a/lib/netdev-offload-tc.c b/lib/netdev-offload-tc.c
-index 9845e8d3fe..12d0a9af3b 100644
+index 9845e8d3fe..e1568e38a0 100644
 --- a/lib/netdev-offload-tc.c
 +++ b/lib/netdev-offload-tc.c
 @@ -481,10 +481,10 @@ netdev_tc_flow_dump_destroy(struct netdev_flow_dump *dump)
@@ -2731,7 +2731,20 @@ index 9845e8d3fe..12d0a9af3b 100644
      return 0;
  }
  
-@@ -1841,7 +1837,25 @@ netdev_tc_flow_put(struct netdev *netdev, struct match *match,
+@@ -1541,6 +1537,12 @@ parse_match_ct_state_to_flower(struct tc_flower *flower, struct match *match)
+             flower->key.ct_state &= ~(TCA_FLOWER_KEY_CT_FLAGS_NEW);
+             flower->mask.ct_state &= ~(TCA_FLOWER_KEY_CT_FLAGS_NEW);
+         }
++
++        if (flower->key.ct_state &&
++            !(flower->key.ct_state & TCA_FLOWER_KEY_CT_FLAGS_TRACKED)) {
++            flower->key.ct_state |= TCA_FLOWER_KEY_CT_FLAGS_TRACKED;
++            flower->mask.ct_state |= TCA_FLOWER_KEY_CT_FLAGS_TRACKED;
++        }
+     }
+ 
+     if (mask->ct_zone) {
+@@ -1841,7 +1843,25 @@ netdev_tc_flow_put(struct netdev *netdev, struct match *match,
                  VLOG_DBG_RL(&rl, "Can't find netdev for output port %d", port);
                  return ENODEV;
              }
@@ -2757,7 +2770,7 @@ index 9845e8d3fe..12d0a9af3b 100644
              action->out.ingress = is_internal_port(netdev_get_type(outdev));
              action->type = TC_ACT_OUTPUT;
              flower.action_count++;
-@@ -2015,9 +2029,7 @@ netdev_tc_flow_del(struct netdev *netdev OVS_UNUSED,
+@@ -2015,9 +2035,7 @@ netdev_tc_flow_del(struct netdev *netdev OVS_UNUSED,
      if (stats) {
          memset(stats, 0, sizeof *stats);
          if (!tc_get_flower(&id, &flower)) {
diff --git a/SPECS/openvswitch2.16.spec b/SPECS/openvswitch2.16.spec
index 01623a7..cb9d466 100644
--- a/SPECS/openvswitch2.16.spec
+++ b/SPECS/openvswitch2.16.spec
@@ -57,7 +57,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 2.16.0
-Release: 66%{?dist}
+Release: 67%{?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
+* Wed Apr 06 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.16.0-67
+- Merging upstream branch-2.16 [RH git: 4936a7194b]
+    Commit list:
+    2c666b9791 netdev-offload-tc: Check for ct_state flag combinations that are not offloadable.
+
+
 * Mon Apr 04 2022 Open vSwitch CI <ovs-ci@redhat.com> - 2.16.0-66
 - Merging upstream branch-2.16 [RH git: 1418edaf18]
     Commit list: