From patchwork Mon Jan 29 22:54:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Rose X-Patchwork-Id: 867347 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="SPOWd6+G"; 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 3zVlG5174Rz9s7n for ; Tue, 30 Jan 2018 09:55:09 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 3C4D4FD5; Mon, 29 Jan 2018 22:54:44 +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 D0B71EA1 for ; Mon, 29 Jan 2018 22:54:40 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pg0-f65.google.com (mail-pg0-f65.google.com [74.125.83.65]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 96D7A2E7 for ; Mon, 29 Jan 2018 22:54:40 +0000 (UTC) Received: by mail-pg0-f65.google.com with SMTP id n17so5623207pgf.10 for ; Mon, 29 Jan 2018 14:54:40 -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=+JNsr8BN2rVSh25YRG2EMvI/THXkRubNpMg9V3QYNLI=; b=SPOWd6+G/qpEAxwfjH7ilrZbGiO4O8El5X0nC8jb7LT2rcQF/9a7tw0CozVB3bJ3ac 6eR6CsODd+LeAIsv0o/tyUajzGQgbKGbqH2xEO9O7tu7HgPyEzZZCOPLAIc4awogLbpC GEzDzS8NbEpaW6qqmhF/Ijo7YJDU2eHrCJDDQE06dgQCIiUVjrePfs4cJIYDBZIHGRTv 6WPSBdegdszW1uPUFOr0mTNWlNvD9QMudAZP0FKOfJwiJDQvZogdLLXJFFxGg54//fjN C9Pzya4C44QcPfjmlB9QBQ50JHi61Et08MBLZX7YfvrNwK6RWa3bXiKVLiomolTosncO i2MA== 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=+JNsr8BN2rVSh25YRG2EMvI/THXkRubNpMg9V3QYNLI=; b=skT5UP2VytzUNuyu4xccMBa7jDKzpmGnTXg9h/Dj6YRHQkkc5c8BVchrjTH/fS7lE/ N8MzAL0REpgb55VrbgzNLMLhiHahJBwPBDYx4O+flvx1bol3hOP7Cduq3Sw9p/oRrtfS 7vXd7H6c24Cf6OmxtGe5LPmhZbwRtPaMvMtw/wIkAw2FmbhNljFz2UwRv8aMG2/BNToR C/2tulxWiXw4SGeuG9Wp2egVd0awKeH0dOyDMLt4CcyAJKoComvUOqqu7+6CJ/WUYlAH 3B4slc5CgylK+kAAVMMle8qDNejWtRz7ScVHhMO9nIwaSkPpy980VBSJvMWyb6bYcHf2 uTCg== X-Gm-Message-State: AKwxytcPtUQo5siECpnsPtXEGbaf+SLQG09/saNLIRRhO9O1ai1VIXi6 vPgPmNMMCJGgKq9ApE5iZ+a0Qg== X-Google-Smtp-Source: AH8x22424as0L+mA5Rl76meSPhs33bYXY/JnZsSoEJvzEinB4xyz/rp4GGRallQ8sOghoNeVkqrZaQ== X-Received: by 10.99.124.2 with SMTP id x2mr22508272pgc.184.1517266479819; Mon, 29 Jan 2018 14:54:39 -0800 (PST) Received: from gizo.domain (184-100-240-187.ptld.qwest.net. [184.100.240.187]) by smtp.gmail.com with ESMTPSA id k13sm32736384pfj.38.2018.01.29.14.54.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Jan 2018 14:54:38 -0800 (PST) From: Greg Rose To: dev@openvswitch.org Date: Mon, 29 Jan 2018 14:54:29 -0800 Message-Id: <1517266474-7609-2-git-send-email-gvrose8192@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1517266474-7609-1-git-send-email-gvrose8192@gmail.com> References: <1517266474-7609-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 V2 2/7] compat: Do not include headers when not compiling 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 If the entire file is not going to be compiled because OVS is using upstream tunnel support then also don't bother pulling in the headers. Signed-off-by: Greg Rose --- datapath/linux/compat/ip_gre.c | 2 +- datapath/linux/compat/ip_output.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/datapath/linux/compat/ip_gre.c b/datapath/linux/compat/ip_gre.c index 94fdaa9..4e32591 100644 --- a/datapath/linux/compat/ip_gre.c +++ b/datapath/linux/compat/ip_gre.c @@ -12,6 +12,7 @@ #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt +#ifndef USE_UPSTREAM_TUNNEL #include #include #include @@ -52,7 +53,6 @@ #include #include -#ifndef USE_UPSTREAM_TUNNEL #if IS_ENABLED(CONFIG_IPV6) #include #include diff --git a/datapath/linux/compat/ip_output.c b/datapath/linux/compat/ip_output.c index edca340..e2f869f 100644 --- a/datapath/linux/compat/ip_output.c +++ b/datapath/linux/compat/ip_output.c @@ -45,6 +45,7 @@ * Hirokazu Takahashi: sendfile() on UDP works now. */ +#ifndef HAVE_CORRECT_MRU_HANDLING #include #include #include @@ -82,7 +83,6 @@ #include #include -#ifndef HAVE_CORRECT_MRU_HANDLING static inline void rpl_ip_options_fragment(struct sk_buff *skb) { unsigned char *optptr = skb_network_header(skb) + sizeof(struct iphdr);