From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 904BFC43381 for ; Thu, 14 Mar 2019 05:16:01 +0000 (UTC) Received: from krantz.zx2c4.com (krantz.zx2c4.com [192.95.5.69]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DD2622085A for ; Thu, 14 Mar 2019 05:16:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DD2622085A Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=wolff.to Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=wireguard-bounces@lists.zx2c4.com Received: from krantz.zx2c4.com (localhost [IPv6:::1]) by krantz.zx2c4.com (ZX2C4 Mail Server) with ESMTP id ff12781b; Thu, 14 Mar 2019 05:04:32 +0000 (UTC) Received: from krantz.zx2c4.com (localhost [127.0.0.1]) by krantz.zx2c4.com (ZX2C4 Mail Server) with ESMTP id c5f38cad for ; Thu, 14 Mar 2019 05:04:31 +0000 (UTC) Received: from wolff.to (wolff.to [98.103.208.27]) by krantz.zx2c4.com (ZX2C4 Mail Server) with SMTP id c159c33d for ; Thu, 14 Mar 2019 05:04:31 +0000 (UTC) Received: (qmail 9791 invoked by uid 500); 14 Mar 2019 05:15:14 -0000 From: Bruno Wolff III To: wireguard@lists.zx2c4.com Subject: [PATCH] net/netfilter/nf_nat_core.h was removed by d2c5c103b1337f590b7edf1509a6e294bdf22402 Date: Thu, 14 Mar 2019 00:14:52 -0500 Message-Id: <20190314051452.9746-1-bruno@wolff.to> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 X-BeenThere: wireguard@lists.zx2c4.com X-Mailman-Version: 2.1.15 Precedence: list List-Id: Development discussion of WireGuard List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: wireguard-bounces@lists.zx2c4.com Sender: "WireGuard" It looks like net/netfilter/nf_nat_core.h isn't needed any more and things seemed to work without it. --- src/compat/compat.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/compat/compat.h b/src/compat/compat.h index 7a61e4c1a5cd..2dcdbaeb0ad6 100644 --- a/src/compat/compat.h +++ b/src/compat/compat.h @@ -792,7 +792,9 @@ struct __kernel_timespec { #include #include #include +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 1, 0) #include +#endif static inline void new_icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info) { enum ip_conntrack_info ctinfo; -- 2.21.0 _______________________________________________ WireGuard mailing list WireGuard@lists.zx2c4.com https://lists.zx2c4.com/mailman/listinfo/wireguard