From 4eb7a01556f92e1fbe3898174dc7fe241d14f181 Mon Sep 17 00:00:00 2001
From: Open vSwitch CI <ovs-team@redhat.com>
Date: Jul 19 2024 21:45:20 +0000
Subject: Import openvswitch2.17-2.17.0-183 from Fast DataPath


---

diff --git a/SOURCES/openvswitch-2.17.0.patch b/SOURCES/openvswitch-2.17.0.patch
index ee9111f..878b3a5 100644
--- a/SOURCES/openvswitch-2.17.0.patch
+++ b/SOURCES/openvswitch-2.17.0.patch
@@ -103337,6 +103337,19 @@ index acf174927d..47c15bde7e 100644
      uint32_t erspan_idx;
      uint8_t erspan_ver;
      uint8_t erspan_dir;
+diff --git a/lib/netlink-notifier.c b/lib/netlink-notifier.c
+index dfecb97789..7ea5a41818 100644
+--- a/lib/netlink-notifier.c
++++ b/lib/netlink-notifier.c
+@@ -223,7 +223,7 @@ nln_wait(struct nln *nln)
+     }
+ }
+ 
+-void
++void OVS_NO_SANITIZE_FUNCTION
+ nln_report(const struct nln *nln, void *change, int group)
+ {
+     struct nln_notifier *notifier;
 diff --git a/lib/netlink-protocol.h b/lib/netlink-protocol.h
 index 6eaa7035a4..e4bb28ac9f 100644
 --- a/lib/netlink-protocol.h
diff --git a/SPECS/openvswitch2.17.spec b/SPECS/openvswitch2.17.spec
index 396d356..465e936 100644
--- a/SPECS/openvswitch2.17.spec
+++ b/SPECS/openvswitch2.17.spec
@@ -63,7 +63,7 @@ Summary: Open vSwitch
 Group: System Environment/Daemons daemon/database/utilities
 URL: http://www.openvswitch.org/
 Version: 2.17.0
-Release: 182%{?dist}
+Release: 183%{?dist}
 
 # Nearly all of openvswitch is ASL 2.0.  The bugtool is LGPLv2+, and the
 # lib/sflow*.[ch] files are SISSL
@@ -749,6 +749,12 @@ exit 0
 %endif
 
 %changelog
+* Fri Jul 19 2024 Open vSwitch CI <ovs-ci@redhat.com> - 2.17.0-183
+- Merging upstream branch-2.17 [RH git: cf7483b40b]
+    Commit list:
+    721273612d netlink-notifier: Silence the UBsan's function pointer mismatch error.
+
+
 * Fri Jul 19 2024 Open vSwitch CI <ovs-ci@redhat.com> - 2.17.0-182
 - Merging upstream branch-2.17 [RH git: 3c9d9f6c10]
     Commit list: