summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJincheng Miao <jmiao@redhat.com>2014-12-10 11:33:00 +0800
committerThomas Monjalon <thomas.monjalon@6wind.com>2014-12-11 01:42:02 +0100
commit81ab433fffa4885a76023abd3c8a7e47aee014e3 (patch)
tree5071caac0848ddde7b3122272dfbc125b9f2c249
parent18f59001982558896303e59bcd721014f02fbd71 (diff)
downloaddpdk-81ab433fffa4885a76023abd3c8a7e47aee014e3.zip
dpdk-81ab433fffa4885a76023abd3c8a7e47aee014e3.tar.gz
dpdk-81ab433fffa4885a76023abd3c8a7e47aee014e3.tar.xz
igb_uio: fix build with long term kernel and RHEL
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 RHEL, function pci_num_vf() begins from RHEL5 update9. And it is stub-defined when CONFIG_PCI_IOV is not enabled. So dropped the CONFIG_PCI_IOV checking of commit 11ba0426. For other distro like RHEL behaved to pci_num_vf(), we could simply append following condition macro: (!(defined(OTHER_RELEASE_CODE) && \ OTHER_RELEASE_CODE >= OTHER_RELEASE_VERSION(X, Y))) Signed-off-by: Jincheng Miao <jmiao@redhat.com> Acked-by: Thomas Monjalon <thomas.monjalon@6wind.com>
-rw-r--r--lib/librte_eal/linuxapp/igb_uio/compat.h3
1 files changed, 2 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..00934d8 100644
--- a/lib/librte_eal/linuxapp/igb_uio/compat.h
+++ b/lib/librte_eal/linuxapp/igb_uio/compat.h
@@ -21,7 +21,8 @@
#endif
#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 34) && \
- !defined(CONFIG_PCI_IOV)
+ (!(defined(RHEL_RELEASE_CODE) && \
+ RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(5, 9)))
static int pci_num_vf(struct pci_dev *dev)
{