* [dpdk-dev] [PATCH] kni:fix build on Ubuntu 12.04.5 with current HWE
@ 2014-09-30 12:10 Daniel Mrzyglod
2014-09-30 17:16 ` Thomas Monjalon
0 siblings, 1 reply; 2+ messages in thread
From: Daniel Mrzyglod @ 2014-09-30 12:10 UTC (permalink / raw)
To: dev
Recent Ubuntu 12.04.5 LTS is shipped with 3.13.0-36.63 as the only supported kernel.
Patch a09b359daca3d8af43dc22a57b34cf317f958236 describe the problem.
Signed-off-by: Daniel Mrzyglod <danielx.t.mrzyglod@intel.com>
---
lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
index 5a06383..65649ae 100644
--- a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
@@ -3861,7 +3861,8 @@ static inline struct sk_buff *__kc__vlan_hwaccel_put_tag(struct sk_buff *skb,
#if ( LINUX_VERSION_CODE < KERNEL_VERSION(3,14,0) )
#if (!(RHEL_RELEASE_CODE && RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(7,0)))
-#if (!(UBUNTU_RELEASE_CODE == UBUNTU_RELEASE_VERSION(14,4) && UBUNTU_KERNEL_CODE >= UBUNTU_KERNEL_VERSION(3,13,0,30,54)))
+#if (!((UBUNTU_RELEASE_CODE == UBUNTU_RELEASE_VERSION(14,4) \
+|| UBUNTU_RELEASE_CODE == UBUNTU_RELEASE_VERSION(12,4)) && UBUNTU_KERNEL_CODE >= UBUNTU_KERNEL_VERSION(3,13,0,30,54)))
#ifdef NETIF_F_RXHASH
#define PKT_HASH_TYPE_L3 0
static inline void
--
1.7.9.5
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [dpdk-dev] [PATCH] kni:fix build on Ubuntu 12.04.5 with current HWE
2014-09-30 12:10 [dpdk-dev] [PATCH] kni:fix build on Ubuntu 12.04.5 with current HWE Daniel Mrzyglod
@ 2014-09-30 17:16 ` Thomas Monjalon
0 siblings, 0 replies; 2+ messages in thread
From: Thomas Monjalon @ 2014-09-30 17:16 UTC (permalink / raw)
To: Daniel Mrzyglod; +Cc: dev
2014-09-30 13:10, Daniel Mrzyglod:
> Recent Ubuntu 12.04.5 LTS is shipped with 3.13.0-36.63 as the only supported kernel.
>
> Patch a09b359daca3d8af43dc22a57b34cf317f958236 describe the problem.
>
> Signed-off-by: Daniel Mrzyglod <danielx.t.mrzyglod@intel.com>
> #if ( LINUX_VERSION_CODE < KERNEL_VERSION(3,14,0) )
> #if (!(RHEL_RELEASE_CODE && RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(7,0)))
> -#if (!(UBUNTU_RELEASE_CODE == UBUNTU_RELEASE_VERSION(14,4) && UBUNTU_KERNEL_CODE >= UBUNTU_KERNEL_VERSION(3,13,0,30,54)))
> +#if (!((UBUNTU_RELEASE_CODE == UBUNTU_RELEASE_VERSION(14,4) \
> +|| UBUNTU_RELEASE_CODE == UBUNTU_RELEASE_VERSION(12,4)) && UBUNTU_KERNEL_CODE >= UBUNTU_KERNEL_VERSION(3,13,0,30,54)))
> #ifdef NETIF_F_RXHASH
Reordered the conditions and applied.
Thanks
--
Thomas
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-09-30 17:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-09-30 12:10 [dpdk-dev] [PATCH] kni:fix build on Ubuntu 12.04.5 with current HWE Daniel Mrzyglod
2014-09-30 17:16 ` Thomas Monjalon
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).