Accepting request 918757 from home:tiwai:branches:network

- Fix build error with SLE15-SP4 kernel (bsc#1190362):
  dpdk-fallthrough-comment-fixes.patch

OBS-URL: https://build.opensuse.org/request/show/918757
OBS-URL: https://build.opensuse.org/package/show/network/dpdk?expand=0&rev=129

dpdk-fallthrough-comment-fixes.patch

@@ -0,0 +1,49 @@
+From: Takashi Iwai <tiwai@suse.de>
+Subject: Fix build errors due to the missing fallthrough statements
+
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ kernel/linux/igb_uio/compat.h  |    4 ++++
+ kernel/linux/igb_uio/igb_uio.c |    6 +++---
+ 2 files changed, 7 insertions(+), 3 deletions(-)
+
+--- a/kernel/linux/igb_uio/compat.h
++++ b/kernel/linux/igb_uio/compat.h
+@@ -152,3 +152,7 @@ static inline bool igbuio_kernel_is_lock
+ 	return false;
+ #endif
+ }
++
++#ifndef fallthrough
++#define fallthrough do {} while (0)
++#endif
+--- a/kernel/linux/igb_uio/igb_uio.c
++++ b/kernel/linux/igb_uio/igb_uio.c
+@@ -236,7 +236,7 @@ igbuio_pci_enable_interrupts(struct rte_
+ 		}
+ #endif
+ 
+-	/* falls through - to MSI */
++		fallthrough;
+ 	case RTE_INTR_MODE_MSI:
+ #ifndef HAVE_ALLOC_IRQ_VECTORS
+ 		if (pci_enable_msi(udev->pdev) == 0) {
+@@ -255,7 +255,7 @@ igbuio_pci_enable_interrupts(struct rte_
+ 			break;
+ 		}
+ #endif
+-	/* falls through - to INTX */
++		fallthrough;
+ 	case RTE_INTR_MODE_LEGACY:
+ 		if (pci_intx_mask_supported(udev->pdev)) {
+ 			dev_dbg(&udev->pdev->dev, "using INTX");
+@@ -265,7 +265,7 @@ igbuio_pci_enable_interrupts(struct rte_
+ 			break;
+ 		}
+ 		dev_notice(&udev->pdev->dev, "PCI INTX mask not supported\n");
+-	/* falls through - to no IRQ */
++		fallthrough;
+ 	case RTE_INTR_MODE_NONE:
+ 		udev->mode = RTE_INTR_MODE_NONE;
+ 		udev->info.irq = UIO_IRQ_NONE;

dpdk.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Sep 13 16:46:30 CEST 2021 - tiwai@suse.de
+
+- Fix build error with SLE15-SP4 kernel (bsc#1190362):
+  dpdk-fallthrough-comment-fixes.patch
+
 -------------------------------------------------------------------
 Thu Sep  2 15:42:14 UTC 2021 - Guillaume GARDET <guillaume.gardet@opensuse.org>
 

dpdk.spec

@@ -1,5 +1,5 @@
 #
-# spec file
+# spec file for package dpdk
 #
 # Copyright (c) 2021 SUSE LLC
 #
@@ -63,6 +63,7 @@ Source:         http://fast.dpdk.org/rel/dpdk-%{version}.tar.xz
 Source1:        preamble
 Patch1:         0001-fix-cpu-compatibility.patch
 Patch2:         0001-SLE15-SP3-compatibility-patch-for-kni.patch
+Patch3:         dpdk-fallthrough-comment-fixes.patch
 BuildRequires:  doxygen
 BuildRequires:  fdupes
 BuildRequires:  kernel-syms
@@ -163,6 +164,7 @@ The DPDK Kernel NIC Interface (KNI) allows userspace applications access to the
 %setup -q -n dpdk-stable-%{version}
 %patch1 -p1 -z .init
 %patch2 -p1 -z .init
+%patch3 -p1
 
 # This fixes CROSS compilation (broken) in the mk file for ThunderX
 sed -i '/^CROSS /s/^/#/'  mk/machine/thunderx/rte.vars.mk