From patchwork Thu Aug 9 12:09:06 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ZY Qiu X-Patchwork-Id: 43641 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 9F1942A6C; Thu, 9 Aug 2018 14:09:18 +0200 (CEST) Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by dpdk.org (Postfix) with ESMTP id 8CB73235 for ; Thu, 9 Aug 2018 14:09:17 +0200 (CEST) Received: by mail-pg1-f194.google.com with SMTP id a14-v6so2652893pgv.10 for ; Thu, 09 Aug 2018 05:09:17 -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; bh=OiA0GBsL+0jfKcxd5/iHSACNE4RSIY2RsMiZcEnDaz4=; b=uA3gRbjYe8Gy4JWxkUTvJv3BM2cLUPl6jHh9hESbq+S2o9Ao6BGmQnmnvsnb1R/OpE x+PfGAODT0RXtvfBpajypZeS4PhSC8iuLPeDvCCZfS7zPhLo7mFCtnQv7o7Tpeq6X+03 Pqap9C/EhyuQwCW0p2wHmal2iM1ooZmoIK9zjT1r2o+BP9pYalEJ93wZuRNXRdlzxy2V fZmMYj6uMo27lMpA5KE3Dn+6nUgMAG2T4nY6ZpGlxM3Gxd6/iBQ8XUCp6CLUtloHV2f/ k9R7Ktxyzb/Q5yOoq2aCN4d7szbzzbTzXLkYWCpSs4FlvytZXUiXrzmb6oN+XsNqSxXy Eb3w== 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; bh=OiA0GBsL+0jfKcxd5/iHSACNE4RSIY2RsMiZcEnDaz4=; b=Bgta52lEaW59Z9XanzGo1JAAKiahEDfd97sz0sIYodA7hseHiD9RwbEVu6Anvj5LQC +wLzbeJVR5gK0LuZRHFrhSOsAZ/x5D5w3Y6cm2DeL8tMm6QzofhQ/IW14uOmmxhnukDP MFo/dhPMGzcpV8caCtDzGphnki+3eASJc00e2bwNIvvpeU9mNOok4PRWmtgY7/PuUnYC NC/03w/Lh1FRB+CHip5exa/R8gAau5T7hojk/+rQ8yPO+K2hu6Wtxa87vlB1LhuRSOXS DbxSjV2Ha+Gf76mgwSp121+r+ouSnPYQYsDsDVLNEz58ef2Ea9zEUPgW1DvlLqXv4G4g J22Q== X-Gm-Message-State: AOUpUlGBs3sMjK02u8Fsp3+vxQndjIfFvmEeSE+UNOIJXT9x0ebaIKhB +WqvnYbt/wYHf9AJQcVuvPw= X-Google-Smtp-Source: AA+uWPwZGfB9ItoWo1oolPEJVIYJVvtvzfVcEsL34MbUdxEPRpF7h/DWISpoVic8ftkABRrGxZM8ug== X-Received: by 2002:a63:f344:: with SMTP id t4-v6mr1913862pgj.428.1533816556769; Thu, 09 Aug 2018 05:09:16 -0700 (PDT) Received: from localhost.localdomain ([43.245.220.91]) by smtp.gmail.com with ESMTPSA id r1-v6sm20517935pfi.17.2018.08.09.05.09.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Aug 2018 05:09:16 -0700 (PDT) From: Drocula To: ferruh.yigit@intel.com Cc: dev@dpdk.org, Drocula Date: Thu, 9 Aug 2018 12:09:06 +0000 Message-Id: <1533816546-1626-1-git-send-email-quzeyao@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1533557167-7390-1-git-send-email-quzeyao@gmail.com> References: <1533557167-7390-1-git-send-email-quzeyao@gmail.com> Subject: [dpdk-dev] [PATCH v2] kni: fix build on RHEL 7.5 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" This patch fixes compilation errors on Centos 7.5 when CONFIG_RTE_KNI_KMOD_ETHTOOL is set to 'y'. On RHEL75 ndo_change_mtu has changed to ndo_change_mtu_rh74. See commit 37d477b6863e5c06 ("kni: fix build on RHEL 7.5") Signed-off-by: Drocula Lambda Acked-by: Ferruh Yigit --- kernel/linux/kni/ethtool/igb/kcompat.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/kernel/linux/kni/ethtool/igb/kcompat.h b/kernel/linux/kni/ethtool/igb/kcompat.h index 40a8d99..ae1b530 100644 --- a/kernel/linux/kni/ethtool/igb/kcompat.h +++ b/kernel/linux/kni/ethtool/igb/kcompat.h @@ -3929,6 +3929,11 @@ static inline struct sk_buff *__kc__vlan_hwaccel_put_tag(struct sk_buff *skb, #endif #endif +#if (defined(RHEL_RELEASE_CODE) && \ + (RHEL_RELEASE_VERSION(7, 5) <= RHEL_RELEASE_CODE)) +#define ndo_change_mtu ndo_change_mtu_rh74 +#endif + #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0) #define HAVE_PCI_ENABLE_MSIX #endif