pool/dpdk
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 484048 from home:ndas:branches:network

Browse Source 
- Enable HAVE_VF_VLAN_PROTO for SLE12SP3(bsc#1031705).
  [+0002-kni-define-HAVE_VF_VLAN_PROTO-for-SLES12SP3.patch]

- Enable HAVE_VF_VLAN_PROTO for SLE12SP3(bsc#1031705).
  [+0002-kni-define-HAVE_VF_VLAN_PROTO-for-SLES12SP3.patch]

OBS-URL: https://build.opensuse.org/request/show/484048
OBS-URL: https://build.opensuse.org/package/show/network/dpdk?expand=0&rev=42
This commit is contained in:
Dirk Mueller 2017-04-05 11:45:54 +00:00 committed by Git OBS Bridge
parent 7e5f136cc7
commit bd246ac340
5 changed files with 49 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
0002-kni-define-HAVE_VF_VLAN_PROTO-for-SLES12SP3.patch Normal file
View File

@ -0,0 +1,33 @@
From e6b63f9d941c8b27c4c1cbeab2c7cdbefb7747ba Mon Sep 17 00:00:00 2001
From: Nirmoy Das <ndas@suse.de>
Date: Fri, 31 Mar 2017 11:40:42 +0200
Subject: [PATCH] kni: define HAVE_VF_VLAN_PROTO for SLES12SP3
Add support for SLES12SP3, which uses kernel 4.4,
but backported features from newer kernels.
Signed-off-by: Nirmoy Das <ndas@suse.de>
---
lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
index 84826b26e..3d22d8e69 100644
--- a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
@@ -3929,8 +3929,10 @@ skb_set_hash(struct sk_buff *skb, __u32 hash, __always_unused int type)
#define vlan_tx_tag_present skb_vlan_tag_present
#endif
-#if ( LINUX_VERSION_CODE >= KERNEL_VERSION(4,9,0) )
+#if (( LINUX_VERSION_CODE >= KERNEL_VERSION(4,9,0) ) \
+ || (defined(CONFIG_SUSE_KERNEL) && \
+ (LINUX_VERSION_CODE >= KERNEL_VERSION(4,4,57))))
#define HAVE_VF_VLAN_PROTO
-#endif /* >= 4.9.0 */
+#endif /* >= 4.9.0, >= SLES12SP3 */
#endif /* _KCOMPAT_H_ */
--
2.12.0

6
dpdk-thunderx.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Mar 30 16:50:07 CEST 2017 - ndas@suse.de
- Enable HAVE_VF_VLAN_PROTO for SLE12SP3(bsc#1031705).
[+0002-kni-define-HAVE_VF_VLAN_PROTO-for-SLES12SP3.patch]
-------------------------------------------------------------------
Mon Mar 20 15:32:12 CET 2017 - ndas@suse.de

2
dpdk-thunderx.spec
View File

@ -58,6 +58,7 @@ Source1: preamble
# However, the problem still exists and the fix has to find its way to the
# upstream code.
Patch1: 0001-enic-fix-Type-punning-and-strict-aliasing-warning.patch
Patch2: 0002-kni-define-HAVE_VF_VLAN_PROTO-for-SLES12SP3.patch
BuildRequires: doxygen
BuildRequires: fdupes
BuildRequires: gcc6
@ -143,6 +144,7 @@ The DPDK Kernel NIC Interface (KNI) allows userspace applications access to the
%prep
%setup -q -n dpdk-stable-16.11.1
%patch1 -p1 -z .enic
%patch2 -p1 -z .kni
# This fixes CROSS compilation (broken) in the mk file for ThunderX
sed -i '/^CROSS /s/^/#/' mk/machine/thunderx/rte.vars.mk

6
dpdk.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Mar 30 16:50:07 CEST 2017 - ndas@suse.de
- Enable HAVE_VF_VLAN_PROTO for SLE12SP3(bsc#1031705).
[+0002-kni-define-HAVE_VF_VLAN_PROTO-for-SLES12SP3.patch]
-------------------------------------------------------------------
Mon Mar 20 15:32:12 CET 2017 - ndas@suse.de

2
dpdk.spec
View File

@ -56,6 +56,7 @@ Source1: preamble
# However, the problem still exists and the fix has to find its way to the
# upstream code.
Patch1: 0001-enic-fix-Type-punning-and-strict-aliasing-warning.patch
Patch2: 0002-kni-define-HAVE_VF_VLAN_PROTO-for-SLES12SP3.patch
BuildRequires: doxygen
BuildRequires: fdupes
BuildRequires: gcc6
@ -141,6 +142,7 @@ The DPDK Kernel NIC Interface (KNI) allows userspace applications access to the
%prep
%setup -q -n dpdk-stable-16.11.1
%patch1 -p1 -z .enic
%patch2 -p1 -z .kni
# This fixes CROSS compilation (broken) in the mk file for ThunderX
sed -i '/^CROSS /s/^/#/' mk/machine/thunderx/rte.vars.mk