DPDK patches and discussions
 help / color / mirror / Atom feed
From: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>
To: "dev@dpdk.org" <dev@dpdk.org>
Cc: Hayato Momma <h-momma@ce.jp.nec.com>
Subject: [dpdk-dev] [PATCH] kni: compatibility with RHEL 7
Date: Thu, 12 Jun 2014 08:09:54 +0000	[thread overview]
Message-ID: <7F861DC0615E0C47A872E6F3C5FCDDBD0110E674@BPXM14GP.gisp.nec.co.jp> (raw)

From: Hiroshi Shimamoto <h-shimamoto@ct.jp.nec.com>

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 <h-shimamoto@ct.jp.nec.com>
Reviewed-by: Hayato Momma <h-momma@ce.jp.nec.com>
---
 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 /* >= 3.10.0 */
 
 #if ( LINUX_VERSION_CODE < KERNEL_VERSION(3,14,0) )
+
+#if (!(RHEL_RELEASE_CODE && RHEL_RELEASE_CODE >= 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)
 	skb->rxhash = hash;
 }
 #endif /* NETIF_F_RXHASH */
+#endif /* < RHEL7 */
+
 #endif /* < 3.14.0 */
 
 #endif /* _KCOMPAT_H_ */
-- 
1.9.1

             reply	other threads:[~2014-06-12  8:12 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-06-12  8:09 Hiroshi Shimamoto [this message]
2014-06-12  9:18 ` Cao, Waterman
2014-06-12  9:35   ` Hiroshi Shimamoto
2014-06-25 10:05     ` Thomas Monjalon
2014-06-25 13:39       ` Cao, Waterman
2014-06-26 11:22       ` Cao, Waterman
2014-06-26 11:38         ` Hiroshi Shimamoto
2014-06-30  4:45           ` Hiroshi Shimamoto
2014-06-30  6:40             ` Cao, Waterman
2014-06-30  8:36       ` Cao, Waterman
2014-06-30  8:43         ` Thomas Monjalon
2014-07-01 22:03 ` Thomas Monjalon

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=7F861DC0615E0C47A872E6F3C5FCDDBD0110E674@BPXM14GP.gisp.nec.co.jp \
    --to=h-shimamoto@ct.jp.nec.com \
    --cc=dev@dpdk.org \
    --cc=h-momma@ce.jp.nec.com \
    /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).