From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from out4-smtp.messagingengine.com (out4-smtp.messagingengine.com [66.111.4.28]) by dpdk.org (Postfix) with ESMTP id 29955235 for ; Tue, 21 Nov 2017 14:24:24 +0100 (CET) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id D2C9820A41; Tue, 21 Nov 2017 08:24:23 -0500 (EST) Received: from frontend2 ([10.202.2.161]) by compute1.internal (MEProxy); Tue, 21 Nov 2017 08:24:23 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fridaylinux.org; h=cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=A2kzBxp1I27L/EStb XOf0nYD/Uy6IRsQO+9NITzI3nE=; b=EoqQvzMtVeQb1LIkbqBU4Myf8pqMhGObl krEc1k7Gfsa5UwMA1wvrwnQ/jpoQ6bDK7K0Xl9dgUichETZ61g9lDInzqXGNxDvP kxIl5zBQSsmtaUjFRiAOpnQdp/kqbMs2b9J1k8PmuNwfExPT5WmhzT7i0hpztLc+ RoTdBseU+DTdNWE2ifmbMpSUAcpRaLlqayDQWVztEi8N9QmNUWqA4i1+sAH1RpMw 0t/MA1t8ulTBrG/vmQOjkpbnzbU7fTv6ntb0JdsCzquc07uymOBbND9KZniWpzGk 7SWz2BnA6Vc4paJDJVjGtjuACmecGRzP9j+z4Mde3dNotXkMAHWPw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=A2kzBxp1I27L/EStbXOf0nYD/Uy6IRsQO+9NITzI3nE=; b=TA7uxLQy 1XKUE6q0Zj9mo98roa/sYt/PJ3d8YSYGAt1MBA9Scq42oSSY3ZOvzVaa5BDyilGP /inl6HcygFKDoam703lnV2ttTHO7DaAXA0aDCjMUjieyIDl3LkhGVFRa12i3Amaq I5JmudXRMwlgSP1jAoLiOpcqNm3tF2L5daqkLIl82vyCtJ4WH/+LaRcOJhGstZpT iUY+thAaLh3rAapT+ujB+EitELr+m6BvROd4BO5NMuC5JarUSuCGocbDQl8GlwpE PifuZ0p0RTv5qgm31A4b5xRgulu8jONjTU6YolueAlLLjHvWaVLkss+0JCAOt8Q5 CDmxPnid3BS4tg== X-ME-Sender: Received: from localhost.localdomain (unknown [180.158.62.0]) by mail.messagingengine.com (Postfix) with ESMTPA id 71AB024810; Tue, 21 Nov 2017 08:24:21 -0500 (EST) From: Yuanhan Liu To: Nirmoy Das Cc: Ferruh Yigit , dpdk stable Date: Tue, 21 Nov 2017 21:17:00 +0800 Message-Id: <1511270333-31002-78-git-send-email-yliu@fridaylinux.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1511270333-31002-1-git-send-email-yliu@fridaylinux.org> References: <1511270333-31002-1-git-send-email-yliu@fridaylinux.org> Subject: [dpdk-stable] patch 'kni: fix SLE version detection' has been queued to stable release 17.08.1 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: Tue, 21 Nov 2017 13:24:24 -0000 Hi, FYI, your patch has been queued to stable release 17.08.1 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/24/17. So please shout if anyone has objections. Thanks. --yliu --- >>From fd80f65193324138f0189c8d890de70bf49b5b48 Mon Sep 17 00:00:00 2001 From: Nirmoy Das Date: Fri, 11 Aug 2017 18:33:14 +0200 Subject: [PATCH] kni: fix SLE version detection [ upstream commit d8bc68bcd214b24f0db585a194662588a67a4f81 ] detect SLE version reverse chronologically as ">=" is being used. Fixes: 2972254ce163 ("kni: fix build on Suse 12 SP3") Signed-off-by: Nirmoy Das Acked-by: Ferruh Yigit --- lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h | 24 +++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h index e0a0354..e38a756 100644 --- a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h +++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h @@ -697,22 +697,22 @@ struct _kc_ethtool_pauseparam { #define SLE_VERSION(a,b,c) KERNEL_VERSION(a,b,c) #endif #ifdef CONFIG_SUSE_KERNEL -#if ( LINUX_VERSION_CODE == KERNEL_VERSION(2,6,27) ) -/* SLES11 GA is 2.6.27 based */ -#define SLE_VERSION_CODE SLE_VERSION(11,0,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) +#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(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(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(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 -- 2.7.4