From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by dpdk.org (Postfix) with ESMTP id 63E3C1B270 for ; Mon, 30 Oct 2017 16:38:23 +0100 (CET) Received: by mail-wr0-f196.google.com with SMTP id k62so13033073wrc.9 for ; Mon, 30 Oct 2017 08:38:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=j0mrJYhUVSe9fwUHwSchAf2ty4UIInVMoEB/UNMTD7M=; b=U6WO94KSZhcU7Tttj692qHcfTI194Bye5sRsEVUqHCb7CfwiqYNCyrN/iK3kGMNG3k /HuCL1Gozgj7j8MTgiM+fcsn3KW6lYzV1p6NqXGt7Dl1gQnF5K4VQBHaTMF8thWg2wD1 KKDM81bJ1gPw+1rQsu9L76n5MKcy2igX/Lna5RIm11aCnic3srgWNb9Wkcyf2Negj3x7 x0p6GCXHWjIwYimk7orF3rpfSNbKMVbJ9fZDSD1UHrmwHoFvwWNQ+usyTneztdtHzOUg T1ekvcVuSth0kOJffuSQ6yNcPw+FyLn8pwIIzhSarKu+pM9rJo63WCxB0sCO1qXF9GBT rSGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=j0mrJYhUVSe9fwUHwSchAf2ty4UIInVMoEB/UNMTD7M=; b=bbg5Ki1yVgH9GJhuZyYP/sO0YFhcbo79MAJzEgxXlD6uAYr/MnvJINPgPyN1mc+kkd 74gmsZW5qRDyWhI6JcLBwyVReMInyYF6ACd2ZaVMhNWYkpaZLp6X3963jnsqKHmuT5AZ BUgPe8dYOXZbmUreqVcWZBiyAveA/s80GCfjenjHXr8BrH2pu7RPULC78LdXtH18+wIG ILL6g0UZhRTLwhLj1Tnq+AwjF8S+keoh1FetOG1Ik7xZCZxKPny2dnJ96Bgou3RY6Wqi SCgZVHAR8UZzEVBujqYA7OG6SyrAXek/VJwjpShnGVhYJJAu8eGde9cMo2HxQCvnfb28 UeuQ== X-Gm-Message-State: AMCzsaVY5bO0PxbL1RnY0HCzivoA57suSngcCJvBWOe5gG9M+6IKdvY8 nbfi9jdJUo3oaD39jEj91aU= X-Google-Smtp-Source: ABhQp+SoeWCiBKK+AyJ3KBYQtv6GFfzzhcKMZnuT7duJqUHU44bGrDCs0hDIN7T028hfv7BZhHKKiw== X-Received: by 10.223.192.10 with SMTP id z10mr8226644wre.101.1509377903114; Mon, 30 Oct 2017 08:38:23 -0700 (PDT) Received: from localhost ([2a00:23c5:bef3:400:4a51:b7ff:fe0b:4749]) by smtp.gmail.com with ESMTPSA id v5sm10579470wrf.29.2017.10.30.08.38.22 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 30 Oct 2017 08:38:22 -0700 (PDT) From: luca.boccassi@gmail.com To: Nirmoy Das Cc: Ferruh Yigit , dpdk stable Date: Mon, 30 Oct 2017 15:35:05 +0000 Message-Id: <20171030153511.13322-62-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171030153511.13322-1-luca.boccassi@gmail.com> References: <20171030153511.13322-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'kni: fix build on SLE12 SP3' has been queued to LTS release 16.11.4 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 Oct 2017 15:38:23 -0000 Hi, FYI, your patch has been queued to LTS release 16.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/01/17. So please shout if anyone has objections. Thanks. Kind regards, Luca Boccassi --- >>From b59cee0207dee33a791d289523910532f431a595 Mon Sep 17 00:00:00 2001 From: Nirmoy Das Date: Mon, 9 Oct 2017 23:04:09 +0100 Subject: [PATCH] kni: fix build on SLE12 SP3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit 47b1119fd1a0c79eeadb5e96e1903d6f4b738f36 ] build error: build/lib/librte_eal/linuxapp/kni/kni_net.c:215:5: error: ‘struct net_device’ has no member named ‘trans_start’ dev->trans_start = jiffies; Signed-off-by: Nirmoy Das Signed-off-by: Ferruh Yigit --- lib/librte_eal/linuxapp/kni/compat.h | 31 ++++++++++++++++++++++++++++++- 1 file changed, 30 insertions(+), 1 deletion(-) diff --git a/lib/librte_eal/linuxapp/kni/compat.h b/lib/librte_eal/linuxapp/kni/compat.h index 6a1587b4e..3f8c0bc87 100644 --- a/lib/librte_eal/linuxapp/kni/compat.h +++ b/lib/librte_eal/linuxapp/kni/compat.h @@ -8,6 +8,34 @@ #define RHEL_RELEASE_VERSION(a, b) (((a) << 8) + (b)) #endif +/* SuSE version macro is the same as Linux kernel version */ +#ifndef SLE_VERSION +#define SLE_VERSION(a, b, c) KERNEL_VERSION(a, b, c) +#endif +#ifdef CONFIG_SUSE_KERNEL +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 57)) +/* SLES12SP3 is at least 4.4.57+ based */ +#define SLE_VERSION_CODE SLE_VERSION(12, 3, 0) +#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 12, 28)) +/* SLES12 is at least 3.12.28+ based */ +#define SLE_VERSION_CODE SLE_VERSION(12, 0, 0) +#elif ((LINUX_VERSION_CODE >= KERNEL_VERSION(3, 0, 61)) && \ + (LINUX_VERSION_CODE < KERNEL_VERSION(3, 1, 0))) +/* SLES11 SP3 is at least 3.0.61+ based */ +#define SLE_VERSION_CODE SLE_VERSION(11, 3, 0) +#elif (LINUX_VERSION_CODE == KERNEL_VERSION(2, 6, 32)) +/* SLES11 SP1 is 2.6.32 based */ +#define SLE_VERSION_CODE SLE_VERSION(11, 1, 0) +#elif (LINUX_VERSION_CODE == KERNEL_VERSION(2, 6, 27)) +/* SLES11 GA is 2.6.27 based */ +#define SLE_VERSION_CODE SLE_VERSION(11, 0, 0) +#endif /* LINUX_VERSION_CODE == KERNEL_VERSION(x,y,z) */ +#endif /* CONFIG_SUSE_KERNEL */ +#ifndef SLE_VERSION_CODE +#define SLE_VERSION_CODE 0 +#endif /* SLE_VERSION_CODE */ + + #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39) && \ (!(defined(RHEL_RELEASE_CODE) && \ RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(6, 4))) @@ -55,7 +83,8 @@ #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 7, 0) || \ (defined(RHEL_RELEASE_CODE) && \ - RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(7, 4)) + RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(7, 4)) || \ + (SLE_VERSION_CODE && SLE_VERSION_CODE == SLE_VERSION(12, 3, 0)) #define HAVE_TRANS_START_HELPER #endif -- 2.11.0