From 11ba04265cfd2a53c12c030fcaa5dfe7eed39a42 Mon Sep 17 00:00:00 2001 From: Guillaume Gaudonville Date: Wed, 3 Sep 2014 10:18:23 +0200 Subject: [PATCH] igb_uio: fix build on RHEL 6.3 - pci_num_vf() is already defined in RHEL 6 - pci_intx_mask_supported is already defined in RHEL 6.3 - pci_check_and_mask_intx is already defined in RHEL 6.3 Signed-off-by: Guillaume Gaudonville Signed-off-by: David Marchand Signed-off-by: Thomas Monjalon --- lib/librte_eal/linuxapp/igb_uio/compat.h | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/lib/librte_eal/linuxapp/igb_uio/compat.h b/lib/librte_eal/linuxapp/igb_uio/compat.h index 2c48ed3e51..676fa1b385 100644 --- a/lib/librte_eal/linuxapp/igb_uio/compat.h +++ b/lib/librte_eal/linuxapp/igb_uio/compat.h @@ -2,6 +2,9 @@ * Minimal wrappers to allow compiling igb_uio on older kernels. */ +#ifndef RHEL_RELEASE_VERSION +#define RHEL_RELEASE_VERSION(a, b) (((a) << 8) + (b)) +#endif #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0) #define pci_cfg_access_lock pci_block_user_cfg_access @@ -17,7 +20,9 @@ #define PCI_MSIX_ENTRY_CTRL_MASKBIT 1 #endif -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 34) +#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 34) && \ + !defined(CONFIG_PCI_IOV) + static int pci_num_vf(struct pci_dev *dev) { struct iov { @@ -35,10 +40,12 @@ static int pci_num_vf(struct pci_dev *dev) return iov->nr_virtfn; } -#endif +#endif /* < 2.6.34 */ -#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0) +#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 3, 0) && \ + (!(defined(RHEL_RELEASE_CODE) && \ + RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(6, 3))) /* Check if INTX works to control irq's. * Set's INTX_DISABLE flag and reads it back @@ -92,4 +99,5 @@ static bool pci_check_and_mask_intx(struct pci_dev *pdev) return pending; } -#endif + +#endif /* < 3.3.0 */ -- 2.20.1