From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by dpdk.space (Postfix) with ESMTP id 5F61CA0471 for ; Fri, 21 Jun 2019 18:46:40 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 4BA161D556; Fri, 21 Jun 2019 18:46:40 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id C91941D556 for ; Fri, 21 Jun 2019 18:46:38 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3EAB530B96FD; Fri, 21 Jun 2019 16:46:38 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-77.ams2.redhat.com [10.36.117.77]) by smtp.corp.redhat.com (Postfix) with ESMTP id 398AB60BE0; Fri, 21 Jun 2019 16:46:32 +0000 (UTC) From: Kevin Traynor To: Luo Gaoliang Cc: Ferruh Yigit , dpdk stable Date: Fri, 21 Jun 2019 17:45:45 +0100 Message-Id: <20190621164626.31219-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Fri, 21 Jun 2019 16:46:38 +0000 (UTC) Subject: [dpdk-stable] patch 'kni: fix build on RHEL8' has been queued to LTS release 18.11.3 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: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to LTS release 18.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/26/19. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/4e007308497c1e4b71e4c2ac35267ef205580d23 Thanks. Kevin Traynor --- >From 4e007308497c1e4b71e4c2ac35267ef205580d23 Mon Sep 17 00:00:00 2001 From: Luo Gaoliang Date: Mon, 27 May 2019 12:02:07 +0800 Subject: [PATCH] kni: fix build on RHEL8 Build error was seen on RHEL8 when CONFIG_RTE_KNI_KMOD_ETHTOOL is enabled. Build error log: /root/kni/dpdk-19.05/kernel/linux/kni/ethtool/igb/kcompat.h:3928:25: error: 'const struct net_device_ops' has no member named 'extended' #define ndo_set_vf_vlan extended.ndo_set_vf_vlan ^~~~~~~~ RHEL8 defined ndo_set_vf_vlan in net_device_ops as well as the mainline kernel. Signed-off-by: Luo Gaoliang Acked-by: Ferruh Yigit --- kernel/linux/kni/ethtool/igb/kcompat.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kernel/linux/kni/ethtool/igb/kcompat.h b/kernel/linux/kni/ethtool/igb/kcompat.h index 649a69c81..f041a3ebe 100644 --- a/kernel/linux/kni/ethtool/igb/kcompat.h +++ b/kernel/linux/kni/ethtool/igb/kcompat.h @@ -3923,5 +3923,6 @@ skb_set_hash(struct sk_buff *skb, __u32 hash, __always_unused int type) (RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(7, 4))) #define HAVE_VF_VLAN_PROTO -#if (RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(7, 4)) +#if ((RHEL_RELEASE_CODE >= RHEL_RELEASE_VERSION(7, 4)) && \ + (RHEL_RELEASE_CODE < RHEL_RELEASE_VERSION(8, 0))) /* In RHEL/Centos 7.4, the "new" version of ndo_set_vf_vlan * is in the struct net_device_ops_extended */ -- 2.20.1