openvswitch: backport patch to fix build against kernel 4.14.193

(and possibly other recent stable kernels)

Signed-off-by: Matthias Schiffer <redacted>

diff --git a/net/openvswitch/patches/0010-acinclude-Fix-build-with-kernels-with-prandom-moved-.patch b/net/openvswitch/patches/0010-acinclude-Fix-build-with-kernels-with-prandom-moved-.patch
new file mode 100644 (file)
index 0000000..ef428d5
--- /dev/null
+++ b/net/openvswitch/patches/0010-acinclude-Fix-build-with-kernels-with-prandom-moved-.patch
@@ -0,0 +1,43 @@
+From f639ec9b25b2758a07d214f7755f1ae0f764e949 Mon Sep 17 00:00:00 2001
+Message-Id: <f639ec9b25b2758a07d214f7755f1ae0f764e949.1597434688.git.mschiffer@universe-factory.net>
+From: Ilya Maximets <i.maximets@ovn.org>
+Date: Wed, 12 Aug 2020 10:57:07 +0200
+Subject: [PATCH] acinclude: Fix build with kernels with prandom* moved to
+ prandom.h.
+
+Recent commit c0842fbc1b18 ("random32: move the pseudo-random 32-bit
+definitions to prandom.h") in upstream kernel moved the definition
+of prandom_* functions from random.h to prandom.h.  This change was
+also backported to stable kernels.
+
+Fixing our configure script to look for these functions in a new
+location and avoid build failures:
+
+  datapath/linux/compat/include/linux/random.h:11:19:
+    error: redefinition of 'prandom_u32_max'
+
+Acked-by: Greg Rose <gvrose8192@gmail.com>
+Signed-off-by: Ilya Maximets <i.maximets@ovn.org>
+(cherry picked from commit 0047ca3a0290f1ef954f2c76b31477cf4b9755f5)
+---
+ acinclude.m4 | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index b474422f52c8..7f028836f54c 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -781,6 +781,10 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [
+                   [prandom_u32[[\(]]],
+                   [OVS_DEFINE([HAVE_PRANDOM_U32])])
+   OVS_GREP_IFELSE([$KSRC/include/linux/random.h], [prandom_u32_max])
++  OVS_GREP_IFELSE([$KSRC/include/linux/prandom.h],
++                  [prandom_u32[[\(]]],
++                  [OVS_DEFINE([HAVE_PRANDOM_U32])])
++  OVS_GREP_IFELSE([$KSRC/include/linux/prandom.h], [prandom_u32_max])
+ 
+   OVS_GREP_IFELSE([$KSRC/include/net/rtnetlink.h], [get_link_net])
+   OVS_GREP_IFELSE([$KSRC/include/net/rtnetlink.h], [name_assign_type])
+-- 
+2.28.0
+