d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

kni: fix build on Ubuntu 12.04.5

Browse Source 
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 a09b359dac ("fix build on Ubuntu 14.04") describes the initial problem.

Signed-off-by: Daniel Mrzyglod <danielx.t.mrzyglod@intel.com>
[Thomas: reorder conditions to ease reading]
Acked-by: Thomas Monjalon <thomas.monjalon@6wind.com>
This commit is contained in:
Daniel Mrzyglod 2014-09-30 13:10:25 +01:00 committed by Thomas Monjalon
parent c6d8b70a30
commit e88c3b0a59
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h
View File

@ -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