From patchwork Wed Feb 7 15:30:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Rose X-Patchwork-Id: 870421 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="NwHAP1I0"; 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 3zc50G2Hqsz9s4q for ; Thu, 8 Feb 2018 02:31:42 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id DAB1A1145; Wed, 7 Feb 2018 15:30:22 +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 70F031143 for ; Wed, 7 Feb 2018 15:30:21 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pl0-f68.google.com (mail-pl0-f68.google.com [209.85.160.68]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id AEBC33F9 for ; Wed, 7 Feb 2018 15:30:19 +0000 (UTC) Received: by mail-pl0-f68.google.com with SMTP id q17-v6so224769pll.1 for ; Wed, 07 Feb 2018 07:30:19 -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=NwHAP1I0OcFBTdqt6MCn9POPvMH8+WdNiSRrw7IaJHNTJtV3y8spMNYl++9C9Bl5ZA LP3q6xk15q/Z8p6bSdpaJwUBUmNxHYMzpkV4lLpzM7dKzwh3RpLbQhnXi3Bs5D4n/EvP VQOpsT7jUe2zUeVQWPYNXJIya9ZIFiKtPmUg1xVPCxPWv80adq7Kt97HGRmrDEGZPjJw ugEBfrGJ/NomKWBK//wfieb470K96nNVfRk255EC65nW60f9CX+fd0PnvupOZ4vidO1J TeDuZts/AAR85R5liBNNmQeQXR6bI9YZbbOlgIunTr5KOB2Ivhj9mUIKjmiBwM4jQ2jW 3ZkQ== 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=bVnUHwIHtgJqF+A7YRis6hU9F029OlwOwzwb+dNi8z/rvQcrG/ilqzs6UwJMtxLVPf ZCPbXULxD9edosVYPClw6P3mo4XnqawVVPk8D2rBTkn7ctC7qoxl/TkgslR8Yi80r2ny +D5NKF1N/NqOrMtkwEYtP5fy89CsUpbFRsn+j0TNQnWKUgxF3D63Yc8jAJVLT7VJReCd QgYa6Xd4gurPhdz6oEzQctqHPFv+HPJ2rylbxfGp8Tigr7003Z+cY3cxPSqmGC/zZaO1 3Wal+S+IMnnjdEkcS+Nxr/5nFSSDfYl0gA8+CrHwGSW/ES+Z8CKvPkcYmD9HhT+5F1iT JKaw== X-Gm-Message-State: APf1xPDiXKbzEZoD2Y08nHxYuJ8ktU2mYO2gG8dqixYFN5k6vTt9fJA3 vZHe/vswFO/PyhU3LUiMya96EQ== X-Google-Smtp-Source: AH8x2260yWkg6sXX4cQ8169fumpX0WWkFltxtWN+BO3ETpBHOEqHnqGqmZVIFrPKg4NZBQWTlaBHtQ== X-Received: by 2002:a17:902:7b81:: with SMTP id w1-v6mr6291064pll.295.1518017418893; Wed, 07 Feb 2018 07:30:18 -0800 (PST) Received: from gizo.domain (184-100-240-187.ptld.qwest.net. [184.100.240.187]) by smtp.gmail.com with ESMTPSA id e88sm5176558pfl.80.2018.02.07.07.30.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Feb 2018 07:30:17 -0800 (PST) From: Greg Rose To: dev@openvswitch.org Date: Wed, 7 Feb 2018 07:30:02 -0800 Message-Id: <1518017410-31711-3-git-send-email-gvrose8192@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1518017410-31711-1-git-send-email-gvrose8192@gmail.com> References: <1518017410-31711-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 02/10] 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);