From patchwork Fri Oct 31 07:37:18 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jincheng Miao X-Patchwork-Id: 1068 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 9E8D87F08; Fri, 31 Oct 2014 08:30:24 +0100 (CET) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id 092B1677B for ; Fri, 31 Oct 2014 08:30:21 +0100 (CET) Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s9V7dKlr030990 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Fri, 31 Oct 2014 03:39:21 -0400 Received: from dhcp-66-71-51.eng.nay.redhat.com.com (dhcp-66-71-51.eng.nay.redhat.com [10.66.71.51] (may be forged)) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s9V7dHpJ013628; Fri, 31 Oct 2014 03:39:19 -0400 From: Jincheng Miao To: dev@dpdk.org Date: Fri, 31 Oct 2014 15:37:18 +0800 Message-Id: <1414741039-3531-2-git-send-email-jmiao@redhat.com> In-Reply-To: <1414741039-3531-1-git-send-email-jmiao@redhat.com> References: <1414741039-3531-1-git-send-email-jmiao@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 Subject: [dpdk-dev] [PATCH v2 1/2] igb_uio: compatible with upstream longterm kernel and RHEL6 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" 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 Signed-off-by: Guillaume Gaudonville Signed-off-by: David Marchand Signed-off-by: Thomas Monjalon --- 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) {