From: Daniel Mrzyglod Date: Tue, 30 Sep 2014 12:10:25 +0000 (+0100) Subject: kni: fix build on Ubuntu 12.04.5 X-Git-Tag: spdx-start~10372 X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=e88c3b0a;p=dpdk.git kni: fix build on Ubuntu 12.04.5 Recent Ubuntu 12.04.5 LTS is shipped with 3.13.0-36.63 as the only supported kernel. So skb_set_hash has been backported and is conflicting with kni kcompat one. Commit a09b359daca ("fix build on Ubuntu 14.04") describes the initial problem. Signed-off-by: Daniel Mrzyglod [Thomas: reorder conditions to ease reading] Acked-by: Thomas Monjalon --- diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h index 5a06383678..3dbc07a4b4 100644 --- a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h +++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h @@ -3861,7 +3861,9 @@ 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_KERNEL_CODE >= UBUNTU_KERNEL_VERSION(3,13,0,30,54) \ + && (UBUNTU_RELEASE_CODE == UBUNTU_RELEASE_VERSION(12,4) \ + || UBUNTU_RELEASE_CODE == UBUNTU_RELEASE_VERSION(14,4)))) #ifdef NETIF_F_RXHASH #define PKT_HASH_TYPE_L3 0 static inline void