From patchwork Wed Aug 23 00:52:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yi-Hung Wei X-Patchwork-Id: 804717 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="p29fnA3B"; dkim-atps=neutral Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xcTRV0Xfzz9s8J for ; Wed, 23 Aug 2017 10:52:38 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 0E23B89C; Wed, 23 Aug 2017 00:52:36 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id E1D934A6 for ; Wed, 23 Aug 2017 00:52:34 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pg0-f67.google.com (mail-pg0-f67.google.com [74.125.83.67]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id D62E2193 for ; Wed, 23 Aug 2017 00:52:34 +0000 (UTC) Received: by mail-pg0-f67.google.com with SMTP id r133so272464pgr.1 for ; Tue, 22 Aug 2017 17:52:34 -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; bh=CiowGHdNaLEPBWbQFRdeMR0Mx/yE6C8wYm3VJilD7dk=; b=p29fnA3BUmnL9KLJcNcQSbsr+gtTppkSrqtahIWe5203O7J1EnQeOpiuifZaOtzzo5 sx8Pj56UEAWXKkC22zDm4BMgH0Q/A0GMVJmwHgU8JW5hIYK6v+fGoaNjQA0J1E/YhWe1 vFTpUNfzK8JkUoOB3szE46Bw47LVucDMv7K8/Bsg97OaSR7/LQulmo8AKHJWlO9s3i3R WUIkGGYrse+RgwnL5NfdeRbA81M/ykYSDLhPmPc4PmQxS59oKgx1XXemK5CkNx0Q2q66 qMrE0Qb4g6LDCJCfmpOJ43Z/YHjlOrkgXMtuXAvKIuef6kAM6g2l2B71W7vbrltlh3PU echg== 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; bh=CiowGHdNaLEPBWbQFRdeMR0Mx/yE6C8wYm3VJilD7dk=; b=VmSPSCe/lUBk/9sIkvQx++47UacFO+gLXspYDz9rBynfHT2VXoq94oyK5wGrAK8m07 3B7CxVEdoLblvYkxf8h11g17+KWc6/yfjqHw9KIf46M68xlEjBxUAqIWktQk+M1tEsPV AjvlXIyRvd8QczNib8seYtKMNggN/mnpddFUBUzUg8luQikxzbXLqpbjbAp1MFvxmiaB LSPL9DKrYplxRQXiq22ZKtLbmSTBeonCpz33AYG29Qn/M3FbO4NfqCrjEU/wcLqfn4ME LSnPzeBg1tMt6sQ5G/pZliIFCJrRIbk5a5Ytlv9+YqXYnyMi0NHy5Uw8fEjOPhO75ZS2 NwOA== X-Gm-Message-State: AHYfb5jowc17nl4iB3GngCIiZCRac/csZclnNEkOJekI7NJQv5xd1kLr ZAY8IJ0LO/gSne1S1+c= X-Received: by 10.99.62.139 with SMTP id l133mr976381pga.78.1503449554093; Tue, 22 Aug 2017 17:52:34 -0700 (PDT) Received: from sc9-mailhost3.vmware.com ([208.91.2.1]) by smtp.gmail.com with ESMTPSA id q133sm283347pfq.31.2017.08.22.17.52.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 22 Aug 2017 17:52:33 -0700 (PDT) From: Yi-Hung Wei To: dev@openvswitch.org Date: Tue, 22 Aug 2017 17:52:29 -0700 Message-Id: <1503449550-14262-1-git-send-email-yihung.wei@gmail.com> X-Mailer: git-send-email 2.7.4 Subject: [ovs-dev] [PATCH 1/2] datapath: compat: Fix build on RHEL 7.4 X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org RHEL 7.4 introduces netdev_master_upper_dev_link_rh() that breaks the backport of OVS kernel module on RHEL 7.4. This patch fixes that issue. Signed-off-by: Yi-Hung Wei --- acinclude.m4 | 4 ++++ datapath/linux/compat/include/linux/netdevice.h | 2 ++ 2 files changed, 6 insertions(+) diff --git a/acinclude.m4 b/acinclude.m4 index 74cc046a3929..aeb594a7e3b5 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -552,6 +552,10 @@ AC_DEFUN([OVS_CHECK_LINUX_COMPAT], [ OVS_FIND_PARAM_IFELSE([$KSRC/include/linux/netdevice.h], [netdev_master_upper_dev_link], [upper_priv], [OVS_DEFINE([HAVE_NETDEV_MASTER_UPPER_DEV_LINK_PRIV])]) + OVS_GREP_IFELSE([$KSRC/include/linux/netdevice.h], + [netdev_master_upper_dev_link_rh], + [OVS_DEFINE([HAVE_NETDEV_MASTER_UPPER_DEV_LINK_RH])]) + OVS_FIND_FIELD_IFELSE([$KSRC/include/linux/netdevice.h], [net_device], [max_mtu]) diff --git a/datapath/linux/compat/include/linux/netdevice.h b/datapath/linux/compat/include/linux/netdevice.h index 878c30a6da4a..a5d4ee836d18 100644 --- a/datapath/linux/compat/include/linux/netdevice.h +++ b/datapath/linux/compat/include/linux/netdevice.h @@ -101,6 +101,7 @@ static inline bool netif_needs_gso(struct sk_buff *skb, #endif #ifndef HAVE_NETDEV_MASTER_UPPER_DEV_LINK_PRIV +#ifndef HAVE_NETDEV_MASTER_UPPER_DEV_LINK_RH static inline int rpl_netdev_master_upper_dev_link(struct net_device *dev, struct net_device *upper_dev, void *upper_priv, void *upper_info) @@ -110,6 +111,7 @@ static inline int rpl_netdev_master_upper_dev_link(struct net_device *dev, #define netdev_master_upper_dev_link rpl_netdev_master_upper_dev_link #endif +#endif #if LINUX_VERSION_CODE < KERNEL_VERSION(3,16,0) #define dev_queue_xmit rpl_dev_queue_xmit