From: Helin Zhang Date: Thu, 22 May 2014 03:35:17 +0000 (+0800) Subject: kni: fix build on Fedora 18 with kernel 3.6.10 X-Git-Tag: spdx-start~10796 X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=d719bc02aa4acdc147512b23ecab123a49ff3bac;p=dpdk.git kni: fix build on Fedora 18 with kernel 3.6.10 Error of "implicit-function-declaration" can be seen when building KNI kernel module on Linux kernel 3.6.10 platform, as follows. lib/librte_eal/linuxapp/kni/igb_ethtool.c: In function igb_get_eee: lib/librte_eal/linuxapp/kni/igb_ethtool.c: 2441:4: error: implicit declaration of function mmd_eee_adv_to_ethtool_adv_t lib/librte_eal/linuxapp/kni/igb_ethtool.c: In function igb_set_eee: lib/librte_eal/linuxapp/kni/igb_ethtool.c: 2551:2: error: implicit declaration of function ethtool_adv_to_mmd_eee_adv_t The root cause is as follows. On Fedora 18 with kernel 3.6.10, ETHTOOL_GEEE is defined in Linux header file of "linux/ethtool.h", while is not defined in most of other linux kernel versions. mmd_eee_cap_to_ethtool_sup_t(), mmd_eee_adv_to_ethtool_adv_t() and ethtool_adv_to_mmd_eee_adv_t() in kcompat.h are disabled by "#if !defined(ETHTOOL_GEEE) || (RHEL_RELEASE_CODE && RHEL_RELEASE_CODE <= RHEL_RELEASE_VERSION(6,4))", while are called in igb_get_eee() in igb_ethtool.c which is enabled by "#ifdef ETHTOOL_GEEE". Reported-by: Prashant Upadhyaya Signed-off-by: Helin Zhang Acked-by: Thomas Monjalon --- diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h index e9e80eab6e..4c27d5da58 100644 --- a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h +++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h @@ -3586,7 +3586,7 @@ static inline bool ether_addr_equal(const u8 *addr1, const u8 *addr2) #define ADVERTISED_40000baseLR4_Full (1 << 26) #endif -#if !defined(ETHTOOL_GEEE) || (RHEL_RELEASE_CODE && RHEL_RELEASE_CODE <= RHEL_RELEASE_VERSION(6,4)) +#if defined(ETHTOOL_GEEE) || (RHEL_RELEASE_CODE && RHEL_RELEASE_CODE <= RHEL_RELEASE_VERSION(6,4)) /** * mmd_eee_cap_to_ethtool_sup_t * @eee_cap: value of the MMD EEE Capability register