From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Monjalon Subject: Re: [PATCH] kni: compatibility with RHEL 7 Date: Wed, 25 Jun 2014 03:05:06 -0700 (PDT) Message-ID: <2412606.IsDGqMgZ84@xps13> References: <7F861DC0615E0C47A872E6F3C5FCDDBD0110E674@BPXM14GP.gisp.nec.co.jp> <7F861DC0615E0C47A872E6F3C5FCDDBD0110EB24@BPXM14GP.gisp.nec.co.jp> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Cc: dev-VfR2kkLFssw@public.gmane.org, Hayato Momma To: "Cao, Waterman" Return-path: In-Reply-To: <7F861DC0615E0C47A872E6F3C5FCDDBD0110EB24-ZmjkEB1lVlLt6d3pZDjeaEtBU8KWyXPq@public.gmane.org> List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces-VfR2kkLFssw@public.gmane.org Sender: "dev" Hi Waterman, 2014-06-12 09:35, Hiroshi Shimamoto: > 2014-06-12 09:18, Cao, Waterman: > > Can you give details about Linux Kernel version and complier vers= ion? > > Because we tried to build code in the Redhat 7.0 before, but we d= on't > > meet this issue. Please see information as the following: > > Linux kernel 3.10.0-54.0.1.el7.x86_64 > > RHEL70BETA_64=09GCC 4.8.2 ICC: 14.0.0 >=20 > Yes, >=20 > Linux REHEL7RC-1 3.10.0-121.el7.x86_64 #1 SMP Tue Apr 8 10:48:19 EDT = 2014 > x86_64 x86_64 x86_64 GNU/Linux gcc version 4.8.2 20140120 (Red Hat > 4.8.2-16) (GCC) >=20 > I got the below error; > /path/to/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h:3851:1: er= ror: > conflicting types for =E2=80=98skb_set_hash=E2=80=99 skb_set_hash(str= uct sk_buff *skb, > __u32 hash, __always_unused int type) >=20 > /usr/src/kernels/3.10.0-121.el7.x86_64/include/linux/skbuff.h:762:1: = note: > previous definition of =E2=80=98skb_set_hash=E2=80=99 was here skb_se= t_hash(struct sk_buff > *skb, __u32 hash, enum pkt_hash_types type) Could you confirm this fix is needed and acknowledge it? Thanks > > -----Original Message----- > >=20 > > >From: dev [mailto:dev-bounces-VfR2kkLFssw@public.gmane.org] On Behalf Of Hiroshi Shima= moto > > >Sent: Thursday, June 12, 2014 4:10 PM > > >To: dev-VfR2kkLFssw@public.gmane.org > > >Cc: Hayato Momma > > >Subject: [dpdk-dev] [PATCH] kni: compatibility with RHEL 7 > > > > > >From: Hiroshi Shimamoto > > > > > >Compilation in RHEL7 is failed. This fixes the build issue. > > > > > >RHEL7 has skb_set_hash, the kernel version is 3.10 though. > > >Don't define skb_set_hash for RHEL7. > > > > > >Signed-off-by: Hiroshi Shimamoto > > >Reviewed-by: Hayato Momma > > >--- > > > > > > lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h | 5 +++++ > > > 1 file changed, 5 insertions(+) > > > > > >diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h > > >b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h index > > >4c27d5d..b4de6e2 100644 > > >--- a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h > > >+++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h > > >@@ -3843,6 +3843,9 @@ static inline struct sk_buff > > >*__kc__vlan_hwaccel_put_tag(struct sk_buff *skb, #endif /* >=3D 3= .10.0>=20 > > */ > >=20 > > > #if ( LINUX_VERSION_CODE < KERNEL_VERSION(3,14,0) ) > > > > > >+ > > >+#if (!(RHEL_RELEASE_CODE && RHEL_RELEASE_CODE >=3D > > >+RHEL_RELEASE_VERSION(7,0))) > > >+ > > > > > > #ifdef NETIF_F_RXHASH > > > #define PKT_HASH_TYPE_L3 0 > > > static inline void > > > > > >@@ -3851,6 +3854,8 @@ skb_set_hash(struct sk_buff *skb, __u32 hash= , > > >__always_unused int type)> > > > > =09skb->rxhash =3D hash; > > >=20 > > > } > > > #endif /* NETIF_F_RXHASH */ > > > > > >+#endif /* < RHEL7 */ > > >+ > > > > > > #endif /* < 3.14.0 */ > > >=20 > > > #endif /* _KCOMPAT_H_ */ > > > > > >-- > > >1.9.1 --=20 Thomas