From d6c69335765684c44a2e87bdf4855b6550e473b5 Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Mar 02 2021 21:38:04 +0000
Subject: Import openvswitch2.11-2.11.3-78 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-2.11.3.patch b/SOURCES/openvswitch-2.11.3.patch
index c14b7ce..b454fd7 100644
--- a/SOURCES/openvswitch-2.11.3.patch
+++ b/SOURCES/openvswitch-2.11.3.patch
@@ -15769,7 +15769,7 @@ index 4c2c1ba84a..c366cf53eb 100644
  
      /* Output. */
 diff --git a/lib/lldp/lldp.c b/lib/lldp/lldp.c
-index 74f747fcdc..e5755307fb 100644
+index 74f747fcdc..18afbab9a7 100644
 --- a/lib/lldp/lldp.c
 +++ b/lib/lldp/lldp.c
 @@ -59,7 +59,7 @@ VLOG_DEFINE_THIS_MODULE(lldp);
@@ -15880,7 +15880,21 @@ index 74f747fcdc..e5755307fb 100644
              CHECK_TLV_SIZE(2, "TTL");
              chassis->c_ttl = PEEK_UINT16;
              ttl_received = true;
-@@ -481,6 +530,11 @@ lldp_decode(struct lldpd *cfg OVS_UNUSED, char *frame, int s,
+@@ -464,10 +513,13 @@ lldp_decode(struct lldpd *cfg OVS_UNUSED, char *frame, int s,
+             b = xzalloc(tlv_size + 1);
+             PEEK_BYTES(b, tlv_size);
+             if (tlv_type == LLDP_TLV_PORT_DESCR) {
++                free(port->p_descr);
+                 port->p_descr = b;
+             } else if (tlv_type == LLDP_TLV_SYSTEM_NAME) {
++                free(chassis->c_name);
+                 chassis->c_name = b;
+             } else {
++                free(chassis->c_descr);
+                 chassis->c_descr = b;
+             }
+             break;
+@@ -481,6 +533,11 @@ lldp_decode(struct lldpd *cfg OVS_UNUSED, char *frame, int s,
          case LLDP_TLV_MGMT_ADDR:
              CHECK_TLV_SIZE(1, "Management address");
              addr_str_length = PEEK_UINT8;
@@ -15892,7 +15906,7 @@ index 74f747fcdc..e5755307fb 100644
              CHECK_TLV_SIZE(1 + addr_str_length, "Management address");
              PEEK_BYTES(addr_str_buffer, addr_str_length);
              addr_length = addr_str_length - 1;
-@@ -505,7 +559,7 @@ lldp_decode(struct lldpd *cfg OVS_UNUSED, char *frame, int s,
+@@ -505,7 +562,7 @@ lldp_decode(struct lldpd *cfg OVS_UNUSED, char *frame, int s,
              break;
  
          case LLDP_TLV_ORG:
@@ -15901,7 +15915,7 @@ index 74f747fcdc..e5755307fb 100644
              PEEK_BYTES(orgid, sizeof orgid);
              tlv_subtype = PEEK_UINT8;
              if (memcmp(dot1, orgid, sizeof orgid) == 0) {
-@@ -625,6 +679,7 @@ lldp_decode(struct lldpd *cfg OVS_UNUSED, char *frame, int s,
+@@ -625,6 +682,7 @@ lldp_decode(struct lldpd *cfg OVS_UNUSED, char *frame, int s,
              VLOG_WARN("unknown tlv (%d) received on %s",
                        tlv_type,
                        hardware->h_ifname);
@@ -18925,7 +18939,7 @@ index 0a5a52887b..ded81ca0e9 100644
  
  enum xlate_error xlate_actions(struct xlate_in *, struct xlate_out *);
 diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c
-index 050ff65773..5f2127e280 100644
+index 050ff65773..eaaa25f615 100644
 --- a/ofproto/ofproto-dpif.c
 +++ b/ofproto/ofproto-dpif.c
 @@ -827,6 +827,12 @@ ovs_native_tunneling_is_on(struct ofproto_dpif *ofproto)
@@ -19106,7 +19120,15 @@ index 050ff65773..5f2127e280 100644
  
      struct flow headers;
      flow_extract(&packet, &headers);
-@@ -6060,6 +6128,7 @@ const struct ofproto_class ofproto_dpif_class = {
+@@ -5076,6 +5144,7 @@ nxt_resume(struct ofproto *ofproto_,
+     /* Clean up. */
+     ofpbuf_uninit(&odp_actions);
+     dp_packet_uninit(&packet);
++    xlate_cache_uninit(&xcache);
+ 
+     return error;
+ }
+@@ -6060,6 +6129,7 @@ const struct ofproto_class ofproto_dpif_class = {
      rule_get_stats,
      packet_xlate,
      packet_xlate_revert,
diff --git a/SPECS/openvswitch2.11.spec b/SPECS/openvswitch2.11.spec
index dacc80d..2f7f8b7 100644
--- a/SPECS/openvswitch2.11.spec
+++ b/SPECS/openvswitch2.11.spec
@@ -66,7 +66,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 2.11.3
-Release: 77%{?dist}
+Release: 78%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -745,6 +745,10 @@ exit 0
 
 
 %changelog
+* Wed Jan 13 2021 Open vSwitch CI <ovs-team@redhat.com> - 2.11.3-78
+- Merging upstream branch-2.11
+  [68170d878c052468321f0a6a15b44c1f531abb4f]
+
 * Thu Jan 07 2021 Open vSwitch CI <ovs-team@redhat.com> - 2.11.3-77
 - Merging upstream branch-2.11
   [10478e38029da25e549bf899dde41a6eb948d523]