From patchwork Thu Dec 7 17:01:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gregory Rose X-Patchwork-Id: 845690 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="EU+9nRfP"; 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 3yt1y12YgTz9s72 for ; Fri, 8 Dec 2017 04:02:49 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 09EC1CE8; Thu, 7 Dec 2017 17:01:26 +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 33219CDE for ; Thu, 7 Dec 2017 17:01:25 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pf0-f196.google.com (mail-pf0-f196.google.com [209.85.192.196]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id EC229A3 for ; Thu, 7 Dec 2017 17:01:24 +0000 (UTC) Received: by mail-pf0-f196.google.com with SMTP id v26so5110261pfl.7 for ; Thu, 07 Dec 2017 09:01:24 -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=3oYaBN2jfH/SiqQ4zA8Lb9KP1zU4LclBYPXDVLunrUs=; b=EU+9nRfPy9K+eGlfVHQfV8gW9F6ai+3Qjla0R8P4k/Ea/DjDlY6xsI5rTVHly/aZVw NXKME9hhf+O+pX1A2GfOyJYAVPuiwvtdnXKhBg2Vf71kjKhZnopNXez3ZAEk7QuDyLUO aWR6ANyGjPF4eogHSQcPtC+aIj/YjesXsUfG3ygoqdZGKPWsp06XBZ6YwSMOnNtXp2rB kxntBmbybVQsOD5OyVBOj49VwCuBeG3jjhWso2HqGKrSxqS4ZjMK2qpJuyL7+TZrWW31 h/61/pbWXDKlImUpsno4/nKQrnJrrBjPSPJCOBehj5kU3lHq/3Cte2xhR2yomaPIxpDq opZw== 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=3oYaBN2jfH/SiqQ4zA8Lb9KP1zU4LclBYPXDVLunrUs=; b=uClMaA6I/czavtg56D+DEqdQLQfO+ncHRlDPp5m7Gs1EaMRzmURV8rDzpGfxvUqDHb 5S5SiFttPciqlz1lrQDL7jLHk2ilpNLWeqSvC+wH+WbZDAZE4TxXnfcADyzS61fdw5TG jiaukMUFh9pF5ZQg8FWApopyJnRIIx+mWG8BE8S8XTfsdIpgERQ2KTzIwEAw3k8N7Fmc 1r+nnfrKCl4oKzbU6Vbc/XH5Rvb9PwsVNHxPUBUBdSosGvgv7XUGa9y9TrSTLPEDu11c sBtPaCwKgnUtmaB+z9/CT/EQJBxtFRyX0XNzRtVE8cFucg+q20M1QMYTs9V2lUPE/Uyi LdBQ== X-Gm-Message-State: AKGB3mKnGXqv+4adUH7bcyqt6NTcuEhcNLN9n+kZiRxTQdo7MJ8NAt3e uzpGd62OHhS7mxAZ7s5FBSnrWeRr X-Google-Smtp-Source: AGs4zMZeNNfhdAnHjnuu9QgbLILASsEW6X+3qh43xw3kM/zCgaJEMFfMjtCUlvb7jg0HA5kDjJ14Gg== X-Received: by 10.84.246.204 with SMTP id j12mr2696507plt.390.1512666083864; Thu, 07 Dec 2017 09:01:23 -0800 (PST) Received: from gizo.domain (67-5-143-47.ptld.qwest.net. [67.5.143.47]) by smtp.gmail.com with ESMTPSA id u18sm10549134pgn.72.2017.12.07.09.01.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 07 Dec 2017 09:01:22 -0800 (PST) From: Greg Rose To: dev@openvswitch.org Date: Thu, 7 Dec 2017 09:01:11 -0800 Message-Id: <1512666075-11857-3-git-send-email-gvrose8192@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1512666075-11857-1-git-send-email-gvrose8192@gmail.com> References: <1512666075-11857-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 Cc: Greg Rose Subject: [ovs-dev] [PATCH V2 2/6] 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 From: Greg Rose 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 03c5435..2579093 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);