From mboxrd@z Thu Jan 1 00:00:00 1970 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) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=intel; t=1491313434; x=1522849434; h=subject:to:references:from:message-id:date:mime-version: in-reply-to:content-transfer-encoding; bh=yzbBPQ/BHEfKPhNO78uhtk8I1XagCTMNaS4HK5tt33k=; b=OjS8E+Lt5mhtoE1JsQYAZ0CAbDjYxthwTkVfhZMFdcQzuiE4Q6DIcUVm Wff544IzuU4zs6uHsn8tWr+KkXzsxw==; Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 04 Apr 2017 06:43:53 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.36,275,1486454400"; d="scan'208";a="84497399" Received: from fyigit-mobl1.ger.corp.intel.com (HELO [10.237.220.122]) ([10.237.220.122]) by fmsmga006.fm.intel.com with ESMTP; 04 Apr 2017 06:43:52 -0700 To: Nirmoy Das , dev@dpdk.org References: <20170404131948.13899-1-ndas@suse.de> From: Ferruh Yigit Message-ID: <6d6af113-0133-c938-a8ba-c636303b628d@intel.com> Date: Tue, 4 Apr 2017 14:43:52 +0100 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.8.0 MIME-Version: 1.0 In-Reply-To: <20170404131948.13899-1-ndas@suse.de> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 8bit Subject: Re: [dpdk-dev] [PATCH v2] kni: define HAVE_VF_VLAN_PROTO for SLES12SP3 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 04 Apr 2017 13:43:55 -0000 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_ */ >