From patchwork Mon Feb 26 22:10:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Rose X-Patchwork-Id: 878164 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; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="A0gCaCBu"; 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 3zqwy6327Vz9s0v for ; Tue, 27 Feb 2018 09:10:54 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id EC4BC122A; Mon, 26 Feb 2018 22:10:24 +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 146701225 for ; Mon, 26 Feb 2018 22:10:23 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pg0-f66.google.com (mail-pg0-f66.google.com [74.125.83.66]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id D3328FD for ; Mon, 26 Feb 2018 22:10:22 +0000 (UTC) Received: by mail-pg0-f66.google.com with SMTP id y8so6721080pgr.9 for ; Mon, 26 Feb 2018 14:10:22 -0800 (PST) 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=qPlkPcXkuQTWkquZzsRHPoXzQSvQEQ3JYiCBAq+vlZg=; b=A0gCaCBuCC2DYQvo10bAPS9ih25zIA45JfGpM8zQw9zoxNzP8jfEYORBt6LtS2ohsI mOO9FUOtXlV8aqMw+pfOfzBwtxT2XfThF9uHvOqeZtiBGV7dswYubNAiu3L2r/2Hms0e xEvY78kssfo9CSODL9/YTgNKSYTSonAeS/ty07Jb1abIJIdU1GzREpZUkQHDhe/rrVSi ufQZnn6pRkrq7Tyo+lI0L5HcU6TgYQZlRX5/iA2Ic3sSpQgI9rRKiwNzg0PhfxKm39ny KxNXixKrfKErjZ82SNGU+AKSSB46sdpFCD5gR0Ux9w3jHmdZeTxQFenM+RpsD0Jn1f70 dMeQ== 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=qPlkPcXkuQTWkquZzsRHPoXzQSvQEQ3JYiCBAq+vlZg=; b=TKewVuS8IHv9Hk/5qr1I/Z9NgIhZs8FkHDJftFIKf5dMkNGcisdYpM6JC/BS1dISQE YQFcReaZBzZjFKnH69uU9fdF1gS/UnANARlDLi3Ge08oC1VwN5UsgIhJZw94uSUOvZS9 aEDeQeEf4Du1HXlrOsJOqZ3ICPGNJmdx4L3LRvXZ3eXgOoPepq0aHLcn+T79DoNcbeAx ZeaF7M+fjHesNFd4b3fWVFLQi7xSQbIhHTl5650wMLyNgKlbMM9+byCDao3jsQicS5yj zx0KhU++Q1iPf0WwSDUUhDPYD9U30pDWplzegZjaefRWhf1H1lJ1PNlKYltF9Heq56e+ Fnhw== X-Gm-Message-State: APf1xPCwDrQGTYU5qfWF24/5UufQRlaRXRJ9tGQAGXejbUYBKcmfWT+K 70pNySaDX2ZD8W9QYG4w6BLsuQ== X-Google-Smtp-Source: AH8x224k6K03si43AsNWZSotgh8b5A9ehmTTUBbcUq/XC6yppg9ykDxf6ERrxYTxUH7ax0d8J993bw== X-Received: by 10.99.191.78 with SMTP id i14mr9782970pgo.9.1519683022045; Mon, 26 Feb 2018 14:10:22 -0800 (PST) Received: from gizo.domain (184-100-240-187.ptld.qwest.net. [184.100.240.187]) by smtp.gmail.com with ESMTPSA id j1sm16691797pff.94.2018.02.26.14.10.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Feb 2018 14:10:20 -0800 (PST) From: Greg Rose To: dev@openvswitch.org Date: Mon, 26 Feb 2018 14:10:16 -0800 Message-Id: <1519683016-15500-2-git-send-email-gvrose8192@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1519683016-15500-1-git-send-email-gvrose8192@gmail.com> References: <1519683016-15500-1-git-send-email-gvrose8192@gmail.com> X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH 2/2] compat: Fix RHEL 7 build warnings 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 A prior commit to fix up netdev_master_upper_dev_link for recent kernels caused a compile warning on RHEL 7 builds. Fixes: 36d3520b5f ("datapath: Fix netdev_master_upper_dev_link for 4.14") Signed-off-by: Greg Rose --- datapath/linux/compat/include/linux/netdevice.h | 1 + 1 file changed, 1 insertion(+) diff --git a/datapath/linux/compat/include/linux/netdevice.h b/datapath/linux/compat/include/linux/netdevice.h index 052689f..9d3b249 100644 --- a/datapath/linux/compat/include/linux/netdevice.h +++ b/datapath/linux/compat/include/linux/netdevice.h @@ -116,6 +116,7 @@ static inline int rpl_netdev_master_upper_dev_link(struct net_device *dev, return netdev_master_upper_dev_link(dev, upper_dev, upper_priv, upper_info); } +#undef netdev_master_upper_dev_link #define netdev_master_upper_dev_link rpl_netdev_master_upper_dev_link #endif /* #else HAVE_NETDEV_MASTER_UPPER_DEV_LINK_RH */ #else /* #ifndef HAVE_NETDEV_MASTER_UPPER_DEV_LINK_PRIV */