From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-we0-f179.google.com (mail-we0-f179.google.com [74.125.82.179]) by dpdk.org (Postfix) with ESMTP id 17DB26885 for ; Fri, 13 Sep 2013 16:13:58 +0200 (CEST) Received: by mail-we0-f179.google.com with SMTP id x55so1224982wes.10 for ; Fri, 13 Sep 2013 07:14:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:in-reply-to:references:mime-version:content-type :content-transfer-encoding; bh=S93t3Djjx4dzP41pMuOWp0DZerZ+T/4sy7kRP0EizoA=; b=Wx83+7XOgz2OyaoDovEsXqtx4yV7Qp30Hi8KOP1Kf7FTWixKys9DmSGI2u8cde+QhC 174n1oz3QwUi2SoSxf3GcgafjNaSqTQ7HAUemDIt3+idzRECSWKsGZ/a95dz1ByPyFlB RjFV5B/wruDGBnLE51nsyklcNmvJHVQ0fL7fdpnOzrTneRkAIws8hFHR/b2GNoIS9HkK 22+jJmCEVzvS/Hqwo7f2Ruvb1hHys9ld1kWitj6yvzV9NTQSoQ68YzTJ35VmDkxs1P/i iE48yp1j2REDScbf3G0rfijYK/g3+L7Cxntcda08cBYpNKm59RNMLdlQavMiav5CtnZG f9FQ== X-Gm-Message-State: ALoCoQl6fLqkdPMWccP/o22b9gKkUjdsF1fc2GfrpqV7QnQC1p2oEYMtHyshC81DfaB28etxejtk X-Received: by 10.180.39.212 with SMTP id r20mr2742370wik.13.1379081675198; Fri, 13 Sep 2013 07:14:35 -0700 (PDT) Received: from 6wind.com (guy78-3-82-239-227-177.fbx.proxad.net. [82.239.227.177]) by mx.google.com with ESMTPSA id q5sm3882616wiz.3.1969.12.31.16.00.00 (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 13 Sep 2013 07:14:34 -0700 (PDT) Received: by 6wind.com (sSMTP sendmail emulation); Fri, 13 Sep 2013 16:14:32 +0200 From: Thomas Monjalon To: dev@dpdk.org Date: Fri, 13 Sep 2013 16:14:27 +0200 Message-Id: <95c752508913ea02f74b36c53eb7d5ae88a29dc0.1379081595.git.thomas.monjalon@6wind.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: References: In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v2 1/4] kni: fix build with kernel 3.8 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 13 Sep 2013 14:13:58 -0000 - 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. For this purpose, kcompat.h must be included before testing for HAVE_HW_TIME_STAMP. - annotations __devinit and __devexit have been removed. (see Linux commit 54b956b903607f8f8878754dd4352da6a54a1da2) Signed-off-by: Thomas Monjalon Tested-by: David Nyström --- lib/librte_eal/linuxapp/kni/ethtool/igb/igb.h | 5 ++--- lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h | 23 +++++++++++++++++++++ 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/igb.h b/lib/librte_eal/linuxapp/kni/ethtool/igb/igb.h index 3cebff5..5567a6c 100644 --- a/lib/librte_eal/linuxapp/kni/ethtool/igb/igb.h +++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/igb.h @@ -30,6 +30,8 @@ #ifndef _IGB_H_ #define _IGB_H_ +#include "kcompat.h" + #include #ifndef IGB_NO_LRO @@ -63,9 +65,6 @@ struct igb_adapter; #undef IGB_PER_PKT_TIMESTAMP #endif - -#include "kcompat.h" - #ifdef HAVE_SCTP #include #endif diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h index a2aa361..f6e82c1 100644 --- a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h +++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h @@ -3040,4 +3040,27 @@ typedef netdev_features_t kni_netdev_features_t; #else #define HAVE_FDB_OPS #endif /* < 3.5.0 */ + +/*****************************************************************************/ +/* 3.8 */ + +/* timecompare has been removed and HW_TIME_STAMP is not used by KNI ethtool */ +#undef HAVE_HW_TIME_STAMP + +#ifndef __devinit +#define __devinit +#endif + +#ifndef __devinitdata +#define __devinitdata +#endif + +#ifndef __devexit +#define __devexit +#endif + +#ifndef __devexit_p +#define __devexit_p +#endif + #endif /* _KCOMPAT_H_ */ -- 1.7.10.4