From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ferruh Yigit Subject: Re: [PATCH v2] kni: define HAVE_VF_VLAN_PROTO for SLES12SP3 Date: Tue, 4 Apr 2017 14:43:52 +0100 Message-ID: <6d6af113-0133-c938-a8ba-c636303b628d@intel.com> References: <20170404131948.13899-1-ndas@suse.de> Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 8bit To: Nirmoy Das , dev@dpdk.org Return-path: Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id 970EC2C6E for ; Tue, 4 Apr 2017 15:43:54 +0200 (CEST) In-Reply-To: <20170404131948.13899-1-ndas@suse.de> List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" On 4/4/2017 2:19 PM, Nirmoy Das wrote: > Add support for SLES12SP3, which uses kernel 4.4, > but backported features from newer kernels. > > Signed-off-by: Nirmoy Das > --- > lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h | 9 +++++++-- > 1 file changed, 7 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..173599ccd 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,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(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 */ Is it possible to use SLE_VERSION_CODE check same as rest of the document?: (SLE_VERSION_CODE && SLE_VERSION_CODE >= SLE_VERSION(12, 3, 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, >= SLES12SP3 */ > > #endif /* _KCOMPAT_H_ */ >