From 630ca107985bae3514778fb0b3111a88fc342e02 Mon Sep 17 00:00:00 2001 From: Intel Date: Mon, 3 Jun 2013 00:00:00 +0000 Subject: [PATCH] kni: fix build with kernel 3.8 - timecompare (used for hardware timestamping) has been removed. (see Linux commit 65f8f9a1c1db831e5159e3e3e50912d1f214cd0c) Simply disable HW_TIME_STAMP feature because it is not used by KNI. - annotations __devinit and __devexit have been removed. (see Linux commit 54b956b903607f8f8878754dd4352da6a54a1da2) Signed-off-by: Intel --- lib/librte_eal/linuxapp/kni/ethtool/igb/igb.h | 1 + lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/igb.h b/lib/librte_eal/linuxapp/kni/ethtool/igb/igb.h index 3cebff5ea4..1fe7ee56cd 100644 --- a/lib/librte_eal/linuxapp/kni/ethtool/igb/igb.h +++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/igb.h @@ -44,6 +44,7 @@ #include #endif +#undef HAVE_HW_TIME_STAMP #ifdef HAVE_HW_TIME_STAMP #include #include diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h index 553e1c0e03..7a36007c1f 100644 --- a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h +++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h @@ -955,6 +955,16 @@ struct vlan_ethhdr { #define __devexit_p(x) &(x) #endif +#else + /* For Kernel 3.8 these are not defined - so undefine all */ + #undef __devexit_p + #undef __devexit + #undef __devinit + #undef __devinitdata + #define __devexit_p(x) &(x) + #define __devexit + #define __devinit + #define __devinitdata #endif /* 2.4.17 => 2.4.13 */ /*****************************************************************************/ -- 2.20.1