From 8c910d01aedf435128287dc8c556e48c1a8660e7 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Tue, 29 Apr 2014 16:16:03 +0200 Subject: [PATCH] kni: fix build with debian kernel 3.2.57-2 Following debian kernel headers upgrade to 3.2.57, pci capability accessors have been backported (upstream commit 8c0d3a02c1309eb6112d2e7c8172e8ceb26ecfca, ("PCI: Add accessors for PCI Express Capability", v3.7-rc1)). It results in the same compilation error as redhat 6.x. However, there is no clear way to determine we are building on a debian kernel. So, rather than determine if we are building on a distribution kernel, look at PCI_EXP_LNKSTA2 that appeared in this upstream commit. Signed-off-by: David Marchand Acked-by: Neil Horman --- lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h index d2f65ab540..19df4836b9 100644 --- a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h +++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h @@ -3691,8 +3691,7 @@ static inline u8 pci_pcie_type(struct pci_dev *pdev) #define ptp_clock_register(caps, args...) ptp_clock_register(caps) -#if !(SLE_VERSION_CODE && SLE_VERSION_CODE >= SLE_VERSION(11,3,0)) && \ - !(RHEL_RELEASE_CODE && RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(6,5)) +#ifndef PCI_EXP_LNKSTA2 int __kc_pcie_capability_read_word(struct pci_dev *dev, int pos, u16 *val); #define pcie_capability_read_word(d,p,v) __kc_pcie_capability_read_word(d,p,v) int __kc_pcie_capability_write_word(struct pci_dev *dev, int pos, u16 val); @@ -3709,8 +3708,7 @@ static inline int pcie_capability_clear_word(struct pci_dev *dev, int pos, { return __kc_pcie_capability_clear_and_set_word(dev, pos, clear, 0); } -#endif /* !(SLE_VERSION_CODE && SLE_VERSION_CODE >= SLE_VERSION(11,3,0)) && \ - !(RHEL_RELEASE_CODE && RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(6,5)) */ +#endif /* !PCI_EXP_LNKSTA2 */ #if (SLE_VERSION_CODE && SLE_VERSION_CODE >= SLE_VERSION(11,3,0)) #define USE_CONST_DEV_UC_CHAR -- 2.20.1