DPDK patches and discussions
 help / color / mirror / Atom feed
From: Jincheng Miao <jmiao@redhat.com>
To: dev@dpdk.org
Subject: [dpdk-dev] [PATCH v2 1/2] igb_uio: compatible with upstream longterm kernel and RHEL6
Date: Fri, 31 Oct 2014 15:37:18 +0800
Message-ID: <1414741039-3531-2-git-send-email-jmiao@redhat.com> (raw)
In-Reply-To: <1414741039-3531-1-git-send-email-jmiao@redhat.com>

Function pci_num_vf() is introduced from upstream linux-2.6.34. So
this patch make compatible with longterm kernel linux-2.6.32.63.

For RHEL6's kernel, although it is based on linux-2.6.32, it has
pci_num_vf() implementation. As the same with commit 11ba0426,
pci_num_vf() is defined from RHEL6. So we should check the macro
RHEL_RELEASE_CODE to consider this situation.

Signed-off-by: Jincheng Miao <jmiao@redhat.com>
---
 lib/librte_eal/linuxapp/igb_uio/compat.h |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/lib/librte_eal/linuxapp/igb_uio/compat.h b/lib/librte_eal/linuxapp/igb_uio/compat.h
index 676fa1b..0639386 100644
--- a/lib/librte_eal/linuxapp/igb_uio/compat.h
+++ b/lib/librte_eal/linuxapp/igb_uio/compat.h
@@ -21,7 +21,9 @@
 #endif
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 34) && \
-	!defined(CONFIG_PCI_IOV)
+       (!(defined(RHEL_RELEASE_CODE) && \
+          RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(6, 0) && \
+          defined(CONFIG_PCI_IOV)))
 
 static int pci_num_vf(struct pci_dev *dev)
 {
-- 
1.7.1

  reply	other threads:[~2014-10-31  7:30 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-10-31  7:37 [dpdk-dev] [PATCH v2 0/2] compatibility fallback and replacement of kernel function invoking Jincheng Miao
2014-10-31  7:37 ` Jincheng Miao [this message]
2014-11-27 17:01   ` [dpdk-dev] [PATCH v2 1/2] igb_uio: compatible with upstream longterm kernel and RHEL6 Thomas Monjalon
2014-11-28  8:13     ` Jincheng Miao
2014-11-28 16:42       ` Thomas Monjalon
2014-12-02  4:01         ` Jincheng Miao
2014-10-31  7:37 ` [dpdk-dev] [PATCH v2 2/2] eal: replace strict_strtoul with kstrtoul Jincheng Miao
2014-11-28 16:45   ` 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=1414741039-3531-2-git-send-email-jmiao@redhat.com \
    --to=jmiao@redhat.com \
    --cc=dev@dpdk.org \
    /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

DPDK patches and discussions

This inbox may be cloned and mirrored by anyone:

	git clone --mirror https://inbox.dpdk.org/dev/0 dev/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 dev dev/ https://inbox.dpdk.org/dev \
		dev@dpdk.org
	public-inbox-index dev

Example config snippet for mirrors.
Newsgroup available over NNTP:
	nntp://inbox.dpdk.org/inbox.dpdk.dev


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git