SHA256
1
0
forked from pool/dpdk
dpdk/0002-kni-fix-build-on-SLE12-SP3.patch
Markos Chandras 117750050d Accepting request 520811 from home:ndas:branches:network
- Updated to 17.08(bsc#1050250, bsc#1046598, fate#322913, fate#322608)
  Some of the new features are listed below:
   * Increase minimum x86 ISA version to SSE4.2
   * Added Fail-Safe PMD
   * Added support for generic flow API (rte_flow) on igb NICs
   * Added support for generic flow API (rte_flow) on enic
   * Added support for Chelsio T6 family of adapters
   * Added latency and performance improvements for cxgbe
   * Updated mlx5 driver
   * Added NXP DPAA2 Eventdev PMD
   * Added dpdk-test-eventdev test application
   * from 17.05:
      * Added mbuf raw free API
      * Added free Tx mbuf on demand API
      * Added VFIO hotplug support
      * Added PowerPC support for i40e and its vector PMD
      * Added VF max bandwidth setting in i40e
      * Added LiquidIO network PMD
      * Added support for NXP DPAA2 Network PMD
      * Added support for NXP DPAA2 - FSLMC bus
      * Added support for the Wind River Systems AVP PMD
      * Added vmxnet3 version 3 support
      * Added MTU feature support to Virtio and Vhost
      * Added event driven programming model library (rte_eventdev)
      * Added Software Eventdev PMD
      * Added Cavium OCTEONTX Eventdev PMD
      * Added NXP DPAA2 SEC crypto PMD
   * from 17.02:
      * Added generic EAL API for I/O device memory read/write operations
      * Added VF Daemon (VFD) for i40e. - EXPERIMENTAL

OBS-URL: https://build.opensuse.org/request/show/520811
OBS-URL: https://build.opensuse.org/package/show/network/dpdk?expand=0&rev=58
2017-09-06 09:56:45 +00:00

72 lines
2.5 KiB
Diff
Raw Blame History

This file contains ambiguous Unicode characters

This file contains Unicode characters that might be confused with other characters. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.

From d2749a174306f7ddb4259bdeb561761ddff7ca7d Mon Sep 17 00:00:00 2001
From: Nirmoy Das <ndas@suse.de>
Date: Tue, 29 Aug 2017 16:48:35 +0200
Subject: [PATCH v2] kni: fix build on SLE12 SP3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
compilation error:
build/lib/librte_eal/linuxapp/kni/kni_net.c:215:5: error:
struct net_device has no member named trans_start
dev->trans_start = jiffies;
Signed-off-by: Nirmoy Das <ndas@suse.de>
---
lib/librte_eal/linuxapp/kni/compat.h | 32 +++++++++++++++++++++++++++++++-
1 file changed, 31 insertions(+), 1 deletion(-)
diff --git a/lib/librte_eal/linuxapp/kni/compat.h b/lib/librte_eal/linuxapp/kni/compat.h
index 6a1587b4e..19f8e96ce 100644
--- a/lib/librte_eal/linuxapp/kni/compat.h
+++ b/lib/librte_eal/linuxapp/kni/compat.h
@@ -8,6 +8,34 @@
#define RHEL_RELEASE_VERSION(a, b) (((a) << 8) + (b))
#endif
+/* SuSE version macro is the same as Linux kernel version */
+#ifndef SLE_VERSION
+#define SLE_VERSION(a, b, c) KERNEL_VERSION(a, b, c)
+#endif
+#ifdef CONFIG_SUSE_KERNEL
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 57))
+/* SLES12SP3 is at least 4.4.57+ based */
+#define SLE_VERSION_CODE SLE_VERSION(12, 3, 0)
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 12, 28))
+/* SLES12 is at least 3.12.28+ based */
+#define SLE_VERSION_CODE SLE_VERSION(12, 0, 0)
+#elif ((LINUX_VERSION_CODE >= KERNEL_VERSION(3, 0, 61)) && \
+ (LINUX_VERSION_CODE < KERNEL_VERSION(3, 1, 0)))
+/* SLES11 SP3 is at least 3.0.61+ based */
+#define SLE_VERSION_CODE SLE_VERSION(11, 3, 0)
+#elif (LINUX_VERSION_CODE == KERNEL_VERSION(2, 6, 32))
+/* SLES11 SP1 is 2.6.32 based */
+#define SLE_VERSION_CODE SLE_VERSION(11, 1, 0)
+#elif (LINUX_VERSION_CODE == KERNEL_VERSION(2, 6, 27))
+/* SLES11 GA is 2.6.27 based */
+#define SLE_VERSION_CODE SLE_VERSION(11, 0, 0)
+#endif /* LINUX_VERSION_CODE == KERNEL_VERSION(x,y,z) */
+#endif /* CONFIG_SUSE_KERNEL */
+#ifndef SLE_VERSION_CODE
+#define SLE_VERSION_CODE 0
+#endif /* SLE_VERSION_CODE */
+
+
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39) && \
(!(defined(RHEL_RELEASE_CODE) && \
RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(6, 4)))
@@ -55,7 +83,9 @@
#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) || \
(defined(RHEL_RELEASE_CODE) && \
- RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(7, 4))
+ RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(7, 4)) || \
+ (defined(SLE_VERSION_CODE) && \
+ SLE_VERSION_CODE == SLE_VERSION(12, 3, 0))
#define HAVE_TRANS_START_HELPER
#endif
--
2.13.3