From bd246ac340c82d3a8e701242d4d550c05914c53f7ebca7f125a372223640ec7e Mon Sep 17 00:00:00 2001
From: Dirk Mueller <dmueller@suse.com>
Date: Wed, 5 Apr 2017 11:45:54 +0000
Subject: [PATCH] Accepting request 484048 from home:ndas:branches:network

- 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
---
 ...ine-HAVE_VF_VLAN_PROTO-for-SLES12SP3.patch | 33 +++++++++++++++++++
 dpdk-thunderx.changes                         |  6 ++++
 dpdk-thunderx.spec                            |  2 ++
 dpdk.changes                                  |  6 ++++
 dpdk.spec                                     |  2 ++
 5 files changed, 49 insertions(+)
 create mode 100644 0002-kni-define-HAVE_VF_VLAN_PROTO-for-SLES12SP3.patch

diff --git a/0002-kni-define-HAVE_VF_VLAN_PROTO-for-SLES12SP3.patch b/0002-kni-define-HAVE_VF_VLAN_PROTO-for-SLES12SP3.patch
new file mode 100644
index 0000000..ab2d733
--- /dev/null
+++ b/0002-kni-define-HAVE_VF_VLAN_PROTO-for-SLES12SP3.patch
@@ -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
+
diff --git a/dpdk-thunderx.changes b/dpdk-thunderx.changes
index e61f574..66a50a8 100644
--- a/dpdk-thunderx.changes
+++ b/dpdk-thunderx.changes
@@ -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
 
diff --git a/dpdk-thunderx.spec b/dpdk-thunderx.spec
index 22d9c8a..3c136a3 100644
--- a/dpdk-thunderx.spec
+++ b/dpdk-thunderx.spec
@@ -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
 
diff --git a/dpdk.changes b/dpdk.changes
index e61f574..66a50a8 100644
--- a/dpdk.changes
+++ b/dpdk.changes
@@ -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
 
diff --git a/dpdk.spec b/dpdk.spec
index 701b758..4276065 100644
--- a/dpdk.spec
+++ b/dpdk.spec
@@ -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