DPDK patches and discussions
 help / color / mirror / Atom feed
From: Stephen Hemminger <stephen@networkplumber.org>
To: Nirmoy Das <ndas@suse.de>
Cc: ferruh.yigit@intel.com, dev@dpdk.org
Subject: Re: [dpdk-dev] [PATCH v2] kni: fix build on SLE12 SP3
Date: Tue, 29 Aug 2017 08:12:52 -0700	[thread overview]
Message-ID: <20170829081252.562f9313@xeon-e3> (raw)
In-Reply-To: <20170829150613.10597-1-ndas@suse.de>

On Tue, 29 Aug 2017 17:06:13 +0200
Nirmoy Das <ndas@suse.de> wrote:

> compilation error:
> build/lib/librte_eal/linuxapp/kni/kni_net.c:215:5: error:
> ‘struct net_device’ has no member named ‘trans_start’
>   dev->trans_start = jiffies;
> 
> Signed-off-by: Nirmoy Das <ndas@suse.de>
> ---
>  lib/librte_eal/linuxapp/kni/compat.h | 32 +++++++++++++++++++++++++++++++-
>  1 file changed, 31 insertions(+), 1 deletion(-)
> 
> diff --git a/lib/librte_eal/linuxapp/kni/compat.h b/lib/librte_eal/linuxapp/kni/compat.h
> index 6a1587b4e..19f8e96ce 100644
> --- a/lib/librte_eal/linuxapp/kni/compat.h
> +++ b/lib/librte_eal/linuxapp/kni/compat.h
> @@ -8,6 +8,34 @@
>  #define RHEL_RELEASE_VERSION(a, b) (((a) << 8) + (b))
>  #endif
>  
> +/* SuSE version macro is the same as Linux kernel version */
> +#ifndef SLE_VERSION
> +#define SLE_VERSION(a, b, c) KERNEL_VERSION(a, b, c)
> +#endif
> +#ifdef CONFIG_SUSE_KERNEL
> +#if (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)
> +#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(3, 0, 61)) && \
> +       (LINUX_VERSION_CODE < KERNEL_VERSION(3, 1, 0)))
> +/* SLES11 SP3 is at least 3.0.61+ based */
> +#define SLE_VERSION_CODE SLE_VERSION(11, 3, 0)
> +#elif (LINUX_VERSION_CODE == KERNEL_VERSION(2, 6, 32))
> +/* SLES11 SP1 is 2.6.32 based */
> +#define SLE_VERSION_CODE SLE_VERSION(11, 1, 0)
> +#elif (LINUX_VERSION_CODE == KERNEL_VERSION(2, 6, 27))
> +/* SLES11 GA is 2.6.27 based */
> +#define SLE_VERSION_CODE SLE_VERSION(11, 0, 0)
> +#endif /* LINUX_VERSION_CODE == KERNEL_VERSION(x,y,z) */
> +#endif /* CONFIG_SUSE_KERNEL */
> +#ifndef SLE_VERSION_CODE
> +#define SLE_VERSION_CODE 0
> +#endif /* SLE_VERSION_CODE */
> +
> +
>  #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39) && \
>  	(!(defined(RHEL_RELEASE_CODE) && \
>  	   RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(6, 4)))
> @@ -55,7 +83,9 @@
>  
>  #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) || \
>  	(defined(RHEL_RELEASE_CODE) && \
> -	 RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(7, 4))
> +	 RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(7, 4)) || \
> +	 (defined(SLE_VERSION_CODE) && \
> +	  SLE_VERSION_CODE == SLE_VERSION(12, 3, 0))
>  #define HAVE_TRANS_START_HELPER
>  #endif
>  

Sigh. KNI needs to get upstream, or we need to leave RHEL and SLES
version magic to the distros to manage as their own patches.

This kind of spaghetti of ifdef's is unmanageable, untestable, and 
just plain ugly.

  reply	other threads:[~2017-08-29 15:12 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-08-29 15:06 Nirmoy Das
2017-08-29 15:12 ` Stephen Hemminger [this message]
2017-09-04  9:47   ` Ferruh Yigit
2017-09-04  9:46 ` Ferruh Yigit
2017-09-05  9:55   ` Nirmoy Das
2017-10-06 21:42     ` Ferruh Yigit
2017-10-09 22:04 ` [dpdk-dev] [PATCH v3] " Ferruh Yigit
2017-10-13 22:47   ` Ferruh Yigit

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170829081252.562f9313@xeon-e3 \
    --to=stephen@networkplumber.org \
    --cc=dev@dpdk.org \
    --cc=ferruh.yigit@intel.com \
    --cc=ndas@suse.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).