From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by dpdk.org (Postfix) with ESMTP id 21D166833 for ; Wed, 21 Nov 2018 17:46:08 +0100 (CET) Received: by mail-wr1-f68.google.com with SMTP id x10so6402560wrs.8 for ; Wed, 21 Nov 2018 08:46:08 -0800 (PST) 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:mime-version :content-transfer-encoding; bh=lg9ZiwQNXbzzugKeG4zm5Y9BiCVAXuTwbS8gs3FX8WQ=; b=NrAIXNePsZrJZo7qmCHCeH2JoeJqaL80Ycr2zomzkUBRJOI90yIfJUoVRFM/Az3Zw+ myLa99UMqb/XYpURGt5KBYv9H0MV18Qs3VYk84tb4U8r3IQbNG3EkmkuFyE5Y0TOKjPu LMxJkEe2lx4lJJ3pmHfhcfZSI0Y8VmSHz2wJllYaT6NKXPsuvR17en2rPomH/vSRGPsC M985z92SbVbQOf23HPD2ie5TBnWDeylW64pjP9pJpJoSbWyEbmS8aOo/xQTpffRqVaYC FOh1Zbn+QWHIXg/dGAA8yBDkb/mh1yFw131mjzoAL2g+66FL9pPjvmD7173xXU3i0uDz DFDQ== X-Gm-Message-State: AA+aEWYp978acUW0HsTX9GIr00LKo0oVHNxmDd4mlp93+ZXlzw0b2myq lXeJJ8NwcEouSx8BcjBqLz4mbMKD X-Google-Smtp-Source: AFSGD/WPm5pcvpyxMJ4DJ9qb6dExaNJS+wcsZFHBzEyYC0gI3A4C5J6s3AtU9XrH9sKk9lrP8rQhlQ== X-Received: by 2002:a5d:4b8b:: with SMTP id b11mr6563815wrt.180.1542818767329; Wed, 21 Nov 2018 08:46:07 -0800 (PST) Received: from localhost ([2a01:4b00:f419:6f00:8361:8946:ba2b:d556]) by smtp.gmail.com with ESMTPSA id w9sm1987201wme.47.2018.11.21.08.46.05 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 21 Nov 2018 08:46:06 -0800 (PST) From: Luca Boccassi To: stable@dpdk.org Cc: ndas@suse.de, ferruh.yigit@intel.com Date: Wed, 21 Nov 2018 16:45:59 +0000 Message-Id: <20181121164600.7169-1-bluca@debian.org> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] [PATCH 16.11 1/2] kni: fix build on Suse 12 SP3 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: Wed, 21 Nov 2018 16:46:08 -0000 From: Nirmoy Das [ backported from upstream commit 2972254ce1630548d7b62ef7a6c61ce7c1a4b124 ] Add support for SLES12SP3, which uses kernel 4.4, but backported features from newer kernels. Signed-off-by: Nirmoy Das Acked-by: Ferruh Yigit --- lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h index 9e4798efc..de57b1bd2 100644 --- a/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h +++ b/lib/librte_eal/linuxapp/kni/ethtool/igb/kcompat.h @@ -710,6 +710,9 @@ struct _kc_ethtool_pauseparam { #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) #endif /* LINUX_VERSION_CODE == KERNEL_VERSION(x,y,z) */ #endif /* CONFIG_SUSE_KERNEL */ #ifndef SLE_VERSION_CODE @@ -3929,9 +3932,10 @@ skb_set_hash(struct sk_buff *skb, __u32 hash, __always_unused int type) #define vlan_tx_tag_present skb_vlan_tag_present #endif -#if ( LINUX_VERSION_CODE >= KERNEL_VERSION(4,9,0) ) +#if ((LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)) || \ + (SLE_VERSION_CODE && SLE_VERSION_CODE >= SLE_VERSION(12, 3, 0))) #define HAVE_VF_VLAN_PROTO -#endif /* >= 4.9.0 */ +#endif /* >= 4.9.0, >= SLES12SP3 */ #if (defined(RHEL_RELEASE_CODE) && \ (RHEL_RELEASE_VERSION(7, 5) <= RHEL_RELEASE_CODE)) -- 2.19.1