From patchwork Wed Aug 5 13:39:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Brivio X-Patchwork-Id: 1341297 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=YTSODPq1; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4BMJ413tNjz9s1x for ; Thu, 6 Aug 2020 03:08:33 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728474AbgHERI1 (ORCPT ); Wed, 5 Aug 2020 13:08:27 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:26004 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728400AbgHERGS (ORCPT ); Wed, 5 Aug 2020 13:06:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1596647176; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BJTmQpoAkIpbguLFUsJigmbm7ftZPVlO31weMkCEohw=; b=YTSODPq1TlbwSsAc+8WttxOTlJSlEkfvPKfazyouXBeG+5pCf/t9GewWDADBuZ751ulDnR i9CYbVhGFCl6Dbz2OOu+P/9CbSq2p2NistIo5QIaIuxUFTwVQNJrWuTfOS5JSqvCBDqD/L cP06CdY3GZzwG+2+o6ivnjlSBm8be6Q= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-138-FgJlMIBBOEqWZYWlkZ1Vjw-1; Wed, 05 Aug 2020 09:39:35 -0400 X-MC-Unique: FgJlMIBBOEqWZYWlkZ1Vjw-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 390D5100A8DF; Wed, 5 Aug 2020 13:39:34 +0000 (UTC) Received: from maya.cloud.tilaa.com (unknown [10.36.110.22]) by smtp.corp.redhat.com (Postfix) with ESMTP id EDB792DE95; Wed, 5 Aug 2020 13:39:33 +0000 (UTC) Received: from localhost (055-041-157-037.ip-addr.inexio.net [37.157.41.55]) by maya.cloud.tilaa.com (Postfix) with ESMTPSA id D853F40093; Wed, 5 Aug 2020 15:39:32 +0200 (CEST) Date: Wed, 5 Aug 2020 15:39:31 +0200 From: Stefano Brivio To: "David S. Miller" , Stephen Rothwell Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-next@vger.kernel.org, heiko.carstens@de.ibm.com, Cong Wang Subject: [PATCH RESEND net-next] ip_tunnel_core: Fix build for archs without _HAVE_ARCH_IPV6_CSUM Message-ID: <20200805153931.50a3d518@redhat.com> Organization: Red Hat MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On architectures defining _HAVE_ARCH_IPV6_CSUM, we get csum_ipv6_magic() defined by means of arch checksum.h headers. On other architectures, we actually need to include net/ip6_checksum.h to be able to use it. Without this include, building with defconfig breaks at least for s390. Reported-by: Stephen Rothwell Fixes: 4cb47a8644cc ("tunnels: PMTU discovery support for directly bridged IP packets") Signed-off-by: Stefano Brivio --- I'm submitting this for net-next despite the fact it's closed, as the offending code isn't merged to net.git yet. Should I rather submit this to... linux-next? Re-sending as original copy seems to be stuck in some SMTP queue. net/ipv4/ip_tunnel_core.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/ipv4/ip_tunnel_core.c b/net/ipv4/ip_tunnel_core.c index 9ddee2a0c66d..75c6013ff9a4 100644 --- a/net/ipv4/ip_tunnel_core.c +++ b/net/ipv4/ip_tunnel_core.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include