[dpdk-stable] patch 'kni: fix build on Suse 12 SP3' has been queued to LTS release 16.11.2

[Nirmoy Das]

Hi yliu.

I realized the fix is not complete. I need to add some more
changes to make it work properly.

So I would say lets not add the patch to LTS release for now.

On 04/07/2017 10:11 AM, Yuanhan Liu wrote:
> Hi,
> 
> FYI, your patch has been queued to LTS release 16.11.2
> 
> Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable
> yet. It will be pushed if I get no objections before 04/11/17.
> So please shout if anyone has objections.
> 
> Thanks.
> 
> 	--yliu
> 
> ---
> From 7fd328241579dfcb4a4bffc5d1b15ebde21759b6 Mon Sep 17 00:00:00 2001
> From: Nirmoy Das <ndas at suse.de>
> Date: Tue, 4 Apr 2017 16:16:23 +0200
> Subject: [PATCH] kni: fix build on Suse 12 SP3
> 
> [ upstream commit 2972254ce1630548d7b62ef7a6c61ce7c1a4b124 ]
> 
> Add support for SLES12SP3, which uses kernel 4.4,
> but backported features from newer kernels.
> 
> Signed-off-by: Nirmoy Das <ndas at suse.de>
> Acked-by: Ferruh Yigit <ferruh.yigit at intel.com>
> ---
>  lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h | 8 ++++++--
>  1 file changed, 6 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 84826b2..4abab4a 100644
> --- a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
> +++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
> @@ -710,6 +710,9 @@ struct _kc_ethtool_pauseparam {
>  #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(4, 4, 57))
> +/* SLES12SP3 is at least 4.4.57+ based */
> +#define SLE_VERSION_CODE SLE_VERSION(12, 3, 0)
>  #endif /* LINUX_VERSION_CODE == KERNEL_VERSION(x,y,z) */
>  #endif /* CONFIG_SUSE_KERNEL */
>  #ifndef SLE_VERSION_CODE
> @@ -3929,8 +3932,9 @@ 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)) || \
> +    (SLE_VERSION_CODE && SLE_VERSION_CODE >= SLE_VERSION(12, 3, 0)))
>  #define HAVE_VF_VLAN_PROTO
> -#endif /* >= 4.9.0 */
> +#endif /* >= 4.9.0, >= SLES12SP3 */
>  
>  #endif /* _KCOMPAT_H_ */
> 

Nirmoy
-- 
SUSE Linux GmbH, GF: Felix Imendörffer, Jane Smithard, Graham Norton HRB
21284 (AG Nürnberg) Maxfeldstr. 5
D-90409 Nürnberg / Phone: +49-911-740 18-4